From 330aaba1372f631c00de24374f0ec834ccd3e4d4 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Mon, 1 Apr 2024 02:25:50 +0000 Subject: [PATCH 1/3] feat: use new restricted liveness probe endpoint on v4.6.0 fix --- charts/v4.6.0/csi-driver-nfs-v4.6.0.tgz | Bin 10997 -> 10979 bytes .../templates/csi-nfs-controller.yaml | 9 +++------ .../templates/csi-nfs-node.yaml | 9 +++------ 3 files changed, 6 insertions(+), 12 deletions(-) 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 ef47a77d0f4b52553a4d17507cfe2acdc032fb77..13617a21e016e7b5a8c58e04458d62a928468dcb 100644 GIT binary patch delta 10601 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 DJs{er delta 10658 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 IX8>FQ08Gx>2><{9 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 9c92bc972..3c53c3f38 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 de9842b5b..cb42d57e1 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 From a8a69e6c8222fa4a5eaa6724029c688096d414f4 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Mon, 1 Apr 2024 02:40:46 +0000 Subject: [PATCH 2/3] cleanup: remove livenessProbe.host chart field --- charts/README.md | 2 -- charts/latest/csi-driver-nfs-v0.0.0.tgz | Bin 11026 -> 11008 bytes .../templates/csi-nfs-controller.yaml | 4 ++-- .../templates/csi-nfs-node.yaml | 4 ++-- charts/latest/csi-driver-nfs/values.yaml | 2 -- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/charts/README.md b/charts/README.md index e00009808..62cf16fb3 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 9cdaad594a947b60a56b77acb943237f5c15f308..119f1d63cb72b9de4664422cd8f9f11bc0af8ea0 100644 GIT binary patch delta 10847 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 delta 10865 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 H09*k8Nfl8z 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 0b7eaacb9..3c53c3f38 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 f5dddc8ac..cb42d57e1 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 c512acf02..5e0755577 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: {} From 048b94318819ead2695f8a9676f8ff06e9daee61 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Mon, 1 Apr 2024 07:23:12 +0000 Subject: [PATCH 3/3] feat: use new restricted liveness probe endpoint on kubectl install --- deploy/csi-nfs-controller.yaml | 9 +++------ deploy/csi-nfs-node.yaml | 9 +++------ deploy/v4.6.0/csi-nfs-controller.yaml | 9 +++------ deploy/v4.6.0/csi-nfs-node.yaml | 9 +++------ 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/deploy/csi-nfs-controller.yaml b/deploy/csi-nfs-controller.yaml index 0e9d394fa..d9d221748 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 48c675175..bcdc2999d 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 749487515..16ba3600c 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 d3982b5ec..63b008090 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