Merge pull request #860 from andyzhangx/fix-affinity-chart

fix: incorrect affinity chart config

Author: andyzhangx

charts/latest/csi-driver-nfs-v0.0.0.tgz

@@ -25,10 +25,10 @@ spec:
       dnsPolicy: {{ .Values.controller.dnsPolicy }}
       serviceAccountName: {{ .Values.serviceAccount.controller }}
     # runOnControlPlane=true or runOnMaster=true only takes effect if affinity is not set
-    {{- if contains (tpl "{{ .Values.controller.affinity }}" .) "nodeSelectorTerms" }}
+    {{- if tpl "{{ .Values.controller.affinity }}" . | contains "nodeSelectorTerms" }}
       {{- with .Values.controller.affinity }}
       affinity:
-      {{ toYaml . | indent 8 }}
+{{ toYaml . | indent 8 }}
       {{- end }}
     {{- else if or .Values.controller.runOnControlPlane .Values.controller.runOnMaster}}
       affinity:

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

@@ -47,10 +47,10 @@ spec:
       nodeSelector:
         kubernetes.io/os: linux
     # runOnControlPlane=true or runOnMaster=true only takes effect if affinity is not set
-    {{- if contains (tpl "{{ .Values.controller.affinity }}" .) "nodeSelectorTerms" }}
+    {{- if tpl "{{ .Values.controller.affinity }}" . | contains "nodeSelectorTerms" }}
       {{- with .Values.controller.affinity }}
       affinity:
-      {{ toYaml . | indent 8 }}
+{{ toYaml . | indent 8 }}
       {{- end }}
     {{- else if or .Values.controller.runOnControlPlane .Values.controller.runOnMaster}}
       affinity: