WIP: A new version of gitlab (14.2.1) is available
current diff:
--- current-deployment.yaml
+++ future-deployment.yaml
@@ -7,7 +7,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.1.2
+ chart: gitaly-5.2.1
release: gitlab-test
heritage: Helm
@@ -28,7 +28,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.1.2
+ chart: gitlab-shell-5.2.1
release: gitlab-test
heritage: Helm
@@ -47,7 +47,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.1.2
+ chart: praefect-5.2.1
release: gitlab-test
heritage: Helm
@@ -66,7 +66,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.1.2
+ chart: sidekiq-5.2.1
release: gitlab-test
heritage: Helm
@@ -87,7 +87,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.1.2
+ chart: webservice-5.2.1
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -154,7 +154,7 @@
namespace: gitlab
labels:
app: registry
- chart: registry-0.6.0
+ chart: registry-0.7.0
release: gitlab-test
heritage: Helm
@@ -350,7 +350,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.1.2
+ chart: gitaly-5.2.1
release: gitlab-test
heritage: Helm
@@ -371,7 +371,7 @@
internal_socket_dir = "/home/git"
# If metrics collection is enabled, inform gitaly about that
- prometheus_listen_addr = "localhost:9236"
+ prometheus_listen_addr = "0.0.0.0:9236"
<% @storages = [ "gitlab-test-gitaly-default-0", "gitlab-test-gitaly-default-1", "gitlab-test-gitaly-default-2", ] %>
@@ -428,7 +428,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.1.2
+ chart: gitlab-exporter-5.2.1
release: gitlab-test
heritage: Helm
@@ -444,7 +444,7 @@
methods:
- probe_db
opts:
- connection_string: dbname=gitlab_production user=gitlab host=gitlab-test-postgresql.gitlab.svc port=5432 password='<%= File.read("/etc/gitlab/postgres/psql-password").strip.gsub(/[\'\\]/) { |esc| '\\' + esc } %>'
+ connection_string: dbname=gitlab_production user=gitlab host=gitlab-test-postgresql.gitlab.svc port=5432 password='<%= File.read('/etc/gitlab/postgres/psql-password-main').strip.gsub(/[\'\\]/) { |esc| '\\' + esc } %>'
database:
multiple: true
ci_builds:
@@ -518,7 +518,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.1.2
+ chart: gitlab-shell-5.2.1
release: gitlab-test
heritage: Helm
@@ -678,7 +678,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.1.2
+ chart: gitlab-shell-5.2.1
release: gitlab-test
heritage: Helm
@@ -738,7 +738,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.1.2
+ chart: gitlab-shell-5.2.1
release: gitlab-test
heritage: Helm
@@ -753,7 +753,7 @@
namespace: gitlab
labels:
app: migrations
- chart: migrations-5.1.2
+ chart: migrations-5.2.1
release: gitlab-test
heritage: Helm
@@ -762,24 +762,26 @@
installation_type: |
gitlab-helm-chart
database.yml.erb: |
+
production:
- adapter: postgresql
- encoding: unicode
- database: gitlab_production
- username: gitlab
- password: "<%= File.read("/etc/gitlab/postgres/psql-password").strip.dump[1..-2] %>"
- host: "gitlab-test-postgresql.gitlab.svc"
- port: 5432
- connect_timeout:
- keepalives:
- keepalives_idle:
- keepalives_interval:
- keepalives_count:
- tcp_user_timeout:
- application_name:
- prepared_statements: false
-
-
+ main:
+ adapter: postgresql
+ encoding: unicode
+ database: gitlab_production
+ username: gitlab
+ password: "<%= File.read('/etc/gitlab/postgres/psql-password-main').strip.dump[1..-2] %>"
+ host: "gitlab-test-postgresql.gitlab.svc"
+ port: 5432
+ connect_timeout:
+ keepalives:
+ keepalives_idle:
+ keepalives_interval:
+ keepalives_count:
+ tcp_user_timeout:
+ application_name:
+ prepared_statements: false
+
+
resque.yml.erb: |
production:
url: redis://:<%= ERB::Util::url_encode(File.read("/etc/gitlab/redis/redis-password").strip) %>@gitlab-test-redis-master.gitlab.svc:6379
@@ -844,7 +846,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.1.2
+ chart: praefect-5.2.1
release: gitlab-test
heritage: Helm
@@ -898,27 +900,6 @@
dbname = 'praefect'
sslmode = 'disable'
---
-# Source: gitlab/charts/gitlab/charts/praefect/templates/configmap.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: gitlab-test-praefect-scripts
- namespace: gitlab
- labels:
- app: praefect
- chart: praefect-5.1.2
- release: gitlab-test
- heritage: Helm
-
-data:
- praefect-start: |
- set -e
- # Run the migrations
- /usr/local/bin/praefect -config /etc/gitaly/config.toml sql-migrate
-
- # Start praefect
- /usr/local/bin/praefect -config /etc/gitaly/config.toml
----
# Source: gitlab/charts/gitlab/charts/sidekiq/templates/configmap.yaml
apiVersion: v1
kind: ConfigMap
@@ -927,7 +908,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.1.2
+ chart: sidekiq-5.2.1
release: gitlab-test
heritage: Helm
@@ -935,24 +916,26 @@
installation_type: |
gitlab-helm-chart
database.yml.erb: |
+
production:
- adapter: postgresql
- encoding: unicode
- database: gitlab_production
- username: gitlab
- password: "<%= File.read("/etc/gitlab/postgres/psql-password").strip.dump[1..-2] %>"
- host: "gitlab-test-postgresql.gitlab.svc"
- port: 5432
- connect_timeout:
- keepalives:
- keepalives_idle:
- keepalives_interval:
- keepalives_count:
- tcp_user_timeout:
- application_name:
- prepared_statements: false
-
-
+ main:
+ adapter: postgresql
+ encoding: unicode
+ database: gitlab_production
+ username: gitlab
+ password: "<%= File.read('/etc/gitlab/postgres/psql-password-main').strip.dump[1..-2] %>"
+ host: "gitlab-test-postgresql.gitlab.svc"
+ port: 5432
+ connect_timeout:
+ keepalives:
+ keepalives_idle:
+ keepalives_interval:
+ keepalives_count:
+ tcp_user_timeout:
+ application_name:
+ prepared_statements: false
+
+
smtp_settings.rb: |
resque.yml.erb: |
@@ -1209,30 +1192,32 @@
namespace: gitlab
labels:
app: task-runner
- chart: task-runner-5.1.2
+ chart: task-runner-5.2.1
release: gitlab-test
heritage: Helm
data:
database.yml.erb: |
+
production:
- adapter: postgresql
- encoding: unicode
- database: gitlab_production
- username: gitlab
- password: "<%= File.read("/etc/gitlab/postgres/psql-password").strip.dump[1..-2] %>"
- host: "gitlab-test-postgresql.gitlab.svc"
- port: 5432
- connect_timeout:
- keepalives:
- keepalives_idle:
- keepalives_interval:
- keepalives_count:
- tcp_user_timeout:
- application_name:
- prepared_statements: false
-
-
+ main:
+ adapter: postgresql
+ encoding: unicode
+ database: gitlab_production
+ username: gitlab
+ password: "<%= File.read('/etc/gitlab/postgres/psql-password-main').strip.dump[1..-2] %>"
+ host: "gitlab-test-postgresql.gitlab.svc"
+ port: 5432
+ connect_timeout:
+ keepalives:
+ keepalives_idle:
+ keepalives_interval:
+ keepalives_count:
+ tcp_user_timeout:
+ application_name:
+ prepared_statements: false
+
+
smtp_settings.rb: |
resque.yml.erb: |
@@ -1482,7 +1467,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.1.2
+ chart: webservice-5.2.1
release: gitlab-test
heritage: Helm
@@ -1490,24 +1475,26 @@
installation_type: |
gitlab-helm-chart
database.yml.erb: |
+
production:
- adapter: postgresql
- encoding: unicode
- database: gitlab_production
- username: gitlab
- password: "<%= File.read("/etc/gitlab/postgres/psql-password").strip.dump[1..-2] %>"
- host: "gitlab-test-postgresql.gitlab.svc"
- port: 5432
- connect_timeout:
- keepalives:
- keepalives_idle:
- keepalives_interval:
- keepalives_count:
- tcp_user_timeout:
- application_name:
- prepared_statements: false
-
-
+ main:
+ adapter: postgresql
+ encoding: unicode
+ database: gitlab_production
+ username: gitlab
+ password: "<%= File.read('/etc/gitlab/postgres/psql-password-main').strip.dump[1..-2] %>"
+ host: "gitlab-test-postgresql.gitlab.svc"
+ port: 5432
+ connect_timeout:
+ keepalives:
+ keepalives_idle:
+ keepalives_interval:
+ keepalives_count:
+ tcp_user_timeout:
+ application_name:
+ prepared_statements: false
+
+
smtp_settings.rb: |
resque.yml.erb: |
@@ -1762,7 +1749,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.1.2
+ chart: webservice-5.2.1
release: gitlab-test
heritage: Helm
@@ -2470,7 +2457,7 @@
namespace: gitlab
labels:
app: registry
- chart: registry-0.6.0
+ chart: registry-0.7.0
release: gitlab-test
heritage: Helm
@@ -2570,6 +2557,11 @@
maintenance:
readonly:
enabled: false
+ uploadpurging:
+ enabled: true
+ age: 168h
+ interval: 24h
+ dryrun: false
s3:
accesskey: "ACCESS_KEY"
secretkey: "SECRET_KEY"
@@ -2589,6 +2581,7 @@
gc:
disabled: true
migration:
+ enabled: false
# minimal configuration, in order to do database migrations
migrations-config.yml: |
@@ -2606,13 +2599,13 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.1.2
+ chart: gitlab-5.2.1
release: gitlab-test
heritage: Helm
data:
- gitlabVersion: "14.1.2"
- gitlabChartVersion: "5.1.2"
+ gitlabVersion: "14.2.1"
+ gitlabChartVersion: "5.2.1"
---
# Source: gitlab/templates/initdb-configmap.yaml
apiVersion: v1
@@ -2622,7 +2615,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.1.2
+ chart: gitlab-5.2.1
release: gitlab-test
heritage: Helm
@@ -17771,7 +17764,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.1.2
+ chart: gitaly-5.2.1
release: gitlab-test
heritage: Helm
@@ -17799,7 +17792,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.1.2
+ chart: gitlab-exporter-5.2.1
release: gitlab-test
heritage: Helm
@@ -17825,7 +17818,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.1.2
+ chart: gitlab-shell-5.2.1
release: gitlab-test
heritage: Helm
@@ -17851,7 +17844,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.1.2
+ chart: praefect-5.2.1
release: gitlab-test
heritage: Helm
@@ -17886,7 +17879,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.1.2
+ chart: webservice-5.2.1
release: gitlab-test
heritage: Helm
@@ -18229,7 +18222,7 @@
namespace: gitlab
labels:
app: registry
- chart: registry-0.6.0
+ chart: registry-0.7.0
release: gitlab-test
heritage: Helm
@@ -18488,7 +18481,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.1.2
+ chart: gitlab-exporter-5.2.1
release: gitlab-test
heritage: Helm
@@ -18505,13 +18498,13 @@
metadata:
labels:
app: gitlab-exporter
- chart: gitlab-exporter-5.1.2
+ chart: gitlab-exporter-5.2.1
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 5cc7fa229aef6a4e92a37e753d0d54a91311d78eb70696861e01da328ec7a5f1
+ checksum/config: 92447a84b02596e54fc0c1feb4701b9b5e4e2ef8880702dbf94622cb494718ca
gitlab.com/prometheus_path: /metrics
gitlab.com/prometheus_port: "9168"
gitlab.com/prometheus_scrape: "true"
@@ -18536,10 +18529,8 @@
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"
env:
- name: MALLOC_CONF
@@ -18559,7 +18550,7 @@
cpu: 50m
- name: configure
command: ['sh', '/config/configure']
- image: "busybox:latest"
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"
env:
- name: MALLOC_CONF
@@ -18584,13 +18575,11 @@
readOnly: false
resources:
requests:
- cpu: 50m
-
+ cpu: 50m
containers:
- name: gitlab-exporter
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:10.5.0"
-
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:11.2.0"
env:
- name: CONFIG_TEMPLATE_DIRECTORY
value: '/var/opt/gitlab-exporter/templates'
@@ -18653,7 +18642,7 @@
name: "gitlab-test-postgresql-password"
items:
- key: "postgresql-password"
- path: postgres/psql-password
+ path: postgres/psql-password-main
- secret:
name: "gitlab-test-redis-secret"
@@ -18676,7 +18665,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.1.2
+ chart: gitlab-shell-5.2.1
release: gitlab-test
heritage: Helm
@@ -18692,22 +18681,20 @@
metadata:
labels:
app: gitlab-shell
- chart: gitlab-shell-5.1.2
+ chart: gitlab-shell-5.2.1
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 5619006321b5f7ea8f7d4c927bcb7d37cb1bbd8aee899bd8e81a618c79d1c372
- checksum/config-sshd: c91e352665dbc3943135da1bf97950f7034ccf0bf634b07dd7355535b79e630a
+ checksum/config: 53c850a418c14e2074cd6711edc09ef857aadcb6b87a6b7e079b57b2ef08eff7
+ checksum/config-sshd: cdbe032176f9527cbf8c1e184ab7b8b3cca25561d56833a218a8268d2fa0363c
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"
env:
volumeMounts:
@@ -18719,7 +18706,7 @@
cpu: 50m
- name: configure
command: ['sh', '/config/configure']
- image: "busybox:latest"
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"
env:
volumeMounts:
@@ -18754,8 +18741,7 @@
containers:
- name: gitlab-shell
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v13.19.1"
-
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v13.19.1"
ports:
- containerPort: 2222
name: ssh
@@ -18768,6 +18754,8 @@
value: '/srv/gitlab-shell'
- name: KEYS_DIRECTORY
value: '/etc/gitlab-secrets/ssh'
+ - name: SSH_DAEMON
+ value: "openssh"
volumeMounts:
- name: shell-config
@@ -18840,7 +18828,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.1.2
+ chart: sidekiq-5.2.1
release: gitlab-test
heritage: Helm
@@ -18858,14 +18846,14 @@
metadata:
labels:
app: sidekiq
- chart: sidekiq-5.1.2
+ chart: sidekiq-5.2.1
release: gitlab-test
heritage: Helm
queue-pod-name: native-chart
annotations:
- checksum/configmap: 47fd6bb9f52903d7a4494856cb8c1939552e0fecb1e243a3921775d723e36cfd
+ checksum/configmap: 38188bea20aa9648ca0951ea9b15408ffb3fed5fd29549df3f17bd690ec7b37f
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
@@ -18892,10 +18880,8 @@
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"
env:
volumeMounts:
@@ -18907,7 +18893,7 @@
cpu: 50m
- name: configure
command: ['sh', '/config/configure']
- image: "busybox:latest"
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"
env:
volumeMounts:
@@ -18928,8 +18914,7 @@
requests:
cpu: 50m
- name: dependencies
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.1.2"
-
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.2.1"
args:
- /scripts/wait-for-deps
env:
@@ -18965,8 +18950,7 @@
containers:
- name: sidekiq
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.1.2"
-
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.2.1"
env:
- name: prometheus_multiproc_dir
value: /metrics
@@ -19095,7 +19079,7 @@
name: "gitlab-test-postgresql-password"
items:
- key: "postgresql-password"
- path: postgres/psql-password
+ path: postgres/psql-password-main
- secret:
name: "gitlab-test-registry-secret"
items:
@@ -19149,7 +19133,7 @@
namespace: gitlab
labels:
app: task-runner
- chart: task-runner-5.1.2
+ chart: task-runner-5.2.1
release: gitlab-test
heritage: Helm
@@ -19168,13 +19152,13 @@
metadata:
labels:
app: task-runner
- chart: task-runner-5.1.2
+ chart: task-runner-5.2.1
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: eecab99da135d564e504cb62e677be856d8552253fc08b2890af00d9acf648f4
+ checksum/config: d5b7c10129757f3d998ce882e5176ee0bdd64ee80be16cf94e95c9f4f19a189f
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
securityContext:
@@ -19183,10 +19167,8 @@
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"
env:
volumeMounts:
@@ -19198,7 +19180,7 @@
cpu: 50m
- name: configure
command: ['sh', '/config/configure']
- image: "busybox:latest"
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"
env:
volumeMounts:
@@ -19234,8 +19216,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-task-runner-ce:v14.1.2"
-
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.2.1"
env:
- name: ARTIFACTS_BUCKET_NAME
value: gitlab-artifacts
@@ -19257,6 +19238,8 @@
value: gcs
- name: TMP_BUCKET_NAME
value: tmp
+ - name: PAGES_BUCKET_NAME
+ value: fdo-gitlab-pages
- name: GITALY_FEATURE_DEFAULT_ON
value: "1"
- name: ENABLE_BOOTSNAP
@@ -19337,7 +19320,7 @@
name: "gitlab-test-postgresql-password"
items:
- key: "postgresql-password"
- path: postgres/psql-password
+ path: postgres/psql-password-main
- secret:
name: "gitlab-test-registry-secret"
items:
@@ -19401,7 +19384,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.1.2
+ chart: webservice-5.2.1
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -19421,7 +19404,7 @@
metadata:
labels:
app: webservice
- chart: webservice-5.1.2
+ chart: webservice-5.2.1
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -19429,7 +19412,7 @@
annotations:
- checksum/config: 6c29fb73da5eb53f3736b1777eec1aad44b31be8736291007c1ce65977b233d7
+ checksum/config: 5e2d48d07e52c910f39b9933f14f264af367ed2118b87d5ee5a42c6a206edef3
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
@@ -19459,10 +19442,8 @@
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"
env:
volumeMounts:
@@ -19475,7 +19456,7 @@
- name: configure
command: ['sh']
args: [ '-c', 'sh -x /config-webservice/configure ; sh -x /config-workhorse/configure ; mkdir -p -m 3770 /tmp/gitlab']
- image: "busybox:latest"
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"
env:
volumeMounts:
@@ -19504,8 +19485,7 @@
requests:
cpu: 50m
- name: dependencies
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.1.2
-
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.2.1
args:
- /scripts/wait-for-deps
env:
@@ -19537,8 +19517,7 @@
containers:
- name: webservice
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.1.2
-
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.2.1
ports:
- containerPort: 8080
name: webservice
@@ -19633,8 +19612,7 @@
cpu: 300m
memory: 2.5G
- name: gitlab-workhorse
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v14.1.2"
-
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v14.2.1"
ports:
- containerPort: 8181
name: workhorse
@@ -19741,7 +19719,7 @@
name: "gitlab-test-postgresql-password"
items:
- key: "postgresql-password"
- path: postgres/psql-password
+ path: postgres/psql-password-main
- secret:
name: "gitlab-test-registry-secret"
items:
@@ -19858,8 +19836,7 @@
medium: "Memory"
initContainers:
- name: configure
- image: "busybox:latest"
- imagePullPolicy: IfNotPresent
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"
command: ["sh", "/config/configure"]
volumeMounts:
- name: minio-configuration
@@ -19871,8 +19848,7 @@
cpu: 50m
containers:
- name: minio
- image: minio/minio:RELEASE.2017-12-28T01-21-00Z
- imagePullPolicy:
+ image: minio/minio:RELEASE.2017-12-28T01-21-00Z
args: ["-C", "/tmp/.minio", "--quiet", "server", "/export"]
volumeMounts:
- name: export
@@ -19934,7 +19910,7 @@
dnsPolicy: ClusterFirst
containers:
- name: controller
- image: "k8s.gcr.io/ingress-nginx/controller:v0.41.2@sha256:1f4f402b9c14f3ae92b11ada1dfe9893a88f0faeb0b2f4b903e2c67a0c3bf0de"
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/ingress-nginx/controller:v0.41.2@sha256:1f4f402b9c14f3ae92b11ada1dfe9893a88f0faeb0b2f4b903e2c67a0c3bf0de"
imagePullPolicy: IfNotPresent
lifecycle:
preStop:
@@ -20046,7 +20022,7 @@
spec:
containers:
- name: nginx-ingress-default-backend
- image: "k8s.gcr.io/defaultbackend-amd64:1.5"
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/defaultbackend-amd64:1.5"
imagePullPolicy: IfNotPresent
securityContext:
capabilities:
@@ -20196,7 +20172,7 @@
namespace: gitlab
labels:
app: registry
- chart: registry-0.6.0
+ chart: registry-0.7.0
release: gitlab-test
heritage: Helm
@@ -20212,13 +20188,13 @@
metadata:
labels:
app: registry
- chart: registry-0.6.0
+ chart: registry-0.7.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/configmap: db64095868c8ed874cfb578d26c0dfd0418a6d93d3f3eca23b206e8710893dc3
+ checksum/configmap: eca44a8352d28d1018dd026113d9f7bb08084199ca351c2c22a86cebe3a26d7a
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
@@ -20237,10 +20213,8 @@
release: gitlab-test
automountServiceAccountToken: false
initContainers:
-
- name: certificates
- image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2"
- imagePullPolicy: "IfNotPresent"
+ image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2"
env:
volumeMounts:
@@ -20251,8 +20225,7 @@
requests:
cpu: 50m
- name: configure
- image: "busybox:latest"
- imagePullPolicy: IfNotPresent
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"
command: ["sh", "/config/configure"]
volumeMounts:
- name: registry-secrets
@@ -20266,8 +20239,7 @@
containers:
- name: registry
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.5.2-gitlab"
- imagePullPolicy: "IfNotPresent"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.9.0-gitlab"
env:
volumeMounts:
@@ -20337,7 +20309,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-5.1.2
+ chart: gitlab-shell-5.2.1
release: gitlab-test
heritage: Helm
@@ -20362,7 +20334,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-5.1.2
+ chart: sidekiq-5.2.1
release: gitlab-test
heritage: Helm
@@ -20387,7 +20359,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.1.2
+ chart: webservice-5.2.1
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -20413,7 +20385,7 @@
namespace: gitlab
labels:
app: registry
- chart: registry-0.6.0
+ chart: registry-0.7.0
release: gitlab-test
heritage: Helm
@@ -20438,7 +20410,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-5.1.2
+ chart: gitaly-5.2.1
release: gitlab-test
heritage: Helm
@@ -20458,13 +20430,13 @@
labels:
storage: default
app: gitaly
- chart: gitaly-5.1.2
+ chart: gitaly-5.2.1
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 673c521281d8dbd0816d29739a6e77e9c024d8bdb330b2057c5a3306aa4903f8
+ checksum/config: f0b96b41a1621e7a5071089d0cd8d6cfaebb1556fa7f4a96cd2e30b5823a3c03
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
gitlab.com/prometheus_scrape: "true"
@@ -20475,10 +20447,8 @@
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"
env:
volumeMounts:
@@ -20490,7 +20460,7 @@
cpu: 50m
- name: configure
command: ['sh', '/config/configure']
- image: "busybox:latest"
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"
env:
volumeMounts:
@@ -20526,8 +20496,7 @@
containers:
- name: gitaly
- image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.1.2"
-
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.2.1"
ports:
- containerPort: 8075
- containerPort: 9236
@@ -20628,7 +20597,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-5.1.2
+ chart: praefect-5.2.1
release: gitlab-test
heritage: Helm
@@ -20645,13 +20614,13 @@
metadata:
labels:
app: praefect
- chart: praefect-5.1.2
+ chart: praefect-5.2.1
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 37c5d4f82491cbae1a4237ff81f0e40676786b03d9e3c6c29594461339de8436
+ checksum/config: d7491867f3eb51a1594c0761d6c26edb3b779a84ba1f2fddd1a005891d50f535
spec:
affinity:
podAntiAffinity:
@@ -20667,10 +20636,8 @@
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"
env:
volumeMounts:
@@ -20681,7 +20648,7 @@
{}
- name: configure
command: ['sh', '/config/configure']
- image: "busybox:latest"
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"
env:
volumeMounts:
@@ -20703,8 +20670,7 @@
containers:
- name: praefect
- image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.1.2"
-
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.2.1"
ports:
- containerPort: 8075
- containerPort: 9236
@@ -20719,9 +20685,12 @@
value: '/etc/ssl/certs'
- name: PRAEFECT_PROMETHEUS_LISTEN_ADDR
value: ':9236'
+ - name: USE_PRAEFECT_SERVICE
+ value: '1'
+ - name: PRAEFECT_AUTO_MIGRATE
+ value: '1'
- args: [ "sh", "/scripts/praefect/praefect-start" ]
resources:
requests:
cpu: 100m
@@ -20738,8 +20707,6 @@
readOnly: true
- name: praefect-config
mountPath: /etc/gitaly/templates
- - name: praefect-scripts
- mountPath: /scripts/praefect
dnsPolicy: ClusterFirst
restartPolicy: Always
terminationGracePeriodSeconds: 30
@@ -20748,10 +20715,6 @@
defaultMode: 420
name: gitlab-test-praefect
name: praefect-config
- - configMap:
- defaultMode: 420
- name: gitlab-test-praefect-scripts
- name: praefect-scripts
- emptyDir:
medium: Memory
name: praefect-secrets
@@ -21123,8 +21086,7 @@
containers:
- name: create-issuer
image: "registry.gitlab.com/gitlab-org/build/cng/kubectl:1.16.15"
- command: ['/bin/bash', '/scripts/create-issuer', '/scripts/issuer.yml']
-
+ command: ['/bin/bash', '/scripts/create-issuer', '/scripts/issuer.yml']
volumeMounts:
- name: scripts
mountPath: /scripts
@@ -21144,7 +21106,7 @@
namespace: gitlab
labels:
app: migrations
- chart: migrations-5.1.2
+ chart: migrations-5.2.1
release: gitlab-test
heritage: Helm
@@ -21155,7 +21117,7 @@
metadata:
labels:
app: migrations
- chart: migrations-5.1.2
+ chart: migrations-5.2.1
release: gitlab-test
heritage: Helm
@@ -21167,10 +21129,8 @@
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"
env:
volumeMounts:
@@ -21182,7 +21142,7 @@
cpu: 50m
- name: configure
command: ['sh', '/config/configure']
- image: "busybox:latest"
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"
env:
volumeMounts:
@@ -21205,11 +21165,10 @@
containers:
- name: migrations
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-task-runner-ce:v14.1.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.2.1"
args:
- /scripts/wait-for-deps
- - /scripts/db-migrate
-
+ - /scripts/db-migrate
env:
- name: CONFIG_TEMPLATE_DIRECTORY
value: '/var/opt/gitlab/templates'
@@ -21280,7 +21239,7 @@
name: "gitlab-test-postgresql-password"
items:
- key: "postgresql-password"
- path: postgres/psql-password
+ path: postgres/psql-password-main
- secret:
name: "gitlab-test-gitlab-initial-root-password"
items:
@@ -21337,7 +21296,7 @@
name: "gitlab-test-minio-secret"
containers:
- name: minio-mc
- image: minio/mc:RELEASE.2018-07-13T00-53-22Z
+ image: minio/mc:RELEASE.2018-07-13T00-53-22Z
command: ["/bin/sh", "/config/initialize"]
env:
- name: MINIO_ENDPOINT
@@ -21359,7 +21318,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-5.1.2
+ chart: webservice-5.2.1
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -21435,7 +21394,7 @@
namespace: gitlab
labels:
app: registry
- chart: registry-0.6.0
+ chart: registry-0.7.0
release: gitlab-test
heritage: Helm
@@ -21554,7 +21513,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.1.2
+ chart: gitlab-5.2.1
release: gitlab-test
heritage: Helm
@@ -21571,7 +21530,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.1.2
+ chart: gitlab-5.2.1
release: gitlab-test
heritage: Helm
@@ -21610,7 +21569,7 @@
kubectl --namespace=$namespace label \
--overwrite \
- secret $secret_name app=gitlab chart=gitlab-5.1.2 release=gitlab-test heritage=Helm
+ secret $secret_name app=gitlab chart=gitlab-5.2.1 release=gitlab-test heritage=Helm
}
# Args: secretname, args
@@ -21767,7 +21726,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.1.2
+ chart: gitlab-5.2.1
release: gitlab-test
heritage: Helm
@@ -21862,7 +21821,7 @@
namespace: gitlab
labels:
app: shared-secrets
- chart: shared-secrets-5.1.2
+ chart: shared-secrets-5.2.1
release: gitlab-test
heritage: Helm
@@ -21883,7 +21842,7 @@
namespace: gitlab
labels:
app: shared-secrets
- chart: shared-secrets-5.1.2
+ chart: shared-secrets-5.2.1
release: gitlab-test
heritage: Helm
@@ -21904,7 +21863,7 @@
apiVersion: v1
kind: Pod
metadata:
- name: gitlab-test-webservice-test-runner-kc1x9
+ name: gitlab-test-webservice-test-runner-htwmj
namespace: gitlab
annotations:
"helm.sh/hook": test
@@ -21912,7 +21871,7 @@
spec:
containers:
- name: test-runner
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.1.2
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.2.1
command: ['sh', '/tests/test_login']
volumeMounts:
- name: tests
@@ -21937,11 +21896,11 @@
apiVersion: batch/v1
kind: Job
metadata:
- name: gitlab-test-shared-secrets-1-amd
+ name: gitlab-test-shared-secrets-1-sj8
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.1.2
+ chart: gitlab-5.2.1
release: gitlab-test
heritage: Helm
@@ -21953,7 +21912,7 @@
metadata:
labels:
app: gitlab
- chart: gitlab-5.1.2
+ chart: gitlab-5.2.1
release: gitlab-test
heritage: Helm
@@ -21969,9 +21928,8 @@
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.16.15"
command: ['/bin/bash', '/scripts/generate-secrets']
-
volumeMounts:
- name: scripts
mountPath: /scripts
@@ -21995,7 +21953,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-5.1.2
+ chart: gitlab-5.2.1
release: gitlab-test
heritage: Helm
@@ -22019,14 +21977,13 @@
containers:
- name: run-check
- image: "busybox:latest"
- command: ['/bin/sh', '/scripts/runcheck']
-
+ image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"
+ command: ['/bin/sh', '/scripts/runcheck']
env:
- name: GITLAB_VERSION
- value: '14.1.2'
+ value: '14.2.1'
- name: CHART_VERSION
- value: '5.1.2'
+ value: '5.2.1'
volumeMounts:
- name: chart-info
mountPath: /chart-info