Skip to content

Commit d533f3c

Browse files
authored
feat(chart): Allow configuration of externalURL on values.yaml (#1011)
Signed-off-by: Javier Rodriguez <[email protected]>
1 parent 944be3f commit d533f3c

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

deployment/chainloop/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: Chainloop is an open source software supply chain control plane, a
77

88
type: application
99
# Bump the patch (not minor, not major) version on each change in the Chart Source code
10-
version: 1.66.0
10+
version: 1.66.1
1111
# Do not update appVersion, this is handled automatically by the release process
1212
appVersion: v0.92.3
1313

deployment/chainloop/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,7 @@ chainloop config save \
525525
| `controlplane.auth.oidc.clientID` | OIDC IDp clientID | `""` |
526526
| `controlplane.auth.oidc.clientSecret` | OIDC IDp clientSecret | `""` |
527527
| `controlplane.auth.oidc.loginURLOverride` | Optional OIDC login URL override, useful to point to custom login pages | |
528+
| `controlplane.auth.oidc.externalURL` | Optional External URL for the controlplane to the outside world | |
528529
| `controlplane.auth.allowList.rules` | List of domains or emails to allow | |
529530
| `controlplane.auth.allowList.selectedRoutes` | List of selected routes to allow. If not set it applies to all routes | |
530531
| `controlplane.auth.allowList.customMessage` | Custom message to display when a user is not allowed | |

deployment/chainloop/templates/_helpers.tpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,9 @@ NOTE: Load balancer service type is not supported
284284
{{- $service := .Values.controlplane.service }}
285285
{{- $ingress := .Values.controlplane.ingress }}
286286

287-
{{- if (and $ingress $ingress.enabled $ingress.hostname) }}
287+
{{- if .Values.controlplane.auth.oidc.externalURL }}
288+
{{- .Values.controlplane.auth.oidc.externalURL }}
289+
{{- else if (and $ingress $ingress.enabled $ingress.hostname) }}
288290
{{- printf "%s://%s" (ternary "https" "http" $ingress.tls ) $ingress.hostname }}
289291
{{- else if (and (eq $service.type "NodePort") $service.nodePorts (not (empty $service.nodePorts.http))) }}
290292
{{- printf "http://localhost:%s" $service.nodePorts.http }}

deployment/chainloop/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,13 @@ controlplane:
184184
## @param controlplane.auth.oidc.clientID OIDC IDp clientID
185185
## @param controlplane.auth.oidc.clientSecret OIDC IDp clientSecret
186186
## @extra controlplane.auth.oidc.loginURLOverride Optional OIDC login URL override, useful to point to custom login pages
187+
## @extra controlplane.auth.oidc.externalURL Optional External URL for the controlplane to the outside world
187188
oidc:
188189
url: ""
189190
clientID: ""
190191
clientSecret: ""
191192
# loginURLOverride: ""
193+
# externalURL: ""
192194

193195
## @extra controlplane.auth.allowList.rules List of domains or emails to allow
194196
## @extra controlplane.auth.allowList.selectedRoutes List of selected routes to allow. If not set it applies to all routes

0 commit comments

Comments
 (0)