WIP: A new version of gitlab (14.7.0) is available
current diff:
--- current-deployment.yaml
+++ future-deployment.yaml
@@ -7,7 +7,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.6.3
+ chart: gitaly-5.7.0
release: gitlab-test
heritage: Helm
@@ -28,7 +28,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.6.3
+ chart: gitlab-shell-5.7.0
release: gitlab-test
heritage: Helm
@@ -47,7 +47,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.6.3
+ chart: praefect-5.7.0
release: gitlab-test
heritage: Helm
@@ -66,7 +66,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.6.3
+ chart: sidekiq-5.7.0
release: gitlab-test
heritage: Helm
@@ -87,7 +87,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.6.3
+ chart: webservice-5.7.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -361,7 +361,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.6.3
+ chart: gitaly-5.7.0
release: gitlab-test
heritage: Helm
@@ -440,7 +440,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.6.3
+ chart: gitlab-exporter-5.7.0
release: gitlab-test
heritage: Helm
@@ -530,7 +530,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.6.3
+ chart: gitlab-shell-5.7.0
release: gitlab-test
heritage: Helm
@@ -690,7 +690,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.6.3
+ chart: gitlab-shell-5.7.0
release: gitlab-test
heritage: Helm
@@ -750,7 +750,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.6.3
+ chart: gitlab-shell-5.7.0
release: gitlab-test
heritage: Helm
@@ -765,7 +765,7 @@
namespace: gitlab
labels:
app: migrations
- chart: migrations-5.6.3
+ chart: migrations-5.7.0
release: gitlab-test
heritage: Helm
@@ -860,7 +860,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.6.3
+ chart: praefect-5.7.0
release: gitlab-test
heritage: Helm
@@ -922,7 +922,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.6.3
+ chart: sidekiq-5.7.0
release: gitlab-test
heritage: Helm
@@ -1217,7 +1217,7 @@
namespace: gitlab
labels:
app: toolbox
- chart: toolbox-5.6.3
+ chart: toolbox-5.7.0
release: gitlab-test
heritage: Helm
@@ -1497,7 +1497,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.6.3
+ chart: webservice-5.7.0
release: gitlab-test
heritage: Helm
@@ -1786,7 +1786,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.6.3
+ chart: webservice-5.7.0
release: gitlab-test
heritage: Helm
@@ -2533,10 +2533,14 @@
# Indent /registry/storage/config 2 spaces before inserting into config.yml
sed -i 's/^/ /' /registry/storage/config
# Insert into /registry/config.yml after `storage:`
- sed -i '/storage:/ r /registry/storage/config' /registry/config.yml
+ sed -i '/^storage:/ r /registry/storage/config' /registry/config.yml
# Remove the now extraneous `config` file
rm /registry/storage/config
fi
+ # Copy any middleware.storage if present
+ if [ -d /config/middleware.storage ]; then
+ cp -v -r -L /config/middleware.storage /registry/middleware.storage
+ fi
# Set to known path, to used ConfigMap
cat /config/certificate.crt > /registry/certificate.crt
# Copy the optional profiling keyfile to the expected location
@@ -2591,6 +2595,7 @@
disabled: true
manifests:
referencelimit: 0
+ payloadsizelimit: 0
urls:
allow:
deny:
@@ -2622,6 +2627,7 @@
enabled: true
redirect:
disable: true
+ middleware:
gc:
disabled: true
@@ -2644,13 +2650,13 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.6.3
+ chart: gitlab-5.7.0
release: gitlab-test
heritage: Helm
data:
- gitlabVersion: "14.6.3"
- gitlabChartVersion: "5.6.3"
+ gitlabVersion: "14.7.0"
+ gitlabChartVersion: "5.7.0"
---
# Source: gitlab/templates/initdb-configmap.yaml
apiVersion: v1
@@ -2660,7 +2666,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.6.3
+ chart: gitlab-5.7.0
release: gitlab-test
heritage: Helm
@@ -19917,7 +19923,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.6.3
+ chart: gitaly-5.7.0
release: gitlab-test
heritage: Helm
@@ -19945,7 +19951,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.6.3
+ chart: gitlab-exporter-5.7.0
release: gitlab-test
heritage: Helm
@@ -19971,7 +19977,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.6.3
+ chart: gitlab-shell-5.7.0
release: gitlab-test
heritage: Helm
@@ -19997,7 +20003,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.6.3
+ chart: praefect-5.7.0
release: gitlab-test
heritage: Helm
@@ -20032,7 +20038,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.6.3
+ chart: webservice-5.7.0
release: gitlab-test
heritage: Helm
@@ -20657,7 +20663,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.6.3
+ chart: gitlab-exporter-5.7.0
release: gitlab-test
heritage: Helm
@@ -20674,13 +20680,13 @@
metadata:
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.6.3
+ chart: gitlab-exporter-5.7.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 2fb2f21831b190ae83680cf3a19237780a3c0b8da401b717fbd558d097bb8026
+ checksum/config: 6979c2cc1b35733ce2b1be6849e1f371c20bc9ed6df99c5ea1bf3420e1086203
gitlab.com/prometheus_path: /metrics
gitlab.com/prometheus_port: "9168"
gitlab.com/prometheus_scrape: "true"
@@ -20841,7 +20847,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.6.3
+ chart: gitlab-shell-5.7.0
release: gitlab-test
heritage: Helm
@@ -20857,14 +20863,14 @@
metadata:
labels:
app: gitlab-shell
- chart: gitlab-shell-5.6.3
+ chart: gitlab-shell-5.7.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: ff805f3713f9f56c739aac0d03c4e60a308a14fa01221d0e4a74675c8264fabf
- checksum/config-sshd: 5b21c96bd9ddd4b54f65afa02bfea869bc00f331b4245060013e99c500f3625e
+ checksum/config: d30fd60fc61cfed072d6f0e4ae77d6b934390fa12414dfa6fb5d3ce9d9414f5a
+ checksum/config-sshd: 43ff69c99580ba42481cd138051d541cfa59edc6d6ddabcf1402c8b4adf71b27
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
initContainers:
@@ -20917,7 +20923,7 @@
containers:
- name: gitlab-shell
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v13.22.1"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v13.22.2"
ports:
- containerPort: 2222
name: ssh
@@ -21004,7 +21010,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.6.3
+ chart: sidekiq-5.7.0
release: gitlab-test
heritage: Helm
@@ -21022,14 +21028,14 @@
metadata:
labels:
app: sidekiq
- chart: sidekiq-5.6.3
+ chart: sidekiq-5.7.0
release: gitlab-test
heritage: Helm
queue-pod-name: native-chart
annotations:
- checksum/configmap: de2778e474ef07bc3425eaf165366b8edb77f5af44682c7b3d9d4dcc89995107
+ checksum/configmap: e36d9678ec217bf2a3b079befe7b6fc8dce41d5a28af72c9cc3eca42766b5206
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
@@ -21090,7 +21096,7 @@
requests:
cpu: 50m
- name: dependencies
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.6.3"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.7.0"
args:
- /scripts/wait-for-deps
env:
@@ -21129,7 +21135,7 @@
containers:
- name: sidekiq
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.6.3"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.7.0"
env:
- name: prometheus_multiproc_dir
value: /metrics
@@ -21312,7 +21318,7 @@
namespace: gitlab
labels:
app: toolbox
- chart: toolbox-5.6.3
+ chart: toolbox-5.7.0
release: gitlab-test
heritage: Helm
@@ -21331,13 +21337,13 @@
metadata:
labels:
app: toolbox
- chart: toolbox-5.6.3
+ chart: toolbox-5.7.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: f3a2b172a87bb40a6d613ddd324f90763d1dd24e921c7bc2bc5f09d3aca35b98
+ checksum/config: ff6d36d43144e40fcaeca3e00bf7af976b759be1c19cfdeee5cb110008b93aba
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
securityContext:
@@ -21395,7 +21401,7 @@
- /bin/bash
- -c
- sh /var/opt/gitlab/templates/configure-gsutil && while sleep 3600; do :; done
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.6.3"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.7.0"
env:
- name: ARTIFACTS_BUCKET_NAME
value: gitlab-artifacts
@@ -21563,7 +21569,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.6.3
+ chart: webservice-5.7.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -21584,7 +21590,7 @@
metadata:
labels:
app: webservice
- chart: webservice-5.6.3
+ chart: webservice-5.7.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -21592,7 +21598,7 @@
annotations:
- checksum/config: 76af3ff8608826516e45564a27be1679d8b454cbd2762a1c98a5bc39627ed038
+ checksum/config: 3ae311f612d93c864fc4df8627bc2bf4290292e867ee9b24acc9e25757bcec13
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
@@ -21665,7 +21671,7 @@
requests:
cpu: 50m
- name: dependencies
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.6.3
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.7.0
args:
- /scripts/wait-for-deps
env:
@@ -21700,7 +21706,7 @@
containers:
- name: webservice
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.6.3
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.7.0
ports:
- containerPort: 8080
name: webservice
@@ -21793,7 +21799,7 @@
cpu: 300m
memory: 2.5G
- name: gitlab-workhorse
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v14.6.3"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v14.7.0"
ports:
- containerPort: 8181
name: workhorse
@@ -22092,7 +22098,7 @@
dnsPolicy: ClusterFirst
containers:
- name: controller
- image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/ingress-nginx/controller:v1.0.4@sha256:a7fb797e0b1c919a49cf9b3f9bb90ebca39bc85d0edd11c9a5cf897da5eb5a3f"
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/ingress-nginx/controller:v1.0.4@sha256:545cff00370f28363dad31e3b59a94ba377854d3a11f18988f5f9e56841ef9ef"
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -22166,7 +22172,6 @@
requests:
cpu: 100m
memory: 100Mi
-
serviceAccountName: gitlab-test-nginx-ingress
terminationGracePeriodSeconds: 300
---
@@ -22243,7 +22248,6 @@
requests:
cpu: 5m
memory: 5Mi
-
serviceAccountName: gitlab-test-nginx-ingress-backend
terminationGracePeriodSeconds: 60
---
@@ -22378,7 +22382,7 @@
annotations:
- checksum/configmap: cc14079e066cf40d5df3b3a7b2d56f896a2ea9347d7449738b2e30dac39ca2c0
+ checksum/configmap: 5a73032107121f2ad978bba992da2a00992b1b861ccbb74bb803e1e92686475a
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
@@ -22423,7 +22427,7 @@
containers:
- name: registry
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.19.0-gitlab"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.22.0-gitlab"
env:
volumeMounts:
@@ -22497,7 +22501,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.6.3
+ chart: gitlab-shell-5.7.0
release: gitlab-test
heritage: Helm
@@ -22522,7 +22526,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.6.3
+ chart: sidekiq-5.7.0
release: gitlab-test
heritage: Helm
@@ -22547,7 +22551,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.6.3
+ chart: webservice-5.7.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -22598,7 +22602,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.6.3
+ chart: gitaly-5.7.0
release: gitlab-test
heritage: Helm
@@ -22618,13 +22622,13 @@
labels:
storage: default
app: gitaly
- chart: gitaly-5.6.3
+ chart: gitaly-5.7.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 9f4c2361efa39404254171dd1719ee1284728baca21f01f6f82075bc76877afd
+ checksum/config: 4d56e21e2a41094e08650e25192d7d10feba611a64132df5bf61c8293273daa7
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
gitlab.com/prometheus_scrape: "true"
@@ -22684,7 +22688,7 @@
containers:
- name: gitaly
- image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.6.3"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.7.0"
ports:
- containerPort: 8075
name: grcp-gitaly
@@ -22785,7 +22789,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.6.3
+ chart: praefect-5.7.0
release: gitlab-test
heritage: Helm
@@ -22802,13 +22806,13 @@
metadata:
labels:
app: praefect
- chart: praefect-5.6.3
+ chart: praefect-5.7.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 96246430964cb2c5cc7cbe1f4c647af7f088164a953f667f9de128e4298fa60e
+ checksum/config: 4025c21785aa28c6404cb3c1c1f04c3f4dcef23e775ec6c5b0314177c34a6e09
spec:
affinity:
podAntiAffinity:
@@ -22858,7 +22862,7 @@
containers:
- name: praefect
- image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.6.3"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.7.0"
ports:
- containerPort: 8075
- containerPort: 9236
@@ -23294,7 +23298,7 @@
namespace: gitlab
labels:
app: migrations
- chart: migrations-5.6.3
+ chart: migrations-5.7.0
release: gitlab-test
heritage: Helm
@@ -23305,7 +23309,7 @@
metadata:
labels:
app: migrations
- chart: migrations-5.6.3
+ chart: migrations-5.7.0
release: gitlab-test
heritage: Helm
@@ -23353,7 +23357,7 @@
containers:
- name: migrations
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.6.3"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.7.0"
args:
- /scripts/wait-for-deps
- /scripts/db-migrate
@@ -23506,13 +23510,13 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.6.3
+ chart: webservice-5.7.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
annotations:
- kubernetes.io/ingress.class: "nginx"
+ kubernetes.io/ingress.class: nginx
kubernetes.io/ingress.provider: "nginx"
nginx.ingress.kubernetes.io/proxy-body-size: "0"
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
@@ -23550,7 +23554,7 @@
heritage: Helm
annotations:
- kubernetes.io/ingress.class: "nginx"
+ kubernetes.io/ingress.class: nginx
kubernetes.io/ingress.provider: "nginx"
nginx.ingress.kubernetes.io/proxy-body-size: "0"
nginx.ingress.kubernetes.io/proxy-read-timeout: "900"
@@ -23585,7 +23589,7 @@
heritage: Helm
annotations:
- kubernetes.io/ingress.class: "nginx"
+ kubernetes.io/ingress.class: nginx
kubernetes.io/ingress.provider: "nginx"
nginx.ingress.kubernetes.io/proxy-body-size: "0"
nginx.ingress.kubernetes.io/proxy-read-timeout: "900"
@@ -23625,7 +23629,6 @@
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: gitlab-test-nginx
- namespace: gitlab
spec:
controller: k8s.io/ingress-nginx
---
@@ -23768,7 +23771,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.6.3
+ chart: gitlab-5.7.0
release: gitlab-test
heritage: Helm
@@ -23785,7 +23788,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.6.3
+ chart: gitlab-5.7.0
release: gitlab-test
heritage: Helm
@@ -23824,7 +23827,7 @@
kubectl --namespace=$namespace label \
--overwrite \
- secret $secret_name app=gitlab chart=gitlab-5.6.3 release=gitlab-test heritage=Helm
+ secret $secret_name app=gitlab chart=gitlab-5.7.0 release=gitlab-test heritage=Helm
}
# Args: secretname, args
@@ -23981,7 +23984,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.6.3
+ chart: gitlab-5.7.0
release: gitlab-test
heritage: Helm
@@ -24100,7 +24103,7 @@
namespace: gitlab
labels:
app: shared-secrets
- chart: shared-secrets-5.6.3
+ chart: shared-secrets-5.7.0
release: gitlab-test
heritage: Helm
@@ -24148,7 +24151,7 @@
namespace: gitlab
labels:
app: shared-secrets
- chart: shared-secrets-5.6.3
+ chart: shared-secrets-5.7.0
release: gitlab-test
heritage: Helm
@@ -24169,7 +24172,7 @@
apiVersion: v1
kind: Pod
metadata:
- name: gitlab-test-webservice-test-runner-ihy39
+ name: gitlab-test-webservice-test-runner-vuscf
namespace: gitlab
annotations:
"helm.sh/hook": test
@@ -24177,7 +24180,7 @@
spec:
containers:
- name: test-runner
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.6.3
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.7.0
command: ['sh', '/tests/test_login']
volumeMounts:
- name: tests
@@ -24248,11 +24251,11 @@
apiVersion: batch/v1
kind: Job
metadata:
- name: gitlab-test-shared-secrets-1-nsn
+ name: gitlab-test-shared-secrets-1-e5c
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.6.3
+ chart: gitlab-5.7.0
release: gitlab-test
heritage: Helm
@@ -24264,7 +24267,7 @@
metadata:
labels:
app: gitlab
- chart: gitlab-5.6.3
+ chart: gitlab-5.7.0
release: gitlab-test
heritage: Helm
@@ -24305,7 +24308,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.6.3
+ chart: gitlab-5.7.0
release: gitlab-test
heritage: Helm
@@ -24333,9 +24336,9 @@
command: ['/bin/sh', '/scripts/runcheck']
env:
- name: GITLAB_VERSION
- value: '14.6.3'
+ value: '14.7.0'
- name: CHART_VERSION
- value: '5.6.3'
+ value: '5.7.0'
volumeMounts:
- name: chart-info
mountPath: /chart-info