From 2bfd4f06e90e11f240867ba5f39b18caabf4e215 Mon Sep 17 00:00:00 2001
From: "kevin.wilder" <kevin.wilder@darkwolfsolutions.com>
Date: Tue, 27 Apr 2021 14:26:18 +0000
Subject: [PATCH] upgrade Gitlab upgrade to 13.10.3
---
chart/templates/gitlab/values.yaml | 9 ++++-----
chart/values.yaml | 2 +-
scripts/package/synker.yaml | 6 +++---
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/chart/templates/gitlab/values.yaml b/chart/templates/gitlab/values.yaml
index 4a386ad05d..5d5166de83 100644
--- a/chart/templates/gitlab/values.yaml
+++ b/chart/templates/gitlab/values.yaml
@@ -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:
diff --git a/chart/values.yaml b/chart/values.yaml
index b40277aaf1..94c09183a6 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -387,7 +387,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.
diff --git a/scripts/package/synker.yaml b/scripts/package/synker.yaml
index d130d30dcc..53100e7ba0 100644
--- a/scripts/package/synker.yaml
+++ b/scripts/package/synker.yaml
@@ -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
--
GitLab