Skip to content

Commit e21219e

Browse files
andyzhangxandyzhangx
authored
Merge pull request #1326 from andyzhangx/http-endpoint
feat: use new restricted liveness probe endpoint
2 parents ba7e78d + 8a7e4f4 commit e21219e

15 files changed

+34
-62
lines changed

‎charts/latest/blob-csi-driver-v0.0.0.tgz

9 Bytes
Binary file not shown.

‎charts/latest/blob-csi-driver/templates/csi-blob-controller.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ spec:
9191
args:
9292
- --csi-address=/csi/csi.sock
9393
- --probe-timeout=3s
94-
- --health-port={{ .Values.controller.livenessProbe.healthPort }}
94+
- --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
9595
imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
9696
volumeMounts:
9797
- name: socket-dir
@@ -114,17 +114,15 @@ spec:
114114
- "--cloud-config-secret-namespace={{ .Values.controller.cloudConfigSecretNamespace }}"
115115
- "--allow-empty-cloud-config={{ .Values.controller.allowEmptyCloudConfig }}"
116116
ports:
117-
- containerPort: {{ .Values.controller.livenessProbe.healthPort }}
118-
name: healthz
119-
protocol: TCP
120117
- containerPort: {{ .Values.controller.metricsPort }}
121118
name: metrics
122119
protocol: TCP
123120
livenessProbe:
124121
failureThreshold: 5
125122
httpGet:
123+
host: localhost
126124
path: /healthz
127-
port: healthz
125+
port: {{ .Values.controller.livenessProbe.healthPort }}
128126
initialDelaySeconds: 30
129127
timeoutSeconds: 10
130128
periodSeconds: 30

‎charts/latest/blob-csi-driver/templates/csi-blob-node.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ spec:
118118
args:
119119
- --csi-address=/csi/csi.sock
120120
- --probe-timeout=3s
121-
- --health-port={{ .Values.node.livenessProbe.healthPort }}
121+
- --http-endpoint=localhost:{{ .Values.node.livenessProbe.healthPort }}
122122
- --v=2
123123
resources: {{- toYaml .Values.node.resources.livenessProbe | nindent 12 }}
124124
- name: node-driver-registrar
@@ -174,15 +174,12 @@ spec:
174174
- "--allow-inline-volume-key-access-with-idenitity={{ .Values.node.allowInlineVolumeKeyAccessWithIdentity }}"
175175
- "--enable-aznfs-mount={{ .Values.node.enableAznfsMount }}"
176176
- "--metrics-address=0.0.0.0:{{ .Values.node.metricsPort }}"
177-
ports:
178-
- containerPort: {{ .Values.node.livenessProbe.healthPort }}
179-
name: healthz
180-
protocol: TCP
181177
livenessProbe:
182178
failureThreshold: 5
183179
httpGet:
180+
host: localhost
184181
path: /healthz
185-
port: healthz
182+
port: {{ .Values.node.livenessProbe.healthPort }}
186183
initialDelaySeconds: 30
187184
timeoutSeconds: 10
188185
periodSeconds: 30

‎charts/v1.23.3/blob-csi-driver-v1.23.3.tgz

5 Bytes
Binary file not shown.

‎charts/v1.23.3/blob-csi-driver/templates/csi-blob-controller.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ spec:
9191
args:
9292
- --csi-address=/csi/csi.sock
9393
- --probe-timeout=3s
94-
- --health-port={{ .Values.controller.livenessProbe.healthPort }}
94+
- --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
9595
imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
9696
volumeMounts:
9797
- name: socket-dir
@@ -114,17 +114,15 @@ spec:
114114
- "--cloud-config-secret-namespace={{ .Values.controller.cloudConfigSecretNamespace }}"
115115
- "--allow-empty-cloud-config={{ .Values.controller.allowEmptyCloudConfig }}"
116116
ports:
117-
- containerPort: {{ .Values.controller.livenessProbe.healthPort }}
118-
name: healthz
119-
protocol: TCP
120117
- containerPort: {{ .Values.controller.metricsPort }}
121118
name: metrics
122119
protocol: TCP
123120
livenessProbe:
124121
failureThreshold: 5
125122
httpGet:
123+
host: localhost
126124
path: /healthz
127-
port: healthz
125+
port: {{ .Values.controller.livenessProbe.healthPort }}
128126
initialDelaySeconds: 30
129127
timeoutSeconds: 10
130128
periodSeconds: 30

