diff --git a/chart/templates/gitlab/values.yaml b/chart/templates/gitlab/values.yaml index 4a386ad05da8ff93d096826b9f507f722d26fdee..5d5166de835cc485567f694c2f429d3694b66aed 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 b40277aaf1822ced4b572aee20f9ad32c1c3fb91..94c09183a63c40cac196be5974695d5f2dbd9d6d 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 d130d30dcc6034a56ec45c08fdfbb36fa2f137ad..53100e7ba0f52b075ab1c55ba4f161fb416c19b2 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