Skip to content

Commit 6f183d1

Browse files
authored
Merge pull request #1104 from andyzhangx/cherry-pick-1102-release-4.13
fix: cherry-pick #1102 - correct storageclass annotations and node dnsPolicy in latest chart
2 parents e1ffeff + 0fc5ce3 commit 6f183d1

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

-8 Bytes
Binary file not shown.

charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
{{ toYaml .Values.imagePullSecrets | indent 8 }}
2424
{{- end }}
2525
hostNetwork: true # original nfs connection would be broken without hostNetwork setting
26-
dnsPolicy: {{ .Values.controller.dnsPolicy }}
26+
dnsPolicy: {{ .Values.node.dnsPolicy }}
2727
serviceAccountName: {{ .Values.serviceAccount.node }}
2828
priorityClassName: {{ .Values.node.priorityClassName }}
2929
securityContext:

charts/latest/csi-driver-nfs/templates/storageclass.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ kind: StorageClass
55
metadata:
66
name: {{ .Values.storageClass.name }}
77
{{ include "nfs.labels" . | indent 2 }}
8+
{{- with .Values.storageClass.annotations }}
89
annotations:
9-
{{- with .Values.storageClass.annotations }}
1010
{{- toYaml . | nindent 4 }}
11-
{{- end }}
11+
{{- end }}
1212
provisioner: {{ .Values.driver.name }}
1313
{{- with .Values.storageClass.parameters }}
1414
parameters:

0 commit comments

Comments
 (0)