From fda683bd06a1ac9dc3fff052f626687f18624dda Mon Sep 17 00:00:00 2001
From: Ryan Garcia <garcia.ryan@solute.us>
Date: Wed, 12 Jan 2022 18:05:19 +0000
Subject: [PATCH] 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 cc6fc110b90946e2a07b0b443696355d4e375331)
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
---
chart/templates/gitlab/values.yaml | 2 +-
chart/values.yaml | 4 ++--
tests/test-values.yaml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/chart/templates/gitlab/values.yaml b/chart/templates/gitlab/values.yaml
index 667f1eee64..50dd0779cb 100644
--- a/chart/templates/gitlab/values.yaml
+++ b/chart/templates/gitlab/values.yaml
@@ -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:
diff --git a/chart/values.yaml b/chart/values.yaml
index 27f2fb3610..6c7214b746 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -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: {}
diff --git a/tests/test-values.yaml b/tests/test-values.yaml
index 2b3d983f64..0704613d1e 100644
--- a/tests/test-values.yaml
+++ b/tests/test-values.yaml
@@ -508,7 +508,7 @@ addons:
requests:
cpu: 10m
limits: {}
- task-runner:
+ toolbox:
persistence:
size: 256Mi
resources:
--
GitLab