UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects

Gitlab istio injection for jobs

Merged Gitlab istio injection for jobs
gitlab-istio-injection-for-jobs into master
Merged kevin.wilder requested to merge gitlab-istio-injection-for-jobs into master
Compare
and
2 files
+ 6
− 16
Compare changes
  • Side-by-side
  • Inline
Files
2
chart/templates/gitlab/values.yaml
+ 3
− 13
@@ -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 }}

UNCLASSIFIED - NO CUI