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.

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

fix!: sso failing deployment when it is disabled #115

Merged
merged 7 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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: 1 addition & 1 deletion bundle/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ packages:
variables:
- name: GITLAB_SSO_ENABLED
description: "Boolean to enable or disable sso things"
path: "sso"
path: "sso.enabled"
gitlab:
variables:
- name: GITLAB_SSO_ENABLED
Expand Down
36 changes: 36 additions & 0 deletions chart/templates/gitlab-sso-secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# This secret will be used if sso is disabled, instead of the templated one in uds-package.yaml.
# Sonarqube needs to mount the secret and creating it this way avoids creating an unnecessary
Racer159 marked this conversation as resolved.
Show resolved Hide resolved
# client in the keycloak realm and unnecessary secret data in the cluster.
{{- if not .Values.sso.enabled }}

apiVersion: v1
kind: Secret
metadata:
name: {{ .Values.sso.secretName }}
namespace: {{ .Release.Namespace }}
type: "Opaque"
stringData:
providers: |
{
"name": "openid_connect",
"label": "Dummy SSO",
"args": {
"name": "openid_connect",
"scope": [
"openid",
"profile"
],
"response_type": "code",
"issuer": "https://sso.{{ .Values.domain }}/realms/uds",
"client_auth_method": "query",
"discovery": true,
"uid_field": "preferred_username",
"client_options": {
"identifier": "dummy_identifier",
"secret": "dummy_secret",
"redirect_uri": "https://dummy_redirect_uri.com",
"end_session_endpoint": "https://dummy_end_session_endpoint.com"
}
}
}
{{- end }}
4 changes: 2 additions & 2 deletions chart/templates/uds-package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ metadata:
name: gitlab
namespace: {{ .Release.Namespace }}
spec:
{{- if .Values.sso }}
{{- if .Values.sso.enabled }}
sso:
- name: Gitlab SSO
clientId: uds-core-gitlab
redirectUris:
- "https://gitlab.{{ .Values.domain }}/users/auth/openid_connect/callback"
secretName: gitlab-sso-provider-json
secretName: {{ .Values.sso.secretName }}
secretTemplate:
# GitLab expects a providers JSON file that is documented more here: https://gitlab-org.gitlab.io/technical-writing-group/gitlab-docs-hugo/administration/auth/oidc/
# Note: the `authorization_endpoint`, `issuer`, and `userinfo_endpoint` must be the external URL
Expand Down
4 changes: 3 additions & 1 deletion chart/values.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
domain: "###ZARF_VAR_DOMAIN###"
sso: true
sso:
enabled: true
secretName: "###ZARF_CONST_GITLAB_SSO_SECRET_NAME###"
Racer159 marked this conversation as resolved.
Show resolved Hide resolved
storage:
# Set to false to use external storage
internal: true
Expand Down
2 changes: 1 addition & 1 deletion values/common-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ global:
syncProfileAttributes: ['email']
syncProfileFromProvider: []
providers:
- secret: gitlab-sso-provider-json
- secret: ###ZARF_CONST_GITLAB_SSO_SECRET_NAME###
key: providers
initialDefaults:
signupEnabled: ###ZARF_VAR_GITLAB_SIGNUP_ENABLED###
Expand Down
4 changes: 4 additions & 0 deletions zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ metadata:
version: "16.10.2-uds.0"
# x-release-please-end

constants:
- name: GITLAB_SSO_SECRET_NAME
value: gitlab-sso

variables:
- name: DOMAIN
default: "uds.dev"
Expand Down
Loading