UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 798cf8cc authored by Ryan Garcia's avatar Ryan Garcia :dizzy:
Browse files

Merge branch 'gitlab-runner-upgrade-14-6-0' into 'master'

Gitlab runner upgrade 14 6 0

Closes platform-one/big-bang/apps/developer-tools/gitlab-runner#29

See merge request platform-one/big-bang/bigbang!1291
parents 791ee626 a9be64e4
No related branches found
No related tags found
3 merge requests!1658Draft: Merge branch 'tempo_tracing_updates' into 'master',!1386Master,!1291Gitlab runner upgrade 14 6 0
Pipeline #664767 passed
......@@ -12,8 +12,12 @@ imagePullSecrets:
networkPolicies:
enabled: {{ .Values.networkPolicies.enabled }}
monitoring:
# no longer necessary to directly pass through .Values.monitoring.enabled
# the package chart uses: .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" to toggle monitoring
metrics:
enabled: {{ .Values.monitoring.enabled }}
serviceMonitor:
enabled: {{ .Values.monitoring.enabled }}
# When istio injected, add an annotation with the istio version to the manager pods only
{{- if (and (eq (dig "istio" "injection" "enabled" .Values.addons.gitlab) "enabled") .Values.istio.enabled) }}
......
......@@ -775,7 +775,7 @@ addons:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab-runner.git
path: "./chart"
tag: "0.34.0-bb.1"
tag: "0.36.0-bb.1"
# -- 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