Merge pull request #3416 from lzhecheng/helm-node-selector

Update nodeSelector and tolerations
kubernetes-sigs · Feb 28, 2023 · 2b7efd4 · 2b7efd4
2 parents 3d4f5cd + 22291a3
commit 2b7efd4
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/hack/verify-helm-repo.sh b/hack/verify-helm-repo.sh
@@ -40,5 +40,6 @@ curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scrip
 chmod 700 get_helm.sh
 ./get_helm.sh
 helm template ./helm/cloud-provider-azure > /dev/null
+rm get_helm.sh
 
 exit 0
diff --git a/helm/cloud-provider-azure/Chart.yaml b/helm/cloud-provider-azure/Chart.yaml
@@ -13,4 +13,4 @@ maintainers:
 name: cloud-provider-azure
 sources:
 - https://github.com/kubernetes-sigs/cloud-provider-azure
-version: 1.26.5
+version: 1.26.5+20230228
diff --git a/helm/cloud-provider-azure/templates/cloud-provider-azure.yaml b/helm/cloud-provider-azure/templates/cloud-provider-azure.yaml
@@ -164,18 +164,9 @@ spec:
     spec:
       priorityClassName: system-node-critical
       hostNetwork: true
-      nodeSelector:
-  {{- if ge .Capabilities.KubeVersion.Minor "24" }}
-        node-role.kubernetes.io/control-plane: ""
-  {{- else }}
-        node-role.kubernetes.io/master: ""
-  {{- end }}
+      nodeSelector: {{ toYaml .Values.cloudControllerManager.nodeSelector | nindent 8 }}
       serviceAccountName: cloud-controller-manager
-      tolerations:
-        - key: node-role.kubernetes.io/master
-          effect: NoSchedule
-        - key: node-role.kubernetes.io/control-plane
-          effect: NoSchedule
+      tolerations: {{ toYaml .Values.cloudControllerManager.tolerations | nindent 8 }}
       topologySpreadConstraints:
       - maxSkew: 1
         topologyKey: kubernetes.io/hostname

diff --git a/helm/cloud-provider-azure/values.yaml b/helm/cloud-provider-azure/values.yaml
@@ -41,6 +41,15 @@ cloudControllerManager:
     requestsMem: "128Mi"
     limitsCPU: "4"
     limitsMem: "2Gi"
+  tolerations:
+  - key: node-role.kubernetes.io/master
+    effect: NoSchedule
+  - key: node-role.kubernetes.io/control-plane
+    effect: NoSchedule
+  - key: node-role.kubernetes.io/etcd
+    effect: NoExecute
+  nodeSelector:
+    node-role.kubernetes.io/control-plane: ""
 cloudNodeManager:
   enabled: true
   imageRepository: "mcr.microsoft.com/oss/kubernetes"

diff --git a/helm/repo/cloud-provider-azure-1.26.5+20230228.tgz b/helm/repo/cloud-provider-azure-1.26.5+20230228.tgz
diff --git a/helm/repo/index.yaml b/helm/repo/index.yaml
@@ -2,10 +2,10 @@ apiVersion: v1
 entries:
   cloud-provider-azure:
   - apiVersion: v1
-    created: "2023-02-15T10:09:42.405982-07:00"
+    created: "2023-02-28T06:34:43.100340078Z"
     description: A Helm chart for installing kubernetes-sigs/cloud-provider-azure
       components
-    digest: 2cc9a2ebdc6516f141b15c0aa2e07e06b53685201cf51a8d3441a1a1d30c300f
+    digest: d5355e8b6de6fc64bad856d4c2ea8d1afe7ada47f5c4fcba8526d66660bce327
     home: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/cloud-provider-azure/README.md
     keywords:
     - cloud-provider-azure
@@ -20,8 +20,8 @@ entries:
     sources:
     - https://github.com/kubernetes-sigs/cloud-provider-azure
     urls:
-    - cloud-provider-azure-1.26.5.tgz
-    version: 1.26.5
+    - cloud-provider-azure-1.26.5+20230228.tgz
+    version: 1.26.5+20230228
   - apiVersion: v1
     created: "2023-02-13T22:38:44.475108761Z"
     description: A Helm chart for installing kubernetes-sigs/cloud-provider-azure
@@ -358,4 +358,4 @@ entries:
     urls:
     - cloud-provider-azure-1.23.8.tgz
     version: 1.23.8
-generated: "2023-02-15T10:09:42.40491-07:00"
+generated: "2023-02-28T06:34:43.099407363Z"