UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 500c8746 authored by joshwolf's avatar joshwolf
Browse files

Merge branch '280-gitlab' into 'master'

Resolve "Gitlab upgrade to 13.10.3"

Summary

1. upgrade Gitlab to chart version 4.10.3 app version 13.10.3  
2. fix monitoring.enabled passthrough
3. Also, update synker image for gitlab-runner-helper. (this is unrelated to the Gitlab upgrade)

Closes #280

See merge request platform-one/big-bang/bigbang!440
parents 37b53478 2bfd4f06
No related branches found
No related tags found
1 merge request!440Resolve "Gitlab upgrade to 13.10.3"
Pipeline #237546 failed
......@@ -8,9 +8,6 @@ hostname: {{ .Values.hostname }}
istio:
enabled: {{ .Values.istio.enabled }}
monitoring:
enabled: {{ .Values.monitoring.enabled }}
{{- if .Values.addons.gitlab.database.host }}
postgresql:
install: false
......@@ -23,15 +20,17 @@ registry:
key: registry
{{- end }}
{{- if .Values.addons.gitlab.objectStorage.endpoint }}
gitlab:
{{- if .Values.addons.gitlab.objectStorage.endpoint }}
task-runner:
backups:
objectStorage:
config:
secret: gitlab-object-storage
key: backups
{{- end }}
{{- end }}
gitlab-exporter:
enabled: {{ .Values.monitoring.enabled }}
global:
hosts:
......
......@@ -430,7 +430,7 @@ addons:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab.git
path: "./chart"
tag: "4.8.0-bb.3"
tag: "4.10.3-bb.0"
sso:
# -- Toggle OIDC SSO for Gitlab on and off.
......
......@@ -41,8 +41,8 @@ source:
- registry.il2.dso.mil/platform-one/devops/pipeline-templates/pipeline-job/anchore:0.8.2
- registry.il2.dso.mil/platform-one/devops/pipeline-templates/pipeline-job/test:gcc
- registry.il2.dso.mil/platform-one/devops/pipeline-templates/pipeline-job/dependency-check611-sonar-scanner45-dotnet-31:021921
# Gitlab Runner images
- registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner:v13.2.2
- registry.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab-runner/gitlab-runner-helper:ib-v13.2.2
# gitlab-runner-helper image: This image does not get captured from the release deployment
# the gitlab-runner-helper image only gets pulled when a pipeline runs. So it must be listed here
- registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper:v13.9.0
# Don't include until fortify is supported
#- registry.il2.dso.mil/platform-one/devops/pipeline-templates/pipeline-job/dotnet-fortify:20.2.0
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