UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit fda683bd authored by Ryan Garcia's avatar Ryan Garcia :dizzy: Committed by Ernest Chuang
Browse files

Merge branch 'update-gitlab-to-14.6.0' into 'master'

Update gitlab and gitlab-runner

Closes platform-one/big-bang/apps/developer-tools/gitlab#111 and platform-one/big-bang/apps/developer-tools/gitlab-runner#24

See merge request platform-one/big-bang/bigbang!1215

(cherry picked from commit cc6fc110)

85513232 rename task-runner to toolbox
2008407a Merge remote-tracking branch 'origin/master' into update-gitlab-to-14.6.0
dbd14052 gitlab and gitlab-runner tag version bumps
a2af6181 Merge remote-tracking branch 'origin/master' into
1e25977b bump gitlabRunner
88bff2f1 Merge remote-tracking branch 'origin/master' into update-gitlab-to-14.6.0
parent 15d865c1
No related branches found
No related tags found
No related merge requests found
......@@ -88,7 +88,7 @@ registry:
gitlab:
{{- if or .Values.addons.gitlab.objectStorage.endpoint $istioInjection }}
task-runner:
toolbox:
{{- if .Values.addons.gitlab.objectStorage.endpoint }}
backups:
objectStorage:
......
......@@ -675,7 +675,7 @@ addons:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab.git
path: "./chart"
tag: "5.3.1-bb.11"
tag: "5.6.0-bb.0"
# -- Flux reconciliation overrides specifically for the Gitlab Package
flux: {}
......@@ -756,7 +756,7 @@ addons:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab-runner.git
path: "./chart"
tag: "0.33.1-bb.5"
tag: "0.34.0-bb.1"
# -- Flux reconciliation overrides specifically for the Gitlab Runner Package
flux: {}
......
......@@ -508,7 +508,7 @@ addons:
requests:
cpu: 10m
limits: {}
task-runner:
toolbox:
persistence:
size: 256Mi
resources:
......
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