Merge pull request #2376 from kubernetes-sigs/fix-affinity-chart-1.30

[release-1.30] fix: incorrect affinity chart config

Author: andyzhangx

charts/latest/azurefile-csi-driver-v1.30.7.tgz

@@ -45,10 +45,10 @@ spec:
 {{ toYaml . | indent 8 }}
 {{- end }}
     # 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/azurefile-csi-driver/templates/csi-azurefile-controller.yaml

@@ -46,10 +46,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: