Merge pull request #1100 from andyzhangx/revert-move-nodeDriverRegistrar

Revert "refactor: move nodeDriverRegistrar config under node section"

Author: andyzhangx

charts/README.md

@@ -92,12 +92,12 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
 | `controller.resources.nfs.limits.memory`              | csi-driver-nfs memory limits                         | 200Mi                                                          |
 | `controller.resources.nfs.requests.cpu`               | csi-driver-nfs cpu requests limits                   | 10m                                                            |
 | `controller.resources.nfs.requests.memory`            | csi-driver-nfs memory requests limits                | 20Mi                                                           |
-| `node.nodeDriverRegistrar.healthPort`                        | health check port for node-driver-registrar liveness probe        | `19809`    |
-| `node.nodeDriverRegistrar.livenessProbe.enabled`             | enable node-driver-registrar liveness probe               | `false`    |
-| `node.nodeDriverRegistrar.livenessProbe.initialDelaySeconds` | node-driver-registrar liveness probe initialDelaySeconds   | `20`       |
-| `node.nodeDriverRegistrar.livenessProbe.timeoutSeconds`      | node-driver-registrar liveness probe timeoutSeconds                             | `10`       |
-| `node.nodeDriverRegistrar.livenessProbe.periodSeconds`       | node-driver-registrar liveness probe periodSeconds                       | `20`        |
-| `node.nodeDriverRegistrar.livenessProbe.failureThreshold`    | node-driver-registrar liveness probe failureThreshold | `2`        |
+| `nodeDriverRegistrar.healthPort`                        | health check port for node-driver-registrar liveness probe        | `19809`    |
+| `nodeDriverRegistrar.livenessProbe.enabled`             | enable node-driver-registrar liveness probe               | `false`    |
+| `nodeDriverRegistrar.livenessProbe.initialDelaySeconds` | node-driver-registrar liveness probe initialDelaySeconds   | `20`       |
+| `nodeDriverRegistrar.livenessProbe.timeoutSeconds`      | node-driver-registrar liveness probe timeoutSeconds                             | `10`       |
+| `nodeDriverRegistrar.livenessProbe.periodSeconds`       | node-driver-registrar liveness probe periodSeconds                       | `20`        |
+| `nodeDriverRegistrar.livenessProbe.failureThreshold`    | node-driver-registrar liveness probe failureThreshold | `2`        |
 | `node.name`                                           | driver node daemonset name                            | `csi-nfs-node`
 | `node.dnsPolicy`                                      | dnsPolicy of driver node daemonset, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst`          |`ClusterFirstWithHostNet`
 | `node.maxUnavailable`                             | `maxUnavailable` value of driver node daemonset                            | `1`

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

@@ -74,8 +74,8 @@ spec:
             - --v=2
             - --csi-address=/csi/csi.sock
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-{{- if .Values.node.nodeDriverRegistrar.livenessProbe.enabled }}
-            - --http-endpoint=localhost:{{ .Values.node.nodeDriverRegistrar.healthPort }}
+{{- if .Values.nodeDriverRegistrar.livenessProbe.enabled }}
+            - --http-endpoint=localhost:{{ .Values.nodeDriverRegistrar.healthPort }}
 {{- end }}
           env:
             - name: DRIVER_REG_SOCK_PATH
@@ -90,20 +90,20 @@ spec:
               mountPath: /csi
             - name: registration-dir
               mountPath: /registration
-{{- if .Values.node.nodeDriverRegistrar.livenessProbe.enabled }}
+{{- if .Values.nodeDriverRegistrar.livenessProbe.enabled }}
           ports:
             - name: healthz
-              containerPort: {{ .Values.node.nodeDriverRegistrar.healthPort }}
+              containerPort: {{ .Values.nodeDriverRegistrar.healthPort }}
               protocol: TCP
           livenessProbe:
             httpGet:
               host: localhost
               path: /healthz
               port: healthz
-            initialDelaySeconds: {{ .Values.node.nodeDriverRegistrar.livenessProbe.initialDelaySeconds }}
-            timeoutSeconds: {{ .Values.node.nodeDriverRegistrar.livenessProbe.timeoutSeconds }}
-            periodSeconds: {{ .Values.node.nodeDriverRegistrar.livenessProbe.periodSeconds }}
-            failureThreshold: {{ .Values.node.nodeDriverRegistrar.livenessProbe.failureThreshold }}
+            initialDelaySeconds: {{ .Values.nodeDriverRegistrar.livenessProbe.initialDelaySeconds }}
+            timeoutSeconds: {{ .Values.nodeDriverRegistrar.livenessProbe.timeoutSeconds }}
+            periodSeconds: {{ .Values.nodeDriverRegistrar.livenessProbe.periodSeconds }}
+            failureThreshold: {{ .Values.nodeDriverRegistrar.livenessProbe.failureThreshold }}
 {{- end }}
           resources: {{- toYaml .Values.node.resources.nodeDriverRegistrar | nindent 12 }}
           securityContext:

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

@@ -113,21 +113,22 @@ controller:
         cpu: 10m
         memory: 20Mi
 
+nodeDriverRegistrar:
+  healthPort: 19809
+  livenessProbe:
+    enabled: true
+    initialDelaySeconds: 20
+    timeoutSeconds: 10
+    periodSeconds: 20
+    failureThreshold: 2
+
 node:
   name: csi-nfs-node
   dnsPolicy: ClusterFirstWithHostNet  # available values: Default, ClusterFirstWithHostNet, ClusterFirst
   maxUnavailable: 1
   logLevel: 5
   livenessProbe:
     healthPort: 29653
-  nodeDriverRegistrar:
-    healthPort: 19809
-    livenessProbe:
-      enabled: true
-      initialDelaySeconds: 20
-      timeoutSeconds: 10
-      periodSeconds: 20
-      failureThreshold: 2
   affinity: {}
   nodeSelector: {}
   priorityClassName: system-cluster-critical