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.

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

feat: add affinity and node affinity as values #1029

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified charts/latest/azuredisk-csi-driver-v1.8.0.tgz
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ spec:
{{- with .Values.controller.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.controller.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{- end }}
{{- include "azuredisk.pullSecrets" . | indent 6 }}
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,7 @@ spec:
kubernetes.io/os: windows
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: type
operator: NotIn
values:
- virtual-kubelet
{{ toYaml .Values.windows.nodeAffinity | indent 10 }}
priorityClassName: system-node-critical
{{- include "azuredisk.pullSecrets" . | indent 6 }}
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,7 @@ spec:
kubernetes.io/os: linux
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: type
operator: NotIn
values:
- virtual-kubelet
{{ toYaml .Values.linux.nodeAffinity | indent 10 }}
priorityClassName: system-node-critical
{{- with .Values.linux.tolerations }}
tolerations:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ spec:
{{- with .Values.controller.tolerations }}
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}
{{- with .Values.controller.affinity }}
affinity:
{{ toYaml . | indent 8 }}
{{- end }}
{{- include "azuredisk.pullSecrets" . | indent 6 }}
containers:
Expand Down
16 changes: 16 additions & 0 deletions charts/latest/azuredisk-csi-driver/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,14 @@ linux:
- operator: "Exists"
hostNetwork: true # this setting could be disabled if perfProfile is `none`
podLabels: {}
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: type
operator: NotIn
values:
- virtual-kubelet

windows:
enabled: true
Expand All @@ -118,6 +126,14 @@ windows:
operator: "Exists"
effect: "NoSchedule"
podLabels: {}
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: type
operator: NotIn
values:
- virtual-kubelet

cloud: AzurePublicCloud

Expand Down