Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update nodeSelector and tolerations #3416

Merged
merged 1 commit into from
Feb 28, 2023
Merged

Update nodeSelector and tolerations #3416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions hack/verify-helm-repo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion helm/cloud-provider-azure/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 2 additions & 11 deletions helm/cloud-provider-azure/templates/cloud-provider-azure.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions helm/cloud-provider-azure/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Binary file added helm/repo/cloud-provider-azure-1.26.5+20230228.tgz
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions helm/repo/index.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apiVersion: v1
entries:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we modify the existing index or create a new one?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So far, we always use this one.

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
Expand All @@ -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
Expand Down Expand Up @@ -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"