fix: correct storageclass annotations and node dnsPolicy in latest chart

Cherry-pick of PR kubernetes-csi#1102 for release-4.13 branch.

- Move annotations key inside with block to avoid rendering null annotations
- Fix node DaemonSet dnsPolicy to use node.dnsPolicy instead of controller.dnsPolicy

Author: andyzhangx

charts/latest/csi-driver-nfs-4.13.2.tgz

@@ -23,7 +23,7 @@ spec:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
       {{- end }}
       hostNetwork: true # original nfs connection would be broken without hostNetwork setting
-      dnsPolicy: {{ .Values.controller.dnsPolicy }}
+      dnsPolicy: {{ .Values.node.dnsPolicy }}
       serviceAccountName: {{ .Values.serviceAccount.node }}
       priorityClassName: {{ .Values.node.priorityClassName }}
       securityContext:

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

@@ -5,10 +5,10 @@ kind: StorageClass
 metadata:
   name: {{ .Values.storageClass.name }}
 {{ include "nfs.labels" . | indent 2 }}
+  {{- with .Values.storageClass.annotations }}
   annotations:
-    {{- with .Values.storageClass.annotations }}
     {{- toYaml . | nindent 4 }}
-    {{- end }}
+  {{- end }}
 provisioner: {{ .Values.driver.name }}
 {{- with .Values.storageClass.parameters }}
 parameters: