Merge branch '730-rename-hostname-to-domain' into 'master'

Resolve "Rename hostname to domain"

Closes #730

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

chart/templates/NOTES.txt

@@ -149,4 +149,11 @@ PLATFORM ONE MATTERMOST WARNING:
   You have enabled enterprise Mattermost in the values configuration, but not provided a license.
   Make sure to go back and edit your values or ensure you add the license through the mattermost settings page.
 {{- end }}
-{{- end }}
+{{- end }}
\ No newline at end of file
+
+{{- if .Values.hostname }}
+DEPRECATION NOTICE:
+  The top level yaml key "hostname" has been deprecated and replaced with "domain". 
+  Please update your values override to use the "domain" key.
+{{- end }}
+

chart/templates/anchore/values.yaml

@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.anchore" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 istio:
   enabled: {{ .Values.istio.enabled }}
@@ -33,7 +36,7 @@ enterpriseLicenseYaml: |
 sso:
   enabled: {{ .Values.addons.anchore.sso.enabled }}
   spEntityId: {{ .Values.addons.anchore.sso.client_id }}
-  acsUrl: "https://anchore.{{ .Values.hostname }}/service/sso/auth/keycloak"
+  acsUrl: "https://anchore.{{ $domainName }}/service/sso/auth/keycloak"
   idpMetadataUrl: "https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}/protocol/saml/descriptor"
   roleAttribute: {{ .Values.addons.anchore.sso.role_attribute }}
   {{- end }}

chart/templates/argocd/values.yaml

@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.argocd" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 createNamespace: false
 

chart/templates/authservice/values.yaml

@@ -3,6 +3,9 @@
 {{- end }}
 
 {{- define "bigbang.defaults.authservice" -}}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+
 imagePullSecrets:
   - name: private-registry
 
@@ -61,7 +64,7 @@ chains:
     callback_uri: https://{{ range .Values.jaeger.values.istio.jaeger.hosts }}{{ tpl . $}}{{ end }}/login
     {{- else }}
       prefix: "tracing"
-    callback_uri: https://tracing.{{ .Values.hostname }}/login
+    callback_uri: https://tracing.{{ $domainName }}/login
     {{- end }}
     client_id: "{{ .Values.jaeger.sso.client_id }}"
     client_secret: "{{ .Values.jaeger.sso.client_secret }}"
@@ -79,7 +82,7 @@ chains:
     callback_uri: https://{{ range .Values.monitoring.values.istio.prometheus.hosts }}{{ tpl . $}}{{ end }}/login/generic_oauth
     {{- else }}
       prefix: "prometheus"
-    callback_uri: https://prometheus.{{ .Values.hostname }}/login/generic_oauth
+    callback_uri: https://prometheus.{{ $domainName }}/login/generic_oauth
     {{- end }}
     client_id: {{ .Values.monitoring.sso.prometheus.client_id }}
     client_secret: "{{ .Values.monitoring.sso.prometheus.client_secret }}"
@@ -93,7 +96,7 @@ chains:
     callback_uri: https://{{ range .Values.monitoring.values.istio.alertmanager.hosts }}{{ tpl . $}}{{ end }}/login/generic_oauth
     {{- else }}
       prefix: "alertmanager"
-    callback_uri: https://alertmanager.{{ .Values.hostname }}/login/generic_oauth
+    callback_uri: https://alertmanager.{{ $domainName }}/login/generic_oauth
     {{- end }}
     client_id: {{ .Values.monitoring.sso.alertmanager.client_id }}
     client_secret: "{{ .Values.monitoring.sso.alertmanager.client_secret }}"

chart/templates/gitlab/secret-sso.yaml

 {{- if or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled }}
 {{- if .Values.addons.gitlab.sso.enabled }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -24,7 +26,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 }}.{{ .Values.hostname }}/users/auth/openid_connect/callback",
+          "redirect_uri": "https://{{ .Values.addons.gitlab.hostnames.gitlab }}.{{ $domainName }}/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

@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.gitlab" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 openshift: {{ .Values.openshift }}
 
@@ -53,13 +56,13 @@ gitlab:
 
 global:
   hosts:
-    domain: {{ .Values.hostname }}
+    domain: {{ $domainName }}
 
     gitlab:
