From 6e708f6c6404d5d878c98fc0c27b009581e0d449 Mon Sep 17 00:00:00 2001
From: "kevin.wilder" <kevin.wilder@darkwolfsolutions.com>
Date: Wed, 1 Sep 2021 22:27:41 +0000
Subject: [PATCH] Gitlab hostname improvements
---
chart/templates/gitlab/secret-sso.yaml | 2 +-
chart/templates/gitlab/values.yaml | 4 ++--
chart/values.yaml | 7 ++++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/chart/templates/gitlab/secret-sso.yaml b/chart/templates/gitlab/secret-sso.yaml
index d193123305..324c6ce9a4 100644
--- a/chart/templates/gitlab/secret-sso.yaml
+++ b/chart/templates/gitlab/secret-sso.yaml
@@ -24,7 +24,7 @@ stringData:
"client_options": {
"identifier": "{{ .Values.addons.gitlab.sso.client_id | default .Values.sso.client_id }}",
"secret": "{{ .Values.addons.gitlab.sso.client_secret | default .Values.sso.client_secret }}",
- "redirect_uri": "https://{{ .Values.addons.gitlab.hostnames.gitlab }}/users/auth/openid_connect/callback",
+ "redirect_uri": "https://{{ .Values.addons.gitlab.hostnames.gitlab }}.{{ .Values.hostname }}/users/auth/openid_connect/callback",
"end_session_endpoint": "https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}/protocol/openid-connect/logout"
}
}
diff --git a/chart/templates/gitlab/values.yaml b/chart/templates/gitlab/values.yaml
index 06c05e4311..8f1c383631 100644
--- a/chart/templates/gitlab/values.yaml
+++ b/chart/templates/gitlab/values.yaml
@@ -56,10 +56,10 @@ global:
domain: {{ .Values.hostname }}
gitlab:
- name: {{ .Values.addons.gitlab.hostnames.gitlab }}
+ name: {{ .Values.addons.gitlab.hostnames.gitlab }}.{{ .Values.hostname }}
registry:
- name: {{ .Values.addons.gitlab.hostnames.registry }}
+ name: {{ .Values.addons.gitlab.hostnames.registry }}.{{ .Values.hostname }}
{{- if .Values.addons.gitlab.objectStorage.endpoint }}
minio:
diff --git a/chart/values.yaml b/chart/values.yaml
index 20ff8ed8bc..98340fbd52 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -578,13 +578,14 @@ addons:
enabled: false
hostnames:
- gitlab: gitlab.bigbang.dev
- registry: registry.bigbang.dev
+ # host name only without the domain
+ gitlab: gitlab
+ registry: registry
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab.git
path: "./chart"
- tag: "4.12.9-bb.2"
+ tag: "4.12.9-bb.3"
# -- Flux reconciliation overrides specifically for the Gitlab Package
flux: {}
--
GitLab