‎charts/v1.23.3/blob-csi-driver/templates/csi-blob-node.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ spec:
118118
args:
119119
- --csi-address=/csi/csi.sock
120120
- --probe-timeout=3s
121-
- --health-port={{ .Values.node.livenessProbe.healthPort }}
121+
- --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
122122
- --v=2
123123
resources: {{- toYaml .Values.node.resources.livenessProbe | nindent 12 }}
124124
- name: node-driver-registrar
@@ -173,15 +173,12 @@ spec:
173173
- "--mount-permissions={{ .Values.node.mountPermissions }}"
174174
- "--allow-inline-volume-key-access-with-idenitity={{ .Values.node.allowInlineVolumeKeyAccessWithIdentity }}"
175175
- "--enable-aznfs-mount={{ .Values.node.enableAznfsMount }}"
176-
ports:
177-
- containerPort: {{ .Values.node.livenessProbe.healthPort }}
178-
name: healthz
179-
protocol: TCP
180176
livenessProbe:
181177
failureThreshold: 5
182178
httpGet:
179+
host: localhost
183180
path: /healthz
184-
port: healthz
181+
port: {{ .Values.node.livenessProbe.healthPort }}
185182
initialDelaySeconds: 30
186183
timeoutSeconds: 10
187184
periodSeconds: 30

‎charts/v1.24.0/blob-csi-driver-v1.24.0.tgz

6 Bytes
Binary file not shown.

‎charts/v1.24.0/blob-csi-driver/templates/csi-blob-controller.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ spec:
9191
args:
9292
- --csi-address=/csi/csi.sock
9393
- --probe-timeout=3s
94-
- --health-port={{ .Values.controller.livenessProbe.healthPort }}
94+
- --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
9595
imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
9696
volumeMounts:
9797
- name: socket-dir
@@ -114,17 +114,15 @@ spec:
114114
- "--cloud-config-secret-namespace={{ .Values.controller.cloudConfigSecretNamespace }}"
115115
- "--allow-empty-cloud-config={{ .Values.controller.allowEmptyCloudConfig }}"
116116
ports:
117-
- containerPort: {{ .Values.controller.livenessProbe.healthPort }}
118-
name: healthz
119-
protocol: TCP
120117
- containerPort: {{ .Values.controller.metricsPort }}
121118
name: metrics
122119
protocol: TCP
123120
livenessProbe:
124121
failureThreshold: 5
125122
httpGet:
123+
host: localhost
126124
path: /healthz
127-
port: healthz
125+
port: {{ .Values.controller.livenessProbe.healthPort }}
128126
initialDelaySeconds: 30
129127
timeoutSeconds: 10
130128
periodSeconds: 30

‎charts/v1.24.0/blob-csi-driver/templates/csi-blob-node.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ spec:
118118
args:
119119
- --csi-address=/csi/csi.sock
120120
- --probe-timeout=3s
121-
- --health-port={{ .Values.node.livenessProbe.healthPort }}
121+
- --http-endpoint=localhost:{{ .Values.node.livenessProbe.healthPort }}
122122
- --v=2
123123
resources: {{- toYaml .Values.node.resources.livenessProbe | nindent 12 }}
124124
- name: node-driver-registrar
@@ -174,15 +174,12 @@ spec:
174174
- "--allow-inline-volume-key-access-with-idenitity={{ .Values.node.allowInlineVolumeKeyAccessWithIdentity }}"
175175
- "--enable-aznfs-mount={{ .Values.node.enableAznfsMount }}"
176176
- "--metrics-address=0.0.0.0:{{ .Values.node.metricsPort }}"
177-
ports:
178-
- containerPort: {{ .Values.node.livenessProbe.healthPort }}
179-
name: healthz
180-
protocol: TCP
181177
livenessProbe:
182178
failureThreshold: 5
183179
httpGet:
180+
host: localhost
184181
path: /healthz
185-
port: healthz
182+
port: {{ .Values.node.livenessProbe.healthPort }}
186183
initialDelaySeconds: 30
187184
timeoutSeconds: 10
188185
periodSeconds: 30

‎deploy/csi-blob-controller.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
args:
6363
- --csi-address=/csi/csi.sock
6464
- --probe-timeout=3s
65-
- --health-port=29632
65+
- --http-endpoint=localhost:29632
6666
volumeMounts:
6767
- name: socket-dir
6868
mountPath: /csi
@@ -81,17 +81,15 @@ spec:
8181
- "--metrics-address=0.0.0.0:29634"
8282
- "--user-agent-suffix=OSS-kubectl"
8383
ports:
84-
- containerPort: 29632
85-
name: healthz
86-
protocol: TCP
8784
- containerPort: 29634
8885
name: metrics
8986
protocol: TCP
9087
livenessProbe:
9188
failureThreshold: 5
9289
httpGet:
90+
host: localhost
9391
path: /healthz
94-
port: healthz
92+
port: 29632
9593
initialDelaySeconds: 30
9694
timeoutSeconds: 10
9795
periodSeconds: 30

‎deploy/csi-blob-node.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ spec:
8181
args:
8282
- --csi-address=/csi/csi.sock
8383
- --probe-timeout=3s
84-
- --health-port=29633
84+
- --http-endpoint=localhost:29633
8585
- --v=2
8686
resources:
8787
limits:
@@ -131,15 +131,12 @@ spec:
131131
- "--user-agent-suffix=OSS-kubectl"
132132
- "--metrics-address=0.0.0.0:29635"
133133
- "--enable-aznfs-mount=true"
134-
ports:
135-
- containerPort: 29633
136-
name: healthz
137-
protocol: TCP
138134
livenessProbe:
139135
failureThreshold: 5
140136
httpGet:
137+
host: localhost
141138
path: /healthz
142-
port: healthz
139+
port: 29633
143140
initialDelaySeconds: 30
144141
timeoutSeconds: 10
145142
periodSeconds: 30

‎deploy/v1.23.3/csi-blob-controller.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
args:
6363
- --csi-address=/csi/csi.sock
6464
- --probe-timeout=3s
65-
- --health-port=29632
65+
- --http-endpoint=localhost:29632
6666
volumeMounts:
6767
- name: socket-dir
6868
mountPath: /csi
@@ -81,17 +81,15 @@ spec:
8181
- "--metrics-address=0.0.0.0:29634"
8282
- "--user-agent-suffix=OSS-kubectl"
8383
ports:
84-
- containerPort: 29632
85-
name: healthz
86-
protocol: TCP
8784
- containerPort: 29634
8885
name: metrics
8986
protocol: TCP
9087
livenessProbe:
9188
failureThreshold: 5
9289
httpGet:
90+
host: localhost
9391
path: /healthz
94-
port: healthz
92+
port: 29632
9593
initialDelaySeconds: 30
9694
timeoutSeconds: 10
9795
periodSeconds: 30

‎deploy/v1.23.3/csi-blob-node.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ spec:
8181
args:
8282
- --csi-address=/csi/csi.sock
8383
- --probe-timeout=3s
84-
- --health-port=29633
84+
- --http-endpoint=localhost:29633
8585
- --v=2
8686
resources:
8787
limits:
@@ -129,15 +129,12 @@ spec:
129129
- "--blobfuse-proxy-endpoint=$(BLOBFUSE_PROXY_ENDPOINT)"
130130
- "--nodeid=$(KUBE_NODE_NAME)"
131131
- "--user-agent-suffix=OSS-kubectl"
132-
ports:
133-
- containerPort: 29633
134-
name: healthz
135-
protocol: TCP
136132
livenessProbe:
137133
failureThreshold: 5
138134
httpGet:
135+
host: localhost
139136
path: /healthz
140-
port: healthz
137+
port: 29633
141138
initialDelaySeconds: 30
142139
timeoutSeconds: 10
143140
periodSeconds: 30

‎deploy/v1.24.0/csi-blob-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
args:
6363
- --csi-address=/csi/csi.sock
6464
- --probe-timeout=3s
65-
- --health-port=29632
65+
- --http-endpoint=localhost:29632
6666
volumeMounts:
6767
- name: socket-dir
6868
mountPath: /csi

‎deploy/v1.24.0/csi-blob-node.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ spec:
8181
args:
8282
- --csi-address=/csi/csi.sock
8383
- --probe-timeout=3s
84-
- --health-port=29633
84+
- --http-endpoint=localhost:29633
8585
- --v=2
8686
resources:
8787
limits:
@@ -131,15 +131,12 @@ spec:
131131
- "--user-agent-suffix=OSS-kubectl"
132132
- "--metrics-address=0.0.0.0:29635"
133133
- "--enable-aznfs-mount=true"
134-
ports:
135-
- containerPort: 29633
136-
name: healthz
137-
protocol: TCP
138134
livenessProbe:
139135
failureThreshold: 5
140136
httpGet:
137+
host: localhost
141138
path: /healthz
142-
port: healthz
139+
port: 29633
143140
initialDelaySeconds: 30
144141
timeoutSeconds: 10
145142
periodSeconds: 30

0 commit comments

Comments
 (0)