Skip to content
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

[release-1.24] fix: liveness probe failure when hostNetwork not enabled in controller #1377

Merged
merged 1 commit into from
May 6, 2024
Merged

[release-1.24] fix: liveness probe failure when hostNetwork not enabled in controller #1377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified charts/latest/blob-csi-driver-v1.24.1.tgz
View file
Open in desktop
Binary file not shown.
15 changes: 14 additions & 1 deletion charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ spec:
args:
- --csi-address=/csi/csi.sock
- --probe-timeout=3s
{{- if eq .Values.controller.hostNetwork true }}
- --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
{{- else }}
- --health-port={{ .Values.controller.livenessProbe.healthPort }}
{{- end }}
imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
volumeMounts:
- name: socket-dir
Expand All @@ -117,12 +121,21 @@ spec:
- containerPort: {{ .Values.controller.metricsPort }}
name: metrics
protocol: TCP
{{- if ne .Values.controller.hostNetwork true }}
- containerPort: {{ .Values.controller.livenessProbe.healthPort }}
name: healthz
protocol: TCP
{{- end }}
livenessProbe:
failureThreshold: 5
httpGet:
host: localhost
path: /healthz
{{- if eq .Values.controller.hostNetwork true }}
host: localhost
port: {{ .Values.controller.livenessProbe.healthPort }}
{{- else }}
port: healthz
{{- end }}
initialDelaySeconds: 30
timeoutSeconds: 10
periodSeconds: 30
Expand Down
Binary file modified charts/v1.24.1/blob-csi-driver-v1.24.1.tgz
View file
Open in desktop
Binary file not shown.
15 changes: 14 additions & 1 deletion charts/v1.24.1/blob-csi-driver/templates/csi-blob-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ spec:
args:
- --csi-address=/csi/csi.sock
- --probe-timeout=3s
{{- if eq .Values.controller.hostNetwork true }}
- --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
{{- else }}
- --health-port={{ .Values.controller.livenessProbe.healthPort }}
{{- end }}
imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
volumeMounts:
- name: socket-dir
Expand All @@ -117,12 +121,21 @@ spec:
- containerPort: {{ .Values.controller.metricsPort }}
name: metrics
protocol: TCP
{{- if ne .Values.controller.hostNetwork true }}
- containerPort: {{ .Values.controller.livenessProbe.healthPort }}
name: healthz
protocol: TCP
{{- end }}
livenessProbe:
failureThreshold: 5
httpGet:
host: localhost
path: /healthz
{{- if eq .Values.controller.hostNetwork true }}
host: localhost
port: {{ .Values.controller.livenessProbe.healthPort }}
{{- else }}
port: healthz
{{- end }}
initialDelaySeconds: 30
timeoutSeconds: 10
periodSeconds: 30
Expand Down
Loading