Skip to content

Commit 189e4ec

Browse files
committed
node affinity now prevents CSI driver from being scheduled on a node with a label 'type=virtual-kublet'
Added affinity field for windows and linux changes made to README
1 parent 542357c commit 189e4ec

File tree

4 files changed

+29
-0
lines changed

4 files changed

+29
-0
lines changed

manifest_staging/charts/secrets-store-csi-driver/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
2626
| `linux.image.repository` | Linux image repository | `k8s.gcr.io/csi-secrets-store/driver` |
2727
| `linux.image.pullPolicy` | Linux image pull policy | `Always` |
2828
| `linux.image.tag` | Linux image tag | `v0.0.21` |
29+
| `linux.affinity` | Linux affinity | `key: type; operator: NotIn; values: [virtual-kubelet]`|
2930
| `linux.driver.resources` | The resource request/limits for the linux secrets-store container image | `limits: 200m CPU, 200Mi; requests: 50m CPU, 100Mi` |
3031
| `linux.enabled` | Install secrets store csi driver on linux nodes | true |
3132
| `linux.kubeletRootDir` | Configure the kubelet root dir | `/var/lib/kubelet` |
@@ -51,6 +52,7 @@ The following table lists the configurable parameters of the csi-secrets-store-p
5152
| `windows.image.repository` | Windows image repository | `k8s.gcr.io/csi-secrets-store/driver` |
5253
| `windows.image.pullPolicy` | Windows image pull policy | `IfNotPresent` |
5354
| `windows.image.tag` | Windows image tag | `v0.0.21` |
55+
| `windows.affinity` | Windows affinity | `key: type; operator: NotIn; values: [virtual-kubelet]`|
5456
| `windows.driver.resources` | The resource request/limits for the windows secrets-store container image | `limits: 400m CPU, 400Mi; requests: 50m CPU, 100Mi` |
5557
| `windows.enabled` | Install secrets store csi driver on windows nodes | false |
5658
| `windows.kubeletRootDir` | Configure the kubelet root dir | `C:\var\lib\kubelet` |

manifest_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ spec:
2828
{{- end }}
2929
spec:
3030
serviceAccountName: secrets-store-csi-driver
31+
affinity:
32+
{{ toYaml .Values.windows.affinity | indent 8 }}
3133
containers:
3234
- name: node-driver-registrar
3335
image: "{{ .Values.windows.registrarImage.repository }}:{{ .Values.windows.registrarImage.tag }}"

manifest_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ spec:
2828
{{- end }}
2929
spec:
3030
serviceAccountName: secrets-store-csi-driver
31+
affinity:
32+
{{ toYaml .Values.linux.affinity | indent 8 }}
3133
containers:
3234
- name: node-driver-registrar
3335
image: "{{ .Values.linux.registrarImage.repository }}:{{ .Values.linux.registrarImage.tag }}"

manifest_staging/charts/secrets-store-csi-driver/values.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ linux:
55
tag: v0.0.21
66
pullPolicy: Always
77

8+
## Prevent the CSI driver from being scheduled on virtual-kublet nodes
9+
affinity:
10+
nodeAffinity:
11+
requiredDuringSchedulingIgnoredDuringExecution:
12+
nodeSelectorTerms:
13+
- matchExpressions:
14+
- key: type
15+
operator: NotIn
16+
values:
17+
- virtual-kubelet
18+
819
driver:
920
resources:
1021
limits:
@@ -43,6 +54,7 @@ linux:
4354
cpu: 10m
4455
memory: 20Mi
4556

57+
4658
updateStrategy:
4759
type: RollingUpdate
4860
rollingUpdate:
@@ -66,6 +78,17 @@ windows:
6678
tag: v0.0.21
6779
pullPolicy: IfNotPresent
6880

81+
## Prevent the CSI driver from being scheduled on virtual-kublet nodes
82+
affinity:
83+
nodeAffinity:
84+
requiredDuringSchedulingIgnoredDuringExecution:
85+
nodeSelectorTerms:
86+
- matchExpressions:
87+
- key: type
88+
operator: NotIn
89+
values:
90+
- virtual-kubelet
91+
6992
driver:
7093
resources:
7194
limits:

0 commit comments

Comments
 (0)