Skip to content

Commit 28d9213

Browse files
gambthogambtho
committed
helm: Add ability to set scheme for probes
1 parent 6e59afb commit 28d9213

25 files changed

+403
-0
lines changed

‎charts/headlamp/README.md‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,42 @@ httpRoute:
242242
port: 80
243243
```
244244

245+
### Probe Configuration
246+
247+
| Key | Type | Default | Description |
248+
|-----|------|---------|-------------|
249+
| probes.scheme | string | `"HTTP"` | Scheme for liveness/readiness probes (HTTP or HTTPS). Set to HTTPS when TLS is enabled at the backend. |
250+
| probes.livenessProbe.initialDelaySeconds | int | `0` | Initial delay before liveness probe starts |
251+
| probes.livenessProbe.periodSeconds | int | `10` | Period between liveness checks |
252+
| probes.livenessProbe.timeoutSeconds | int | `1` | Timeout for liveness probe |
253+
| probes.livenessProbe.successThreshold | int | `1` | Minimum consecutive successes |
254+
| probes.livenessProbe.failureThreshold | int | `3` | Minimum consecutive failures |
255+
| probes.readinessProbe.initialDelaySeconds | int | `0` | Initial delay before readiness probe starts |
256+
| probes.readinessProbe.periodSeconds | int | `10` | Period between readiness checks |
257+
| probes.readinessProbe.timeoutSeconds | int | `1` | Timeout for readiness probe |
258+
| probes.readinessProbe.successThreshold | int | `1` | Minimum consecutive successes |
259+
| probes.readinessProbe.failureThreshold | int | `3` | Minimum consecutive failures |
260+
261+
When using TLS termination at the backend server, you must set `probes.scheme` to `HTTPS`:
262+
263+
```yaml
264+
config:
265+
tlsCertPath: "/headlamp-cert/tls.crt"
266+
tlsKeyPath: "/headlamp-cert/tls.key"
267+
268+
probes:
269+
scheme: HTTPS # Required when TLS is enabled at backend
270+
271+
volumes:
272+
- name: headlamp-cert
273+
secret:
274+
secretName: headlamp-tls
275+
276+
volumeMounts:
277+
- name: headlamp-cert
278+
mountPath: /headlamp-cert
279+
```
280+
245281
### Resource Management
246282

247283
| Key | Type | Default | Description |

‎charts/headlamp/templates/deployment.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,22 @@ spec:
332332
httpGet:
333333
path: "{{ .Values.config.baseURL }}/"
334334
port: http
335+
scheme: {{ .Values.probes.scheme | default "HTTP" }}
336+
initialDelaySeconds: {{ .Values.probes.livenessProbe.initialDelaySeconds | default 0 }}
337+
periodSeconds: {{ .Values.probes.livenessProbe.periodSeconds | default 10 }}
338+
timeoutSeconds: {{ .Values.probes.livenessProbe.timeoutSeconds | default 1 }}
339+
successThreshold: {{ .Values.probes.livenessProbe.successThreshold | default 1 }}
340+
failureThreshold: {{ .Values.probes.livenessProbe.failureThreshold | default 3 }}
335341
readinessProbe:
336342
httpGet:
337343
path: "{{ .Values.config.baseURL }}/"
338344
port: http
345+
scheme: {{ .Values.probes.scheme | default "HTTP" }}
346+
initialDelaySeconds: {{ .Values.probes.readinessProbe.initialDelaySeconds | default 0 }}
347+
periodSeconds: {{ .Values.probes.readinessProbe.periodSeconds | default 10 }}
348+
timeoutSeconds: {{ .Values.probes.readinessProbe.timeoutSeconds | default 1 }}
349+
successThreshold: {{ .Values.probes.readinessProbe.successThreshold | default 1 }}
350+
failureThreshold: {{ .Values.probes.readinessProbe.failureThreshold | default 3 }}
339351
resources:
340352
{{- toYaml .Values.resources | nindent 12 }}
341353
{{- if or .Values.pluginsManager.enabled .Values.volumeMounts }}

‎charts/headlamp/tests/expected_templates/azure-oidc-with-validators.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,21 @@ spec:
135135
httpGet:
136136
path: "/"
137137
port: http
138+
scheme: HTTP
139+
initialDelaySeconds: 0
140+
periodSeconds: 10
141+
timeoutSeconds: 1
142+
successThreshold: 1
143+
failureThreshold: 3
138144
readinessProbe:
139145
httpGet:
140146
path: "/"
141147
port: http
148+
scheme: HTTP
149+
initialDelaySeconds: 0
150+
periodSeconds: 10
151+
timeoutSeconds: 1
152+
successThreshold: 1
153+
failureThreshold: 3
142154
resources:
143155
{}

‎charts/headlamp/tests/expected_templates/default.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,21 @@ spec:
120120
httpGet:
121121
path: "/"
122122
port: http
123+
scheme: HTTP
124+
initialDelaySeconds: 0
125+
periodSeconds: 10
126+
timeoutSeconds: 1
127+
successThreshold: 1
128+
failureThreshold: 3
123129
readinessProbe:
124130
httpGet:
125131
path: "/"
126132
port: http
133+
scheme: HTTP
134+
initialDelaySeconds: 0
135+
periodSeconds: 10
136+
timeoutSeconds: 1
137+
successThreshold: 1
138+
failureThreshold: 3
127139
resources:
128140
{}

‎charts/headlamp/tests/expected_templates/extra-args.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,21 @@ spec:
121121
httpGet:
122122
path: "/"
123123
port: http
124+
scheme: HTTP
125+
initialDelaySeconds: 0
126+
periodSeconds: 10
127+
timeoutSeconds: 1
128+
successThreshold: 1
129+
failureThreshold: 3
124130
readinessProbe:
125131
httpGet:
126132
path: "/"
127133
port: http
134+
scheme: HTTP
135+
initialDelaySeconds: 0
136+
periodSeconds: 10
137+
timeoutSeconds: 1
138+
successThreshold: 1
139+
failureThreshold: 3
128140
resources:
129141
{}

‎charts/headlamp/tests/expected_templates/extra-manifests.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,21 @@ spec:
137137
httpGet:
138138
path: "/"
139139
port: http
140+
scheme: HTTP
141+
initialDelaySeconds: 0
142+
periodSeconds: 10
143+
timeoutSeconds: 1
144+
successThreshold: 1
145+
failureThreshold: 3
140146
readinessProbe:
141147
httpGet:
142148
path: "/"
143149
port: http
150+
scheme: HTTP
151+
initialDelaySeconds: 0
152+
periodSeconds: 10
153+
timeoutSeconds: 1
154+
successThreshold: 1
155+
failureThreshold: 3
144156
resources:
145157
{}

‎charts/headlamp/tests/expected_templates/httproute-enabled.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,22 @@ spec:
120120
httpGet:
121121
path: "/"
122122
port: http
123+
scheme: HTTP
124+
initialDelaySeconds: 0
125+
periodSeconds: 10
126+
timeoutSeconds: 1
127+
successThreshold: 1
128+
failureThreshold: 3
123129
readinessProbe:
124130
httpGet:
125131
path: "/"
126132
port: http
133+
scheme: HTTP
134+
initialDelaySeconds: 0
135+
periodSeconds: 10
136+
timeoutSeconds: 1
137+
successThreshold: 1
138+
failureThreshold: 3
127139
resources:
128140
{}
129141
---

‎charts/headlamp/tests/expected_templates/me-user-info-url-directly.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,21 @@ spec:
123123
httpGet:
124124
path: "/"
125125
port: http
126+
scheme: HTTP
127+
initialDelaySeconds: 0
128+
periodSeconds: 10
129+
timeoutSeconds: 1
130+
successThreshold: 1
131+
failureThreshold: 3
126132
readinessProbe:
127133
httpGet:
128134
path: "/"
129135
port: http
136+
scheme: HTTP
137+
initialDelaySeconds: 0
138+
periodSeconds: 10
139+
timeoutSeconds: 1
140+
successThreshold: 1
141+
failureThreshold: 3
130142
resources:
131143
{}

‎charts/headlamp/tests/expected_templates/me-user-info-url.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,21 @@ spec:
126126
httpGet:
127127
path: "/"
128128
port: http
129+
scheme: HTTP
130+
initialDelaySeconds: 0
131+
periodSeconds: 10
132+
timeoutSeconds: 1
133+
successThreshold: 1
134+
failureThreshold: 3
129135
readinessProbe:
130136
httpGet:
131137
path: "/"
132138
port: http
139+
scheme: HTTP
140+
initialDelaySeconds: 0
141+
periodSeconds: 10
142+
timeoutSeconds: 1
143+
successThreshold: 1
144+
failureThreshold: 3
133145
resources:
134146
{}

‎charts/headlamp/tests/expected_templates/namespace-override-oidc-create-secret.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,21 @@ spec:
152152
httpGet:
153153
path: "/"
154154
port: http
155+
scheme: HTTP
156+
initialDelaySeconds: 0
157+
periodSeconds: 10
158+
timeoutSeconds: 1
159+
successThreshold: 1
160+
failureThreshold: 3
155161
readinessProbe:
156162
httpGet:
157163
path: "/"
158164
port: http
165+
scheme: HTTP
166+
initialDelaySeconds: 0
167+
periodSeconds: 10
168+
timeoutSeconds: 1
169+
successThreshold: 1
170+
failureThreshold: 3
159171
resources:
160172
{}

0 commit comments

Comments
 (0)