-      name: {{ .Values.addons.gitlab.hostnames.gitlab }}.{{ .Values.hostname }}
+      name: {{ .Values.addons.gitlab.hostnames.gitlab }}.{{ $domainName }}
 
     registry:
-      name: {{ .Values.addons.gitlab.hostnames.registry }}.{{ .Values.hostname }}
+      name: {{ .Values.addons.gitlab.hostnames.registry }}.{{ $domainName }}
 
   {{- if .Values.addons.gitlab.objectStorage.endpoint }}
   minio:

chart/templates/haproxy/values.yaml

@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.haproxy-sso" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 istio:
   gateway: {{ default "public" .Values.addons.haproxy.ingress.gateway }}
@@ -75,12 +78,12 @@ config: |
     {{- if hasKey $alertmanagerHostValues "hosts" }}
     acl host_alertmanager hdr(host) -i {{ range .Values.monitoring.values.istio.alertmanager.hosts }}{{ tpl . $}}{{ end }}
     {{- else }}
-    acl host_alertmanager hdr(host) -i alertmanager.{{ .Values.hostname }}
+    acl host_alertmanager hdr(host) -i alertmanager.{{ $domainName }}
     {{- end }}
     {{- if hasKey $prometheusHostValues "hosts" }}
     acl host_prometheus hdr(host) -i {{ range .Values.monitoring.values.istio.prometheus.hosts }}{{ tpl . $}}{{ end }}
     {{- else }}
-    acl host_prometheus hdr(host) -i prometheus.{{ .Values.hostname }}
+    acl host_prometheus hdr(host) -i prometheus.{{ $domainName }}
     {{- end }}
 
     option forwardfor

chart/templates/istio/controlplane/values.yaml

