UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit e1feeda4 authored by kevin.wilder's avatar kevin.wilder Committed by Micah Nagel
Browse files

Gitlab istio injection for jobs

parent 2c596630
No related branches found
No related tags found
2 merge requests!1386Master,!1068Gitlab istio injection for jobs
......@@ -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 }}
......
......@@ -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: {}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment