diff --git a/charts/README.md b/charts/README.md index e0000980..62cf16fb 100644 --- a/charts/README.md +++ b/charts/README.md @@ -69,7 +69,6 @@ The following table lists the configurable parameters of the latest NFS CSI Driv | `controller.runOnControlPlane` | run controller on control plane node |`false` | | `controller.dnsPolicy` | dnsPolicy of controller driver, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` | `ClusterFirstWithHostNet` | | `controller.defaultOnDeletePolicy` | default policy for deleting subdirectory when deleting a volume, available values: `delete`, `retain`, `archive` | `delete` | -| `controller.livenessProbe.host ` | the health check host for the liveness probe | `localhost` | | `controller.livenessProbe.healthPort ` | the health check port for liveness probe | `29652` | | `controller.logLevel` | controller driver log level |`5` | | `controller.workingMountDir` | working directory for provisioner to mount nfs shares temporarily | `/tmp` | @@ -90,7 +89,6 @@ The following table lists the configurable parameters of the latest NFS CSI Driv | `node.dnsPolicy` | dnsPolicy of driver node daemonset, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` |`ClusterFirstWithHostNet` | `node.maxUnavailable` | `maxUnavailable` value of driver node daemonset | `1` | `node.logLevel` | node driver log level |`5` | -| `node.livenessProbe.host ` | the health check host for the liveness probe | `localhost` | | `node.livenessProbe.healthPort ` | the health check port for liveness probe |`29653` | | `node.affinity` | node pod affinity | {} | | `node.nodeSelector` | node pod node selector | `{}` | diff --git a/charts/latest/csi-driver-nfs-v0.0.0.tgz b/charts/latest/csi-driver-nfs-v0.0.0.tgz index 9cdaad59..119f1d63 100644 Binary files a/charts/latest/csi-driver-nfs-v0.0.0.tgz and b/charts/latest/csi-driver-nfs-v0.0.0.tgz differ diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml index 0b7eaacb..3c53c3f3 100644 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml +++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml @@ -100,7 +100,7 @@ spec: args: - --csi-address=/csi/csi.sock - --probe-timeout=3s - - --http-endpoint={{ .Values.controller.livenessProbe.host }}:{{ .Values.controller.livenessProbe.healthPort }} + - --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }} - --v=2 imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }} volumeMounts: @@ -140,7 +140,7 @@ spec: livenessProbe: failureThreshold: 5 httpGet: - host: {{ .Values.controller.livenessProbe.host }} + host: localhost path: /healthz port: {{ .Values.controller.livenessProbe.healthPort }} initialDelaySeconds: 30 diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml index f5dddc8a..cb42d57e 100644 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml +++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml @@ -52,7 +52,7 @@ spec: args: - --csi-address=/csi/csi.sock - --probe-timeout=3s - - --http-endpoint={{ .Values.node.livenessProbe.host }}:{{ .Values.node.livenessProbe.healthPort }} + - --http-endpoint=localhost:{{ .Values.node.livenessProbe.healthPort }} - --v=2 imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }} volumeMounts: @@ -121,7 +121,7 @@ spec: livenessProbe: failureThreshold: 5 httpGet: - host: {{ .Values.node.livenessProbe.host }} + host: localhost path: /healthz port: {{ .Values.node.livenessProbe.healthPort }} initialDelaySeconds: 30 diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml index c512acf0..5e075557 100755 --- a/charts/latest/csi-driver-nfs/values.yaml +++ b/charts/latest/csi-driver-nfs/values.yaml @@ -53,7 +53,6 @@ controller: runOnMaster: false runOnControlPlane: false livenessProbe: - host: localhost healthPort: 29652 logLevel: 5 workingMountDir: /tmp @@ -104,7 +103,6 @@ node: maxUnavailable: 1 logLevel: 5 livenessProbe: - host: localhost healthPort: 29653 affinity: {} nodeSelector: {} diff --git a/charts/v4.6.0/csi-driver-nfs-v4.6.0.tgz b/charts/v4.6.0/csi-driver-nfs-v4.6.0.tgz index ef47a77d..13617a21 100644 Binary files a/charts/v4.6.0/csi-driver-nfs-v4.6.0.tgz and b/charts/v4.6.0/csi-driver-nfs-v4.6.0.tgz differ diff --git a/charts/v4.6.0/csi-driver-nfs/templates/csi-nfs-controller.yaml b/charts/v4.6.0/csi-driver-nfs/templates/csi-nfs-controller.yaml index 9c92bc97..3c53c3f3 100644 --- a/charts/v4.6.0/csi-driver-nfs/templates/csi-nfs-controller.yaml +++ b/charts/v4.6.0/csi-driver-nfs/templates/csi-nfs-controller.yaml @@ -100,7 +100,7 @@ spec: args: - --csi-address=/csi/csi.sock - --probe-timeout=3s - - --health-port={{ .Values.controller.livenessProbe.healthPort }} + - --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }} - --v=2 imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }} volumeMounts: @@ -137,15 +137,12 @@ spec: fieldPath: spec.nodeName - name: CSI_ENDPOINT value: unix:///csi/csi.sock - ports: - - containerPort: {{ .Values.controller.livenessProbe.healthPort }} - name: healthz - protocol: TCP livenessProbe: failureThreshold: 5 httpGet: + host: localhost path: /healthz - port: healthz + port: {{ .Values.controller.livenessProbe.healthPort }} initialDelaySeconds: 30 timeoutSeconds: 10 periodSeconds: 30 diff --git a/charts/v4.6.0/csi-driver-nfs/templates/csi-nfs-node.yaml b/charts/v4.6.0/csi-driver-nfs/templates/csi-nfs-node.yaml index de9842b5..cb42d57e 100644 --- a/charts/v4.6.0/csi-driver-nfs/templates/csi-nfs-node.yaml +++ b/charts/v4.6.0/csi-driver-nfs/templates/csi-nfs-node.yaml @@ -52,7 +52,7 @@ spec: args: - --csi-address=/csi/csi.sock - --probe-timeout=3s - - --health-port={{ .Values.node.livenessProbe.healthPort }} + - --http-endpoint=localhost:{{ .Values.node.livenessProbe.healthPort }} - --v=2 imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }} volumeMounts: @@ -118,15 +118,12 @@ spec: fieldPath: spec.nodeName - name: CSI_ENDPOINT value: unix:///csi/csi.sock - ports: - - containerPort: {{ .Values.node.livenessProbe.healthPort }} - name: healthz - protocol: TCP livenessProbe: failureThreshold: 5 httpGet: + host: localhost path: /healthz - port: healthz + port: {{ .Values.node.livenessProbe.healthPort }} initialDelaySeconds: 30 timeoutSeconds: 10 periodSeconds: 30 diff --git a/deploy/csi-nfs-controller.yaml b/deploy/csi-nfs-controller.yaml index 0e9d394f..d9d22174 100644 --- a/deploy/csi-nfs-controller.yaml +++ b/deploy/csi-nfs-controller.yaml @@ -81,7 +81,7 @@ spec: args: - --csi-address=/csi/csi.sock - --probe-timeout=3s - - --health-port=29652 + - --http-endpoint=localhost:29652 - --v=2 volumeMounts: - name: socket-dir @@ -111,15 +111,12 @@ spec: fieldPath: spec.nodeName - name: CSI_ENDPOINT value: unix:///csi/csi.sock - ports: - - containerPort: 29652 - name: healthz - protocol: TCP livenessProbe: failureThreshold: 5 httpGet: + host: localhost path: /healthz - port: healthz + port: 29652 initialDelaySeconds: 30 timeoutSeconds: 10 periodSeconds: 30 diff --git a/deploy/csi-nfs-node.yaml b/deploy/csi-nfs-node.yaml index 48c67517..bcdc2999 100644 --- a/deploy/csi-nfs-node.yaml +++ b/deploy/csi-nfs-node.yaml @@ -34,7 +34,7 @@ spec: args: - --csi-address=/csi/csi.sock - --probe-timeout=3s - - --health-port=29653 + - --http-endpoint=localhost:29653 - --v=2 volumeMounts: - name: socket-dir @@ -95,15 +95,12 @@ spec: fieldPath: spec.nodeName - name: CSI_ENDPOINT value: unix:///csi/csi.sock - ports: - - containerPort: 29653 - name: healthz - protocol: TCP livenessProbe: failureThreshold: 5 httpGet: + host: localhost path: /healthz - port: healthz + port: 29653 initialDelaySeconds: 30 timeoutSeconds: 10 periodSeconds: 30 diff --git a/deploy/v4.6.0/csi-nfs-controller.yaml b/deploy/v4.6.0/csi-nfs-controller.yaml index 74948751..16ba3600 100644 --- a/deploy/v4.6.0/csi-nfs-controller.yaml +++ b/deploy/v4.6.0/csi-nfs-controller.yaml @@ -81,7 +81,7 @@ spec: args: - --csi-address=/csi/csi.sock - --probe-timeout=3s - - --health-port=29652 + - --http-endpoint=localhost:29652 - --v=2 volumeMounts: - name: socket-dir @@ -111,15 +111,12 @@ spec: fieldPath: spec.nodeName - name: CSI_ENDPOINT value: unix:///csi/csi.sock - ports: - - containerPort: 29652 - name: healthz - protocol: TCP livenessProbe: failureThreshold: 5 httpGet: + host: localhost path: /healthz - port: healthz + port: 29652 initialDelaySeconds: 30 timeoutSeconds: 10 periodSeconds: 30 diff --git a/deploy/v4.6.0/csi-nfs-node.yaml b/deploy/v4.6.0/csi-nfs-node.yaml index d3982b5e..63b00809 100644 --- a/deploy/v4.6.0/csi-nfs-node.yaml +++ b/deploy/v4.6.0/csi-nfs-node.yaml @@ -34,7 +34,7 @@ spec: args: - --csi-address=/csi/csi.sock - --probe-timeout=3s - - --health-port=29653 + - --http-endpoint=localhost:29653 - --v=2 volumeMounts: - name: socket-dir @@ -95,15 +95,12 @@ spec: fieldPath: spec.nodeName - name: CSI_ENDPOINT value: unix:///csi/csi.sock - ports: - - containerPort: 29653 - name: healthz - protocol: TCP livenessProbe: failureThreshold: 5 httpGet: + host: localhost path: /healthz - port: healthz + port: 29653 initialDelaySeconds: 30 timeoutSeconds: 10 periodSeconds: 30