Merge branch '715-gitlab-hostname-improvements' into 'master'

Gitlab hostname improvements

Closes #715

See merge request platform-one/big-bang/bigbang!832

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"
         }
       }

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:

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: {}