Skip to content

feat: use new restricted liveness probe endpoint on v4.6.0 #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 2, 2024
Merged

feat: use new restricted liveness probe endpoint on v4.6.0 #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
330aaba
feat: use new restricted liveness probe endpoint on v4.6.0
andyzhangx Apr 1, 2024
a8a69e6
cleanup: remove livenessProbe.host chart field
andyzhangx Apr 1, 2024
048b943
feat: use new restricted liveness probe endpoint on kubectl install
andyzhangx Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions charts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand All @@ -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 | `{}` |
Expand Down
Binary file modified charts/latest/csi-driver-nfs-v0.0.0.tgz
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions charts/latest/csi-driver-nfs/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ controller:
runOnMaster: false
runOnControlPlane: false
livenessProbe:
host: localhost
healthPort: 29652
logLevel: 5
workingMountDir: /tmp
Expand Down Expand Up @@ -104,7 +103,6 @@ node:
maxUnavailable: 1
logLevel: 5
livenessProbe:
host: localhost
healthPort: 29653
affinity: {}
nodeSelector: {}
Expand Down
Binary file modified charts/v4.6.0/csi-driver-nfs-v4.6.0.tgz
View file
Open in desktop
Binary file not shown.
9 changes: 3 additions & 6 deletions charts/v4.6.0/csi-driver-nfs/templates/csi-nfs-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions charts/v4.6.0/csi-driver-nfs/templates/csi-nfs-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions deploy/csi-nfs-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions deploy/csi-nfs-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions deploy/v4.6.0/csi-nfs-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions deploy/v4.6.0/csi-nfs-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down