@@ -3,7 +3,9 @@
 {{- end }}
 
 {{- define "bigbang.defaults.istio" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+domain: {{ $domainName }}
 
 tracing:
   enabled:  {{ .Values.jaeger.enabled }}

chart/templates/jaeger/values.yaml

@@ -5,7 +5,12 @@
 {{- define "bigbang.defaults.jaeger" -}}
 imagePullSecrets:
   - name: private-registry
-hostname: {{ .Values.hostname }}
+
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
+
 istio:
   enabled: {{ .Values.istio.enabled }}
   jaeger:

chart/templates/keycloak/values.yaml

@@ -8,7 +8,10 @@ replicas: 2
 imagePullSecrets:
 - name: private-registry
 
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 openshift: {{ .Values.openshift }}
 

chart/templates/kiali/values.yaml

@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.kiali" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 openshift: {{ .Values.openshift}}
 
@@ -39,7 +42,7 @@ cr:
       grafana:
         enabled: {{ dig "grafana" "enabled" true .Values.monitoring.values }}
         {{- $grafanaUrl := first (dig "istio" "grafana" "hosts" list .Values.monitoring.values) }}
-        url: https://{{ tpl ($grafanaUrl | default (printf "%s.%s" "grafana" .Values.hostname)) . }}
+        url: https://{{ tpl ($grafanaUrl | default (printf "%s.%s" "grafana" $domainName)) . }}
         {{- if (dig "grafana" "enabled" true .Values.monitoring.values) }}
         auth:
           {{- if (dig "grafana" "admin" "existingSecret" "" .Values.monitoring.values) }}
@@ -55,7 +58,7 @@ cr:
       tracing:
         enabled: {{ .Values.jaeger.enabled }}
         {{- $tracingUrl := first (dig "istio" "jaeger" "hosts" list .Values.jaeger.values) }}
-        url: https://{{ tpl ($tracingUrl | default (printf "%s.%s" "tracing" .Values.hostname)) . }}
+        url: https://{{ tpl ($tracingUrl | default (printf "%s.%s" "tracing" $domainName )) . }}
       istio:
         component_status:
           components:

chart/templates/logging/elasticsearch-kibana/values.yaml

@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.logging" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 openshift: {{ .Values.openshift }}
 

chart/templates/mattermost/mattermost/values.yaml

@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.mattermost" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 openshift: {{ .Values.openshift }}
 

chart/templates/minio/minio/values.yaml

@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.minio" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 istio:
   enabled: {{ .Values.istio.enabled }}

chart/templates/monitoring/values.yaml

@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.monitoring" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 flux:
   enabled: true
@@ -61,7 +64,7 @@ grafana:
   grafana.ini:
     {{- if .Values.istio.enabled }}
     server:
-      root_url: https://grafana.{{ .Values.hostname }}/
+      root_url: https://grafana.{{ $domainName }}/
     {{- end }}
 
     auth:

chart/templates/nexus-repository-manager/values.yaml

@@ -3,7 +3,8 @@
 {{- end }}
 
 {{- define "bigbang.defaults.nexus-repository-manager" -}}
-domain: {{ .Values.hostname }}
+{{- $domainName := default .Values.domain .Values.hostname }}
+domain: {{ $domainName }}
 hostname: nexus
 istio:
   enabled: {{ .Values.istio.enabled }}
@@ -33,7 +34,7 @@ license_key: "{{ .Values.addons.nexus.license_key }}"
 sso:
   enabled: {{ .Values.addons.nexus.sso.enabled }}
   idp_data:
-    entityId: "https://nexus.{{ .Values.hostname }}/service/rest/v1/security/saml/metadata"
+    entityId: "https://nexus.{{ $domainName }}/service/rest/v1/security/saml/metadata"
     usernameAttribute: "{{ .Values.addons.nexus.sso.idp_data.username }}"
     firstNameAttribute: "{{ .Values.addons.nexus.sso.idp_data.firstName }}"
     lastNameAttribute: "{{ .Values.addons.nexus.sso.idp_data.lastName }}"

chart/templates/sonarqube/values.yaml

@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.sonarqube" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 istio:
   enabled: {{ .Values.istio.enabled }}
@@ -27,7 +30,7 @@ image:
 {{- if .Values.addons.sonarqube.sso.enabled }}
 sonarProperties:
   sonar.auth.saml.enabled: {{ .Values.addons.sonarqube.sso.enabled }}
-  sonar.core.serverBaseURL: https://sonarqube.{{ .Values.hostname }}
+  sonar.core.serverBaseURL: https://sonarqube.{{ $domainName }}
   sonar.auth.saml.applicationId: {{ .Values.addons.sonarqube.sso.client_id }}
   sonar.auth.saml.providerName: {{ .Values.addons.sonarqube.sso.provider_name | default .Values.addons.sonarqube.sso.label }}
   sonar.auth.saml.providerId: https://{{ .Values.sso.oidc.host }}/auth/realms/{{ .Values.sso.oidc.realm }}

chart/templates/twistlock/values.yaml

@@ -3,7 +3,10 @@
 {{- end }}
 
 {{- define "bigbang.defaults.twistlock" -}}
-hostname: {{ .Values.hostname }}
+# hostname is deprecated and replaced with domain. But if hostname exists then use it.
+{{- $domainName := default .Values.domain .Values.hostname }}
+hostname: {{ $domainName }}
+domain: {{ $domainName }}
 
 openshift: {{ .Values.openshift }}
 

chart/templates/velero/values.yaml

@@ -3,7 +3,6 @@
 {{- end }}
 
 {{- define "bigbang.defaults.velero" -}}
-hostname: {{ .Values.hostname }}
 
 istio:
   enabled: {{ .Values.istio.enabled }}

chart/values.yaml

 # -- Domain used for BigBang created exposed services, can be overridden by individual packages.
-hostname: bigbang.dev
+domain: bigbang.dev
 
 # -- (experimental) Toggle sourcing from external repos.
 # All this does right now is toggle GitRepositories, it is _not_ fully functional
@@ -140,21 +140,21 @@ istio:
     public:
       ingressGateway: "public-ingressgateway"
       hosts:
-      - "*.{{ .Values.hostname }}"
+      - "*.{{ .Values.domain }}"
       tls:
         key: ""
         cert: ""
     # private:
     #   ingressGateway: "private-ingressgateway"
     #   hosts:
-    #   - "*.{{ .Values.hostname }}"
+    #   - "*.{{ .Values.domain }}"
     #   tls:
     #     key: ""
     #     cert: ""
     # passthrough:
     #   ingressGateway: "passthrough-ingressgateway"
     #   hosts:
-    #   - "*.{{ .Values.hostname }}"
+    #   - "*.{{ .Values.domain }}"
     #   tls:
     #     mode: "PASSTHROUGH"