From 20857dea3842f8063742360144583d173632ea0e Mon Sep 17 00:00:00 2001
From: Serge Logvinov <serge.logvinov@sinextra.dev>
Date: Fri, 19 Aug 2022 13:07:15 +0300
Subject: [PATCH] Fix deployments

---
 azure/Makefile                                        | 4 ++--
 azure/deployments/azure-cloud-controller-manager.yaml | 2 +-
 azure/deployments/local-path-storage.yaml             | 2 ++
 azure/deployments/metrics-server.yaml                 | 4 +++-
 oracle/deployments/oci-cloud-controller-manager.yaml  | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/azure/Makefile b/azure/Makefile
index e3760ee..9ad0c05 100644
--- a/azure/Makefile
+++ b/azure/Makefile
@@ -37,10 +37,10 @@ create-network: ## Create networks
 create-controlplane: ## Bootstrap controlplane
 	terraform apply -target=module.controlplane
 	talosctl --talosconfig _cfgs/talosconfig config endpoint ${ENDPOINT}
-	talosctl --talosconfig _cfgs/talosconfig --nodes ${ENDPOINT} bootstrap
+	talosctl --talosconfig _cfgs/talosconfig --nodes 172.16.136.11 bootstrap
 
 create-kubeconfig: ## Download kubeconfig
-	talosctl --talosconfig _cfgs/talosconfig --nodes ${ENDPOINT} kubeconfig .
+	talosctl --talosconfig _cfgs/talosconfig --nodes 172.16.136.11 kubeconfig .
 	kubectl --kubeconfig=kubeconfig config set clusters.talos-k8s-azure.server https://${ENDPOINT}:6443
 	kubectl --kubeconfig=kubeconfig config set-context --current --namespace=kube-system
 	kubectl --kubeconfig=kubeconfig get pods -owide -A
diff --git a/azure/deployments/azure-cloud-controller-manager.yaml b/azure/deployments/azure-cloud-controller-manager.yaml
index 1607802..e456aa5 100644
--- a/azure/deployments/azure-cloud-controller-manager.yaml
+++ b/azure/deployments/azure-cloud-controller-manager.yaml
@@ -149,7 +149,7 @@ spec:
       hostNetwork: true
       serviceAccountName: azure-cloud-controller-manager
       nodeSelector:
-        node-role.kubernetes.io/master: ""
+        node-role.kubernetes.io/control-plane: ""
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
diff --git a/azure/deployments/local-path-storage.yaml b/azure/deployments/local-path-storage.yaml
index 8606064..91a7c7a 100644
--- a/azure/deployments/local-path-storage.yaml
+++ b/azure/deployments/local-path-storage.yaml
@@ -62,6 +62,8 @@ spec:
       tolerations:
         - key: "node-role.kubernetes.io/master"
           effect: NoSchedule
+        - key: "node-role.kubernetes.io/control-plane"
+          effect: NoSchedule
       serviceAccountName: local-path-provisioner-service-account
       containers:
         - name: local-path-provisioner
diff --git a/azure/deployments/metrics-server.yaml b/azure/deployments/metrics-server.yaml
index 78ac8e4..89d2774 100644
--- a/azure/deployments/metrics-server.yaml
+++ b/azure/deployments/metrics-server.yaml
@@ -129,12 +129,14 @@ spec:
     spec:
       nodeSelector:
         kubernetes.io/os: linux
-        node-role.kubernetes.io/master: ""
+        node-role.kubernetes.io/control-plane: ""
       tolerations:
         - key: "CriticalAddonsOnly"
           operator: "Exists"
         - key: "node-role.kubernetes.io/master"
           effect: NoSchedule
+        - key: "node-role.kubernetes.io/control-plane"
+          effect: NoSchedule
       containers:
       - args:
         - --cert-dir=/tmp
diff --git a/oracle/deployments/oci-cloud-controller-manager.yaml b/oracle/deployments/oci-cloud-controller-manager.yaml
index c5b48fd..21cc50e 100644
--- a/oracle/deployments/oci-cloud-controller-manager.yaml
+++ b/oracle/deployments/oci-cloud-controller-manager.yaml
@@ -173,7 +173,7 @@ spec:
         nameservers:
           - 169.254.169.254
       nodeSelector:
-        node-role.kubernetes.io/master: ""
+        node-role.kubernetes.io/control-plane: ""
       tolerations:
       - key: node.cloudprovider.kubernetes.io/uninitialized
         value: "true"