diff --git a/chart/templates/gitlab/values.yaml b/chart/templates/gitlab/values.yaml index a16eef6287242ed1848c6e11e61e8da2254f2ae0..328b69c8b158853b113328e603a06e0f7e13586c 100644 --- a/chart/templates/gitlab/values.yaml +++ b/chart/templates/gitlab/values.yaml @@ -12,6 +12,7 @@ openshift: {{ .Values.openshift }} istio: enabled: {{ .Values.istio.enabled }} + injection: {{ dig "istio" "injection" "enabled" .Values.addons.gitlab }} gitlab: gateways: - istio-system/{{ default "public" .Values.addons.gitlab.ingress.gateway }} @@ -46,12 +47,6 @@ registry: {{- end }} {{- end }} -{{- if .Values.istio.enabled }} -shared-secrets: - annotations: - sidecar.istio.io/inject: "false" -{{- end }} - gitlab: {{- if .Values.addons.gitlab.objectStorage.endpoint }} task-runner: @@ -75,18 +70,13 @@ gitlab: annotations: iam.amazonaws.com/role: {{ .Values.addons.gitlab.objectStorage.iamProfile }} {{- end }} - - {{- if .Values.istio.enabled }} - migrations: - annotations: - sidecar.istio.io/inject: "false" - {{- end }} - + global: # added to help with Gitlab sub-chart configuration istio: enabled: {{ .Values.istio.enabled }} + injection: {{ dig "istio" "injection" "enabled" .Values.addons.gitlab }} hosts: domain: {{ $domainName }} diff --git a/chart/values.yaml b/chart/values.yaml index f1fbe3fd5a558bb85a5ab7a396540b1ab4add14a..affd77d0a83ada0ce2bc786ece372aff821bf11c 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -591,7 +591,7 @@ addons: postRenderers: [] gitlab: - # -- Toggle deployment of Gitlab + # -- Toggle deployment of Gitlab enabled: false hostnames: @@ -602,7 +602,7 @@ addons: git: repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab.git path: "./chart" - tag: "5.3.1-bb.5" + tag: "5.3.1-bb.9" # -- Flux reconciliation overrides specifically for the Gitlab Package flux: {} @@ -683,7 +683,7 @@ addons: git: repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab-runner.git path: "./chart" - tag: "0.33.1-bb.4" + tag: "0.33.1-bb.5" # -- Flux reconciliation overrides specifically for the Gitlab Runner Package flux: {}