WIP: A new version of gitlab (14.9.1) is available
current diff:
--- current-deployment.yaml
+++ future-deployment.yaml
@@ -7,7 +7,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.8.4
+ chart: gitaly-5.9.1
release: gitlab-test
heritage: Helm
@@ -28,7 +28,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.8.4
+ chart: gitlab-shell-5.9.1
release: gitlab-test
heritage: Helm
@@ -47,7 +47,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.8.4
+ chart: praefect-5.9.1
release: gitlab-test
heritage: Helm
@@ -66,7 +66,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.8.4
+ chart: sidekiq-5.9.1
release: gitlab-test
heritage: Helm
@@ -87,7 +87,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.8.4
+ chart: webservice-5.9.1
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -360,7 +360,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.8.4
+ chart: gitaly-5.9.1
release: gitlab-test
heritage: Helm
@@ -439,7 +439,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.8.4
+ chart: gitlab-exporter-5.9.1
release: gitlab-test
heritage: Helm
@@ -529,7 +529,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.8.4
+ chart: gitlab-shell-5.9.1
release: gitlab-test
heritage: Helm
@@ -689,7 +689,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.8.4
+ chart: gitlab-shell-5.9.1
release: gitlab-test
heritage: Helm
@@ -749,7 +749,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.8.4
+ chart: gitlab-shell-5.9.1
release: gitlab-test
heritage: Helm
@@ -764,7 +764,7 @@
namespace: gitlab
labels:
app: migrations
- chart: migrations-5.8.4
+ chart: migrations-5.9.1
release: gitlab-test
heritage: Helm
@@ -859,7 +859,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.8.4
+ chart: praefect-5.9.1
release: gitlab-test
heritage: Helm
@@ -878,6 +878,8 @@
listen_addr = '0.0.0.0:8075'
prometheus_listen_addr = '0.0.0.0:9236'
+ prometheus_exclude_database_from_default_metrics = true
+
[failover]
enabled = true
election_strategy = 'sql'
@@ -921,7 +923,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.8.4
+ chart: sidekiq-5.9.1
release: gitlab-test
heritage: Helm
@@ -1006,6 +1008,7 @@
+
artifacts:
enabled: true
object_store:
@@ -1071,6 +1074,14 @@
direct_upload: true
background_upload: false
proxy_download: true
+ ci_secure_files:
+ enabled: false
+ object_store:
+ enabled: false
+ remote_directory: gitlab-ci-secure-files
+ direct_upload: true
+ background_upload: false
+ proxy_download: true
dependency_proxy:
enabled: false
object_store:
@@ -1216,7 +1227,7 @@
namespace: gitlab
labels:
app: toolbox
- chart: toolbox-5.8.4
+ chart: toolbox-5.9.1
release: gitlab-test
heritage: Helm
@@ -1355,6 +1366,14 @@
direct_upload: true
background_upload: false
proxy_download: true
+ ci_secure_files:
+ enabled: false
+ object_store:
+ enabled: false
+ remote_directory: gitlab-ci-secure-files
+ direct_upload: true
+ background_upload: false
+ proxy_download: true
dependency_proxy:
enabled: false
object_store:
@@ -1496,7 +1515,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.8.4
+ chart: webservice-5.9.1
release: gitlab-test
heritage: Helm
@@ -1581,6 +1600,7 @@
+
artifacts:
enabled: true
object_store:
@@ -1646,6 +1666,14 @@
direct_upload: true
background_upload: false
proxy_download: true
+ ci_secure_files:
+ enabled: false
+ object_store:
+ enabled: false
+ remote_directory: gitlab-ci-secure-files
+ direct_upload: true
+ background_upload: false
+ proxy_download: true
dependency_proxy:
enabled: false
object_store:
@@ -1738,7 +1766,7 @@
ip_whitelist:
- 0.0.0.0/0
web_exporter:
- enabled: false
+ enabled: true
address: 0.0.0.0
port: 8083
sidekiq_exporter:
@@ -1785,7 +1813,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.8.4
+ chart: webservice-5.9.1
release: gitlab-test
heritage: Helm
@@ -1977,6 +2005,7 @@
createBucket gitlab-pseudo none false
createBucket gitlab-mr-diffs none false
createBucket gitlab-terraform-state none false
+ createBucket gitlab-ci-secure-files none false
createBucket gitlab-dependency-proxy none false
createBucket gitlab-pages none false
@@ -2550,6 +2579,10 @@
if [ -f /config/database_password ] ; then
sed -i -e 's@DB_PASSWORD_FILE@'"$(cat /config/database_password)"'@' /registry/config.yml
fi
+ # Insert import notification secret, if migration is enabled
+ if [ -f /config/registry/notificationSecret ] ; then
+ sed -i -e 's@NOTIFICATION_SECRET@'"$(cat /config/registry/notificationSecret | tr -d '[]"')"'@' /registry/config.yml
+ fi
# Copy the database TLS connection files to the expected location and set permissions
if [ -d /config/ssl ]; then
cp -r /config/ssl/ /registry/ssl
@@ -2632,6 +2665,7 @@
disabled: true
migration:
enabled: false
+ testslowimport: 0s
# minimal configuration, in order to do database migrations
migrations-config.yml: |
@@ -2649,13 +2683,13 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.8.4
+ chart: gitlab-5.9.1
release: gitlab-test
heritage: Helm
data:
- gitlabVersion: "14.8.4"
- gitlabChartVersion: "5.8.4"
+ gitlabVersion: "14.9.1"
+ gitlabChartVersion: "5.9.1"
---
# Source: gitlab/templates/initdb-configmap.yaml
apiVersion: v1
@@ -2665,7 +2699,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.8.4
+ chart: gitlab-5.9.1
release: gitlab-test
heritage: Helm
@@ -19922,7 +19956,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.8.4
+ chart: gitaly-5.9.1
release: gitlab-test
heritage: Helm
@@ -19937,6 +19971,9 @@
- port: 8075
name: gitaly
targetPort: grcp-gitaly
+ - port: 9236
+ name: http-metrics
+ targetPort: http-metrics
selector:
app: gitaly
release: gitlab-test
@@ -19950,7 +19987,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.8.4
+ chart: gitlab-exporter-5.9.1
release: gitlab-test
heritage: Helm
@@ -19961,9 +19998,9 @@
type: ClusterIP
ports:
- port: 9168
- targetPort: 9168
+ targetPort: http-metrics
protocol: TCP
- name: gitlab-exporter
+ name: http-metrics
selector:
app: gitlab-exporter
release: gitlab-test
@@ -19976,7 +20013,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.8.4
+ chart: gitlab-shell-5.9.1
release: gitlab-test
heritage: Helm
@@ -20002,7 +20039,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.8.4
+ chart: praefect-5.9.1
release: gitlab-test
heritage: Helm
@@ -20021,10 +20058,10 @@
port: 8075
protocol: TCP
targetPort: 8075
- - name: praefect-metrics
+ - name: http-metrics
port: 9236
protocol: TCP
- targetPort: 9236
+ targetPort: http-metrics
selector:
app: praefect
release: gitlab-test
@@ -20037,7 +20074,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.8.4
+ chart: webservice-5.9.1
release: gitlab-test
heritage: Helm
@@ -20049,13 +20086,17 @@
type: ClusterIP
ports:
- port: 8080
- targetPort: 8080
+ targetPort: http-webservice
protocol: TCP
name: http-webservice
- port: 8181
- targetPort: 8181
+ targetPort: http-workhorse
protocol: TCP
name: http-workhorse
+ - port: 8083
+ targetPort: http-metrics-ws
+ protocol: TCP
+ name: http-metrics-ws
selector:
app: webservice
release: gitlab-test
@@ -20401,7 +20442,7 @@
type: ClusterIP
ports:
- port: 5000
- targetPort: 5000
+ targetPort: http
protocol: TCP
name: registry
selector:
@@ -20675,7 +20716,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.8.4
+ chart: gitlab-exporter-5.9.1
release: gitlab-test
heritage: Helm
@@ -20692,19 +20733,19 @@
metadata:
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.8.4
+ chart: gitlab-exporter-5.9.1
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 92a5fb2b9964429561553046147f667fb9bf88d7a1eb29131d206c51b45f5879
- gitlab.com/prometheus_path: /metrics
- gitlab.com/prometheus_port: "9168"
+ checksum/config: b3d4a2e8f9d2af6589d329dd24efc3d1d8987fa7ec56595241d9055afdaacd34
gitlab.com/prometheus_scrape: "true"
- prometheus.io/path: /metrics
- prometheus.io/port: "9168"
+ gitlab.com/prometheus_port: "9168"
+ gitlab.com/prometheus_path: /metrics
prometheus.io/scrape: "true"
+ prometheus.io/port: "9168"
+ prometheus.io/path: /metrics
spec:
securityContext:
@@ -20725,7 +20766,7 @@
initContainers:
- name: certificates
- image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:4678ac2a66f126b20362faddd333be907d4eded47a7fb8ea2653c1522ddbed49"
env:
- name: MALLOC_CONF
@@ -20774,7 +20815,7 @@
containers:
- name: gitlab-exporter
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:11.11.0"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:11.12.0"
env:
- name: CONFIG_TEMPLATE_DIRECTORY
value: '/var/opt/gitlab-exporter/templates'
@@ -20791,7 +20832,7 @@
value: "80000"
ports:
- containerPort: 9168
- name: gitlab-exporter
+ name: http-metrics
volumeMounts:
- name: gitlab-exporter-config
mountPath: /var/opt/gitlab-exporter/templates/gitlab-exporter.yml.erb
@@ -20860,7 +20901,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.8.4
+ chart: gitlab-shell-5.9.1
release: gitlab-test
heritage: Helm
@@ -20876,20 +20917,20 @@
metadata:
labels:
app: gitlab-shell
- chart: gitlab-shell-5.8.4
+ chart: gitlab-shell-5.9.1
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 74a5dc98a4eff124fdd5540f7ee252457a826682337dd4d65dd415efd8a4530c
- checksum/config-sshd: 1032525b90e46bd36013234f60f2b464ec411382da7824d1ebd2c492063680c1
+ checksum/config: 0e0323ed5d062345ffb5eb4484a56173a4d34f789d69f61ff09cb2f9ab0b9859
+ checksum/config-sshd: 046cff4999cd812ccd97764cb1dc7a583f95dde570f3dd9320c10e675b8088df
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
initContainers:
- name: certificates
- image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:4678ac2a66f126b20362faddd333be907d4eded47a7fb8ea2653c1522ddbed49"
env:
volumeMounts:
@@ -20936,7 +20977,7 @@
containers:
- name: gitlab-shell
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v13.23.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v13.24.0"
ports:
- containerPort: 2222
name: ssh
@@ -21023,7 +21064,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.8.4
+ chart: sidekiq-5.9.1
release: gitlab-test
heritage: Helm
@@ -21041,21 +21082,23 @@
metadata:
labels:
app: sidekiq
- chart: sidekiq-5.8.4
+ chart: sidekiq-5.9.1
release: gitlab-test
heritage: Helm
queue-pod-name: native-chart
annotations:
- checksum/configmap: 3d21f7160467a74b436a8337e9d8ad772b9896f8d94e4b687a46e87e4d3d3a37
+ checksum/configmap: 8b04b0803b2b2aefcbf81345a234a6a9b47f36fddf5871d28bbbee0ba33dd614
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
- gitlab.com/prometheus_port: "3807"
gitlab.com/prometheus_scrape: "true"
- prometheus.io/port: "3807"
+ gitlab.com/prometheus_port: "3807"
+ gitlab.com/prometheus_path: /metrics
prometheus.io/scrape: "true"
+ prometheus.io/port: "3807"
+ prometheus.io/path: /metrics
spec:
securityContext:
runAsUser: 1000
@@ -21076,7 +21119,7 @@
initContainers:
- name: certificates
- image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:4678ac2a66f126b20362faddd333be907d4eded47a7fb8ea2653c1522ddbed49"
env:
volumeMounts:
@@ -21109,7 +21152,7 @@
requests:
cpu: 50m
- name: dependencies
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.8.4"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.9.1"
args:
- /scripts/wait-for-deps
env:
@@ -21148,7 +21191,7 @@
containers:
- name: sidekiq
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.8.4"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.9.1"
env:
- name: prometheus_multiproc_dir
value: /metrics
@@ -21184,7 +21227,7 @@
ports:
- containerPort: 3807
- name: metrics
+ name: http-metrics
volumeMounts:
@@ -21310,6 +21353,7 @@
# mount secret for packages
# mount secret for external_diffs
# mount secret for terraform_state
+ # mount secret for ci_secure_files
# mount secret for dependency_proxy
# mount secret for pages
# mount secret for pseudonymizer
@@ -21331,7 +21375,7 @@
namespace: gitlab
labels:
app: toolbox
- chart: toolbox-5.8.4
+ chart: toolbox-5.9.1
release: gitlab-test
heritage: Helm
@@ -21350,13 +21394,13 @@
metadata:
labels:
app: toolbox
- chart: toolbox-5.8.4
+ chart: toolbox-5.9.1
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 185e9c8db5035fec214bca3d971fbe0c9d72434b9226a87a4d953a884167cf0c
+ checksum/config: 20bcd63b55b8375074c2862344d852ed30b98b350dcb5b00939143e157412bf7
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
securityContext:
@@ -21366,7 +21410,7 @@
initContainers:
- name: certificates
- image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:4678ac2a66f126b20362faddd333be907d4eded47a7fb8ea2653c1522ddbed49"
env:
volumeMounts:
@@ -21414,7 +21458,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.8.4"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.9.1"
env:
- name: ARTIFACTS_BUCKET_NAME
value: gitlab-artifacts
@@ -21430,6 +21474,8 @@
value: gitlab-mr-diffs
- name: TERRAFORM_STATE_BUCKET_NAME
value: gitlab-terraform-state
+ - name: CI_SECURE_FILES_BUCKET_NAME
+ value: gitlab-ci-secure-files
- name: BACKUP_BUCKET_NAME
value: gitlab-backups
- name: BACKUP_BACKEND
@@ -21561,6 +21607,7 @@
# mount secret for packages
# mount secret for external_diffs
# mount secret for terraform_state
+ # mount secret for ci_secure_files
# mount secret for dependency_proxy
# mount secret for pages
# mount secret for pseudonymizer
@@ -21582,7 +21629,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.8.4
+ chart: webservice-5.9.1
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -21603,7 +21650,7 @@
metadata:
labels:
app: webservice
- chart: webservice-5.8.4
+ chart: webservice-5.9.1
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -21611,16 +21658,16 @@
annotations:
- checksum/config: 39deeb44c0a57852df63396d76dd56e78ebd3c48ac3e902c1b623095b88143c7
+ checksum/config: fafa32ffaa96b81ec7f1070db9cfdf518f770c8fc406db40ca53a9577b82ff80
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
- gitlab.com/prometheus_path: /-/metrics
- gitlab.com/prometheus_port: "8080"
gitlab.com/prometheus_scrape: "true"
- prometheus.io/path: /-/metrics
- prometheus.io/port: "8080"
+ gitlab.com/prometheus_port: "8080"
+ gitlab.com/prometheus_path: /metrics
prometheus.io/scrape: "true"
+ prometheus.io/port: "8080"
+ prometheus.io/path: /metrics
spec:
securityContext:
@@ -21642,7 +21689,7 @@
initContainers:
- name: certificates
- image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:4678ac2a66f126b20362faddd333be907d4eded47a7fb8ea2653c1522ddbed49"
env:
volumeMounts:
@@ -21684,7 +21731,7 @@
requests:
cpu: 50m
- name: dependencies
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.8.4
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.9.1
args:
- /scripts/wait-for-deps
env:
@@ -21719,10 +21766,12 @@
containers:
- name: webservice
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.8.4
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.9.1
ports:
- containerPort: 8080
- name: webservice
+ name: http-webservice
+ - containerPort: 8083
+ name: http-metrics-ws
env:
- name: GITLAB_WEBSERVER
value: puma
@@ -21812,10 +21861,10 @@
cpu: 300m
memory: 2.5G
- name: gitlab-workhorse
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v14.8.4"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v14.9.1"
ports:
- containerPort: 8181
- name: workhorse
+ name: http-workhorse
env:
- name: TMPDIR
value: "/tmp/gitlab"
@@ -21959,6 +22008,7 @@
# mount secret for packages
# mount secret for external_diffs
# mount secret for terraform_state
+ # mount secret for ci_secure_files
# mount secret for dependency_proxy
# mount secret for pages
# mount secrets for LDAP
@@ -22402,7 +22452,7 @@
annotations:
- checksum/configmap: 5a73032107121f2ad978bba992da2a00992b1b861ccbb74bb803e1e92686475a
+ checksum/configmap: 0de8fb4967c100c95ab01d3916dc9454d5779717aec97e6786249b3941641576
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
@@ -22422,7 +22472,7 @@
automountServiceAccountToken: false
initContainers:
- name: certificates
- image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:4678ac2a66f126b20362faddd333be907d4eded47a7fb8ea2653c1522ddbed49"
env:
volumeMounts:
@@ -22447,7 +22497,7 @@
containers:
- name: registry
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.27.1-gitlab"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.32.0-gitlab"
env:
volumeMounts:
@@ -22457,10 +22507,15 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
readOnly: true
+ ports:
+ - containerPort: 5000
+ name: http
+ - containerPort: 5001
+ name: debug
livenessProbe:
httpGet:
path: /debug/health
- port: 5001
+ port: debug
scheme: HTTP
initialDelaySeconds: 5
periodSeconds: 10
@@ -22470,7 +22525,7 @@
readinessProbe:
httpGet:
path: /debug/health
- port: 5001
+ port: debug
scheme: HTTP
initialDelaySeconds: 5
periodSeconds: 5
@@ -22521,7 +22576,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.8.4
+ chart: gitlab-shell-5.9.1
release: gitlab-test
heritage: Helm
@@ -22546,7 +22601,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.8.4
+ chart: sidekiq-5.9.1
release: gitlab-test
heritage: Helm
@@ -22571,7 +22626,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.8.4
+ chart: webservice-5.9.1
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -22622,7 +22677,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.8.4
+ chart: gitaly-5.9.1
release: gitlab-test
heritage: Helm
@@ -22642,25 +22697,27 @@
labels:
storage: default
app: gitaly
- chart: gitaly-5.8.4
+ chart: gitaly-5.9.1
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 51c48f7b7a0346573193a581abe8241082f30fc516ee168271136091f8eca65b
+ checksum/config: 21f5df7c827804cc5c4b21071811d39a9c40205d85541f9c6feacb10f3870965
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
gitlab.com/prometheus_scrape: "true"
gitlab.com/prometheus_port: "9236"
+ gitlab.com/prometheus_path: /metrics
prometheus.io/scrape: "true"
prometheus.io/port: "9236"
+ prometheus.io/path: /metrics
spec:
terminationGracePeriodSeconds: 30
initContainers:
- name: certificates
- image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:4678ac2a66f126b20362faddd333be907d4eded47a7fb8ea2653c1522ddbed49"
env:
volumeMounts:
@@ -22708,12 +22765,12 @@
containers:
- name: gitaly
- image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.8.4"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.9.1"
ports:
- containerPort: 8075
name: grcp-gitaly
- containerPort: 9236
- name: metrics
+ name: http-metrics
env:
- name: CONFIG_TEMPLATE_DIRECTORY
value: '/etc/gitaly/templates'
@@ -22809,7 +22866,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.8.4
+ chart: praefect-5.9.1
release: gitlab-test
heritage: Helm
@@ -22826,13 +22883,19 @@
metadata:
labels:
app: praefect
- chart: praefect-5.8.4
+ chart: praefect-5.9.1
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 552c41d02ed2a7ef9f92cde55228fb1586a62f46afae3edbd602070cf8655c43
+ checksum/config: 9f729cc48e9bdd383bd796efc5d10ca057c1508adde64ba55d9461dec878bd84
+ gitlab.com/prometheus_scrape: "true"
+ gitlab.com/prometheus_port: "9236"
+ gitlab.com/prometheus_path: /metrics
+ prometheus.io/scrape: "true"
+ prometheus.io/port: "9236"
+ prometheus.io/path: /metrics
spec:
affinity:
podAntiAffinity:
@@ -22849,7 +22912,7 @@
initContainers:
- name: certificates
- image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:4678ac2a66f126b20362faddd333be907d4eded47a7fb8ea2653c1522ddbed49"
env:
volumeMounts:
@@ -22882,10 +22945,11 @@
containers:
- name: praefect
- image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.8.4"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.9.1"
ports:
- containerPort: 8075
- containerPort: 9236
+ name: http-metrics
env:
- name: CONFIG_TEMPLATE_DIRECTORY
value: '/etc/gitaly/templates'
@@ -23297,7 +23361,7 @@
restartPolicy: OnFailure
containers:
- name: create-issuer
- image: "registry.gitlab.com/gitlab-org/build/cng/kubectl:1.16.15"
+ image: "registry.gitlab.com/gitlab-org/build/cng/kubectl:1.18.20@sha256:824750f20381facb70cb90d3cd41da075d7ffde5a14de6f14f7037285fe0ddb7"
command: ['/bin/bash', '/scripts/create-issuer', '/scripts/issuer.yml']
volumeMounts:
- name: scripts
@@ -23318,7 +23382,7 @@
namespace: gitlab
labels:
app: migrations
- chart: migrations-5.8.4
+ chart: migrations-5.9.1
release: gitlab-test
heritage: Helm
@@ -23329,7 +23393,7 @@
metadata:
labels:
app: migrations
- chart: migrations-5.8.4
+ chart: migrations-5.9.1
release: gitlab-test
heritage: Helm
@@ -23342,7 +23406,7 @@
initContainers:
- name: certificates
- image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:4678ac2a66f126b20362faddd333be907d4eded47a7fb8ea2653c1522ddbed49"
env:
volumeMounts:
@@ -23377,7 +23441,7 @@
containers:
- name: migrations
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.8.4"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.9.1"
args:
- /scripts/wait-for-deps
- /scripts/db-migrate
@@ -23530,7 +23594,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.8.4
+ chart: webservice-5.9.1
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -23791,7 +23855,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.8.4
+ chart: gitlab-5.9.1
release: gitlab-test
heritage: Helm
@@ -23808,7 +23872,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.8.4
+ chart: gitlab-5.9.1
release: gitlab-test
heritage: Helm
@@ -23833,7 +23897,8 @@
# Args: yaml file, search path
function fetch_rails_value(){
- local value=$(yq read $1 "${2}")
+ local value=$(yq ".${2}" $1)
+
# Don't return null values
if [ "${value}" != "null" ]; then echo "${value}"; fi
}
@@ -23847,7 +23912,7 @@
kubectl --namespace=$namespace label \
--overwrite \
- secret $secret_name app=gitlab chart=gitlab-5.8.4 release=gitlab-test heritage=Helm
+ secret $secret_name app=gitlab chart=gitlab-5.9.1 release=gitlab-test heritage=Helm
}
# Args: secretname, args
@@ -23993,11 +24058,11 @@
-
# Praefect DB password
generate_secret_if_needed "gitlab-test-praefect-dbsecret" --from-literal="secret"=$(gen_random 'a-zA-Z0-9', 32)
- # Gitaly secret
+
+ # Praefect auth token
generate_secret_if_needed "gitlab-test-praefect-secret" --from-literal="token"=$(gen_random 'a-zA-Z0-9' 64)
---
# Source: gitlab/templates/upgrade_check_hook.yaml
@@ -24008,7 +24073,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.8.4
+ chart: gitlab-5.9.1
release: gitlab-test
heritage: Helm
@@ -24127,7 +24192,7 @@
namespace: gitlab
labels:
app: shared-secrets
- chart: shared-secrets-5.8.4
+ chart: shared-secrets-5.9.1
release: gitlab-test
heritage: Helm
@@ -24175,7 +24240,7 @@
namespace: gitlab
labels:
app: shared-secrets
- chart: shared-secrets-5.8.4
+ chart: shared-secrets-5.9.1
release: gitlab-test
heritage: Helm
@@ -24196,7 +24261,7 @@
apiVersion: v1
kind: Pod
metadata:
- name: gitlab-test-webservice-test-runner-l9u34
+ name: gitlab-test-webservice-test-runner-zevvp
namespace: gitlab
annotations:
"helm.sh/hook": test
@@ -24204,7 +24269,7 @@
spec:
containers:
- name: test-runner
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.8.4
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.9.1
command: ['sh', '/tests/test_login']
volumeMounts:
- name: tests
@@ -24275,11 +24340,11 @@
apiVersion: batch/v1
kind: Job
metadata:
- name: gitlab-test-shared-secrets-1-9zt
+ name: gitlab-test-shared-secrets-1-8n3
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.8.4
+ chart: gitlab-5.9.1
release: gitlab-test
heritage: Helm
@@ -24291,7 +24356,7 @@
metadata:
labels:
app: gitlab
- chart: gitlab-5.8.4
+ chart: gitlab-5.9.1
release: gitlab-test
heritage: Helm
@@ -24307,7 +24372,7 @@
containers:
- name: gitlab
- image: "registry.gitlab.com/gitlab-org/build/cng/kubectl:1.16.15"
+ image: "registry.gitlab.com/gitlab-org/build/cng/kubectl:1.18.20@sha256:824750f20381facb70cb90d3cd41da075d7ffde5a14de6f14f7037285fe0ddb7"
command: ['/bin/bash', '/scripts/generate-secrets']
volumeMounts:
- name: scripts
@@ -24332,7 +24397,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.8.4
+ chart: gitlab-5.9.1
release: gitlab-test
heritage: Helm
@@ -24360,9 +24425,9 @@
command: ['/bin/sh', '/scripts/runcheck']
env:
- name: GITLAB_VERSION
- value: '14.8.4'
+ value: '14.9.1'
- name: CHART_VERSION
- value: '5.8.4'
+ value: '5.9.1'
volumeMounts:
- name: chart-info
mountPath: /chart-info