WIP: A new version of gitlab (15.4.0) is available
current diff:
--- current-deployment.yaml
+++ future-deployment.yaml
@@ -7,7 +7,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-6.3.2
+ chart: gitaly-6.4.0
release: gitlab-test
heritage: Helm
@@ -28,7 +28,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-6.3.2
+ chart: gitlab-shell-6.4.0
release: gitlab-test
heritage: Helm
@@ -47,7 +47,7 @@
namespace: gitlab
labels:
app: kas
- chart: kas-6.3.2
+ chart: kas-6.4.0
release: gitlab-test
heritage: Helm
@@ -66,7 +66,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-6.3.2
+ chart: praefect-6.4.0
release: gitlab-test
heritage: Helm
@@ -85,7 +85,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-6.3.2
+ chart: sidekiq-6.4.0
release: gitlab-test
heritage: Helm
@@ -106,7 +106,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-6.3.2
+ chart: webservice-6.4.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -360,7 +360,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-6.3.2
+ chart: gitaly-6.4.0
release: gitlab-test
heritage: Helm
@@ -439,7 +439,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-6.3.2
+ chart: gitlab-exporter-6.4.0
release: gitlab-test
heritage: Helm
@@ -505,21 +505,18 @@
<<: *db_common
configure: |
+ # BEGIN gitlab.scripts.configure.secrets
set -e
config_dir="/init-config"
secret_dir="/init-secrets"
-
- for secret in ; do
- mkdir -p "${secret_dir}/${secret}"
- cp -v -r -L "${config_dir}/${secret}/." "${secret_dir}/${secret}/"
- done
+ # optional
for secret in redis postgres gitlab-exporter ; do
if [ -e "${config_dir}/${secret}" ]; then
mkdir -p "${secret_dir}/${secret}"
cp -v -r -L "${config_dir}/${secret}/." "${secret_dir}/${secret}/"
fi
done
-
+ # END gitlab.scripts.configure.secrets
# Leave this here - This line denotes end of block to the parser.
---
# Source: gitlab/charts/gitlab/charts/gitlab-shell/templates/configmap-sshd.yml
@@ -530,7 +527,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-6.3.2
+ chart: gitlab-shell-6.4.0
release: gitlab-test
heritage: Helm
@@ -690,26 +687,22 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-6.3.2
+ chart: gitlab-shell-6.4.0
release: gitlab-test
heritage: Helm
data:
configure: |
+ # BEGIN gitlab.scripts.configure.secrets
set -e
config_dir="/init-config"
secret_dir="/init-secrets"
-
+ # required
for secret in shell ; do
mkdir -p "${secret_dir}/${secret}"
cp -v -r -L "${config_dir}/${secret}/." "${secret_dir}/${secret}/"
done
- for secret in redis minio objectstorage postgres ldap omniauth smtp kas pages oauth-secrets mailroom ; do
- if [ -e "${config_dir}/${secret}" ]; then
- mkdir -p "${secret_dir}/${secret}"
- cp -v -r -L "${config_dir}/${secret}/." "${secret_dir}/${secret}/"
- fi
- done
+ # END gitlab.scripts.configure.secrets
mkdir -p /${secret_dir}/ssh
cp -v -r -L /${config_dir}/ssh_host_* /${secret_dir}/ssh/
chmod 0400 /${secret_dir}/ssh/ssh_host_*
@@ -747,7 +740,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-6.3.2
+ chart: gitlab-shell-6.4.0
release: gitlab-test
heritage: Helm
@@ -762,7 +755,7 @@
namespace: gitlab
labels:
app: kas
- chart: kas-6.3.2
+ chart: kas-6.4.0
release: gitlab-test
heritage: Helm
@@ -804,7 +797,7 @@
namespace: gitlab
labels:
app: migrations
- chart: migrations-6.3.2
+ chart: migrations-6.4.0
release: gitlab-test
heritage: Helm
@@ -873,23 +866,25 @@
sidekiq:
configure: |
+ # BEGIN gitlab.scripts.configure.secrets
set -e
config_dir="/init-config"
secret_dir="/init-secrets"
-
+ # required
for secret in rails-secrets migrations gitaly ; do
mkdir -p "${secret_dir}/${secret}"
cp -v -r -L "${config_dir}/${secret}/." "${secret_dir}/${secret}/"
done
- for secret in redis minio objectstorage postgres ldap omniauth smtp kas pages oauth-secrets mailroom ; do
+ # optional
+ for secret in redis minio objectstorage postgres ldap omniauth smtp kas pages oauth-secrets mailroom gitlab-exporter ; do
if [ -e "${config_dir}/${secret}" ]; then
mkdir -p "${secret_dir}/${secret}"
cp -v -r -L "${config_dir}/${secret}/." "${secret_dir}/${secret}/"
fi
done
+ # END gitlab.scripts.configure.secrets
-
# Leave this here - This line denotes end of block to the parser.
---
# Source: gitlab/charts/gitlab/charts/praefect/templates/configmap.yaml
@@ -900,7 +895,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-6.3.2
+ chart: praefect-6.4.0
release: gitlab-test
heritage: Helm
@@ -964,7 +959,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-6.3.2
+ chart: sidekiq-6.4.0
release: gitlab-test
heritage: Helm
@@ -993,6 +988,8 @@
database_tasks: true
+ krb5.conf: |
+
smtp_settings.rb: |
resque.yml.erb: |
@@ -1175,6 +1172,11 @@
external_providers: []
kerberos:
enabled: false
+ keytab: /etc/krb5.keytab
+ use_dedicated_port: false
+ port: 8443
+ https: true
+ simple_ldap_linking_allowed_realms: []
shared:
gitaly:
client_path: /home/git/gitaly/bin
@@ -1218,23 +1220,25 @@
address: 0.0.0.0
port: 3808
configure: |
+ # BEGIN gitlab.scripts.configure.secrets
set -e
config_dir="/init-config"
secret_dir="/init-secrets"
-
+ # required
for secret in gitaly registry rails-secrets ; do
mkdir -p "${secret_dir}/${secret}"
cp -v -r -L "${config_dir}/${secret}/." "${secret_dir}/${secret}/"
done
- for secret in redis minio objectstorage postgres ldap omniauth smtp kas pages oauth-secrets mailroom ; do
+ # optional
+ for secret in redis minio objectstorage postgres ldap omniauth smtp kas pages oauth-secrets mailroom gitlab-exporter ; do
if [ -e "${config_dir}/${secret}" ]; then
mkdir -p "${secret_dir}/${secret}"
cp -v -r -L "${config_dir}/${secret}/." "${secret_dir}/${secret}/"
fi
done
+ # END gitlab.scripts.configure.secrets
-
# Leave this here - This line denotes end of block to the parser.
---
# Source: gitlab/charts/gitlab/charts/toolbox/templates/configmap.yaml
@@ -1245,7 +1249,7 @@
namespace: gitlab
labels:
app: toolbox
- chart: toolbox-6.3.2
+ chart: toolbox-6.4.0
release: gitlab-test
heritage: Helm
@@ -1272,6 +1276,8 @@
database_tasks: true
+ krb5.conf: |
+
smtp_settings.rb: |
resque.yml.erb: |
@@ -1438,6 +1444,11 @@
external_providers: []
kerberos:
enabled: false
+ keytab: /etc/krb5.keytab
+ use_dedicated_port: false
+ port: 8443
+ https: true
+ simple_ldap_linking_allowed_realms: []
shared:
gitaly:
client_path: /home/git/gitaly/bin
@@ -1476,23 +1487,25 @@
sidekiq_exporter:
extra:
configure: |
+ # BEGIN gitlab.scripts.configure.secrets
set -e
config_dir="/init-config"
secret_dir="/init-secrets"
-
+ # required
for secret in shell gitaly registry rails-secrets ; do
mkdir -p "${secret_dir}/${secret}"
cp -v -r -L "${config_dir}/${secret}/." "${secret_dir}/${secret}/"
done
- for secret in redis minio objectstorage postgres ldap omniauth smtp kas pages oauth-secrets mailroom ; do
+ # optional
+ for secret in redis minio objectstorage postgres ldap omniauth smtp kas pages oauth-secrets mailroom gitlab-exporter ; do
if [ -e "${config_dir}/${secret}" ]; then
mkdir -p "${secret_dir}/${secret}"
cp -v -r -L "${config_dir}/${secret}/." "${secret_dir}/${secret}/"
fi
done
+ # END gitlab.scripts.configure.secrets
-
configure-gsutil: |
# The following script is used to configure gsutil when creating backups
# It provides inputs to the `gsutil config -e` prompt as follows:
@@ -1510,7 +1523,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-6.3.2
+ chart: webservice-6.4.0
release: gitlab-test
heritage: Helm
@@ -1539,6 +1552,8 @@
database_tasks: true
+ krb5.conf: |
+
smtp_settings.rb: |
resque.yml.erb: |
@@ -1715,6 +1730,11 @@
external_providers: []
kerberos:
enabled: false
+ keytab: /etc/krb5.keytab
+ use_dedicated_port: false
+ port: 8443
+ https: true
+ simple_ldap_linking_allowed_realms: []
shared:
gitaly:
client_path: /home/git/gitaly/bin
@@ -1777,20 +1797,23 @@
san_extensions: false
required_for_git_access: false
configure: |
+ # BEGIN gitlab.scripts.configure.secrets
set -e
config_dir="/init-config"
secret_dir="/init-secrets"
-
+ # required
for secret in shell gitaly registry rails-secrets gitlab-workhorse ; do
mkdir -p "${secret_dir}/${secret}"
cp -v -r -L "${config_dir}/${secret}/." "${secret_dir}/${secret}/"
done
- for secret in redis minio objectstorage postgres ldap omniauth smtp kas pages oauth-secrets mailroom ; do
+ # optional
+ for secret in redis minio objectstorage postgres ldap omniauth smtp kas pages oauth-secrets mailroom gitlab-exporter ; do
if [ -e "${config_dir}/${secret}" ]; then
mkdir -p "${secret_dir}/${secret}"
cp -v -r -L "${config_dir}/${secret}/." "${secret_dir}/${secret}/"
fi
done
+ # END gitlab.scripts.configure.secrets
---
# Source: gitlab/charts/gitlab/charts/webservice/templates/configmap.yml
apiVersion: v1
@@ -1800,7 +1823,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-6.3.2
+ chart: webservice-6.4.0
release: gitlab-test
heritage: Helm
@@ -1875,6 +1898,12 @@
metadata:
name: gitlab-test-webservice-tests
namespace: gitlab
+ labels:
+ app: webservice
+ chart: webservice-6.4.0
+ release: gitlab-test
+ heritage: Helm
+
data:
test_login: |
set -e
@@ -2592,7 +2621,7 @@
if [ -d /config/tls ]; then
cp -r /config/tls/ /registry/tls
chmod 700 /registry/tls
- chmod 600 /registry/tls/tls.*
+ chmod 600 /registry/tls/*
fi
config.yml: |
version: 0.1
@@ -2605,7 +2634,7 @@
# `host` is not configurable
# `prefix` is not configurable
debug:
- addr: ':5001'
+ addr: :5001
prometheus:
enabled: false
path: /metrics
@@ -2695,13 +2724,13 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-6.3.2
+ chart: gitlab-6.4.0
release: gitlab-test
heritage: Helm
data:
- gitlabVersion: "15.3.2"
- gitlabChartVersion: "6.3.2"
+ gitlabVersion: "15.4.0"
+ gitlabChartVersion: "6.4.0"
---
# Source: gitlab/templates/initdb-configmap.yaml
apiVersion: v1
@@ -2711,7 +2740,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-6.3.2
+ chart: gitlab-6.4.0
release: gitlab-test
heritage: Helm
@@ -19968,7 +19997,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-6.3.2
+ chart: gitaly-6.4.0
release: gitlab-test
heritage: Helm
@@ -19981,7 +20010,7 @@
clusterIP: "None"
ports:
- port: 8075
- name: gitaly
+ name: grpc-gitaly
targetPort: grpc-gitaly
- port: 9236
name: http-metrics
@@ -19999,7 +20028,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-6.3.2
+ chart: gitlab-exporter-6.4.0
release: gitlab-test
heritage: Helm
@@ -20025,7 +20054,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-6.3.2
+ chart: gitlab-shell-6.4.0
release: gitlab-test
heritage: Helm
@@ -20051,7 +20080,7 @@
namespace: gitlab
labels:
app: kas
- chart: kas-6.3.2
+ chart: kas-6.4.0
release: gitlab-test
heritage: Helm
@@ -20064,15 +20093,15 @@
- port: 8150
targetPort: 8150
protocol: TCP
- name: tcp-kas-external-api
+ name: grpc-kas-external-api
- port: 8153
targetPort: 8153
protocol: TCP
- name: tcp-kas-internal-api
+ name: grpc-kas-internal-api
- port: 8154
targetPort: 8154
protocol: TCP
- name: tcp-kas-k8s-api
+ name: grpc-kas-k8s-api
- port: 8151
targetPort: http-metrics
protocol: TCP
@@ -20089,7 +20118,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-6.3.2
+ chart: praefect-6.4.0
release: gitlab-test
heritage: Helm
@@ -20104,7 +20133,7 @@
type: ClusterIP
clusterIP: None
ports:
- - name: praefect
+ - name: grpc-praefect
port: 8075
protocol: TCP
targetPort: 8075
@@ -20124,7 +20153,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-6.3.2
+ chart: webservice-6.4.0
release: gitlab-test
heritage: Helm
@@ -20174,7 +20203,7 @@
release: gitlab-test
component: app
ports:
- - name: service
+ - name: http
port: 9000
targetPort: 9000
protocol: TCP
@@ -20242,12 +20271,10 @@
port: 80
protocol: TCP
targetPort: http
- appProtocol: http
- name: https
port: 443
protocol: TCP
targetPort: https
- appProtocol: https
- name: gitlab-shell
port: 22
protocol: TCP
@@ -20464,7 +20491,7 @@
- port: 5000
targetPort: http
protocol: TCP
- name: registry
+ name: http-registry
selector:
app: registry
release: gitlab-test
@@ -20736,7 +20763,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-6.3.2
+ chart: gitlab-exporter-6.4.0
release: gitlab-test
heritage: Helm
@@ -20753,13 +20780,13 @@
metadata:
labels:
app: gitlab-exporter
- chart: gitlab-exporter-6.3.2
+ chart: gitlab-exporter-6.4.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 821c118016ea6ef35c0d579960ee6c428318af462f2eb52b8907910d37abeccf
+ checksum/config: 3c59a89ec9bf94d29673567c8dc35e172057ccc3d67d262829d0ef5e17da4fe2
gitlab.com/prometheus_scrape: "true"
gitlab.com/prometheus_port: "9168"
gitlab.com/prometheus_path: /metrics
@@ -20935,7 +20962,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-6.3.2
+ chart: gitlab-shell-6.4.0
release: gitlab-test
heritage: Helm
@@ -20951,14 +20978,14 @@
metadata:
labels:
app: gitlab-shell
- chart: gitlab-shell-6.3.2
+ chart: gitlab-shell-6.4.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: b342246f44c926a56109e861d8230d91b2b1e1bf3d7e1481e6e0162419436871
- checksum/config-sshd: 7f5f50a127b1bffa10ea8f019b0a14c18be666100db42ccbc8808d8b5fac01e3
+ checksum/config: f106b7751091851fed3ce032a6d255784281202fe008a497756a9fb94258e2ac
+ checksum/config-sshd: 2b5c9c5a8723e45135c520049601dd1cb957a4ad44b531f1a1c02f327fddd932
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
initContainers:
@@ -21111,7 +21138,7 @@
namespace: gitlab
labels:
app: kas
- chart: kas-6.3.2
+ chart: kas-6.4.0
release: gitlab-test
heritage: Helm
@@ -21127,13 +21154,13 @@
metadata:
labels:
app: kas
- chart: kas-6.3.2
+ chart: kas-6.4.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: ec6f904debb6984c6b1cd747fb8c09c9429c6feefc9c86b8bef7aed8c1ac2560
+ checksum/config: 55c66169f0ce86c9b28f092d70717e76b3da11c0d85f8f6200dcde3bd698ca21
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
gitlab.com/prometheus_scrape: "true"
gitlab.com/prometheus_port: "8151"
@@ -21178,7 +21205,7 @@
containers:
- name: kas
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-kas:v15.3.0"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-kas:v15.4.0"
args:
- "--configuration-file=/etc/kas/config.yaml"
env:
@@ -21263,7 +21290,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-6.3.2
+ chart: sidekiq-6.4.0
release: gitlab-test
heritage: Helm
@@ -21281,14 +21308,14 @@
metadata:
labels:
app: sidekiq
- chart: sidekiq-6.3.2
+ chart: sidekiq-6.4.0
release: gitlab-test
heritage: Helm
queue-pod-name: native-chart
annotations:
- checksum/configmap: 9c49ee86361438e266864d5b9716da7dea79a92f577f25c275a5333696882860
+ checksum/configmap: b4f0877aaf1b6ac65c081a92a848a58b834ed5f4d079c0718139fd7d45b658b7
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
@@ -21356,7 +21383,7 @@
requests:
cpu: 50m
- name: dependencies
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v15.3.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v15.4.0"
args:
- /scripts/wait-for-deps
env:
@@ -21399,7 +21426,7 @@
containers:
- name: sidekiq
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v15.3.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v15.4.0"
env:
- name: prometheus_multiproc_dir
value: /metrics
@@ -21433,6 +21460,7 @@
value: "1"
+
ports:
- containerPort: 3807
name: http-metrics
@@ -21451,6 +21479,10 @@
mountPath: /srv/gitlab/config/secrets.yml
subPath: rails-secrets/secrets.yml
- name: sidekiq-config
+ mountPath: '/etc/krb5.conf'
+ subPath: krb5.conf
+
+ - name: sidekiq-config
mountPath: '/srv/gitlab/config/initializers/smtp_settings.rb'
subPath: smtp_settings.rb
- name: sidekiq-config
@@ -21493,6 +21525,7 @@
+
- name: sidekiq-metrics
emptyDir:
medium: "Memory"
@@ -21593,7 +21626,7 @@
namespace: gitlab
labels:
app: toolbox
- chart: toolbox-6.3.2
+ chart: toolbox-6.4.0
release: gitlab-test
heritage: Helm
@@ -21612,13 +21645,13 @@
metadata:
labels:
app: toolbox
- chart: toolbox-6.3.2
+ chart: toolbox-6.4.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 5430784fa6f53b72987ca05c2f2f46059795dd458fae6b2008b965ac67e92020
+ checksum/config: 22c0ecc61518781c99c88fc57e7ca3face6743e8b1cac9b568588d5bce5517b9
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
securityContext:
@@ -21681,7 +21714,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:v15.3.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v15.4.0"
env:
- name: ARTIFACTS_BUCKET_NAME
value: gitlab-artifacts
@@ -21724,6 +21757,10 @@
- name: toolbox-config
mountPath: '/var/opt/gitlab/templates'
- name: toolbox-config
+ mountPath: '/etc/krb5.conf'
+ subPath: krb5.conf
+
+ - name: toolbox-config
mountPath: '/srv/gitlab/config/initializers/smtp_settings.rb'
subPath: smtp_settings.rb
- name: toolbox-secrets
@@ -21749,6 +21786,7 @@
+
- name: toolbox-config
projected:
sources:
@@ -21863,7 +21901,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-6.3.2
+ chart: webservice-6.4.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -21884,7 +21922,7 @@
metadata:
labels:
app: webservice
- chart: webservice-6.3.2
+ chart: webservice-6.4.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -21892,7 +21930,7 @@
annotations:
- checksum/config: 7b6fbfa0be5cffd5d8748d724df647e8c86d0d8ac16fa91f8152fa5129fa370b
+ checksum/config: f21cb794285aba8b89dd722d526a07eb3aac55e4db8239a595f66b25e73d077e
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
@@ -21970,7 +22008,7 @@
requests:
cpu: 50m
- name: dependencies
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.3.2
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.4.0
args:
- /scripts/wait-for-deps
env:
@@ -22009,7 +22047,7 @@
containers:
- name: webservice
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.3.2
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.4.0
ports:
- containerPort: 8080
name: http-webservice
@@ -22063,6 +22101,10 @@
mountPath: /srv/gitlab/config/secrets.yml
subPath: rails-secrets/secrets.yml
- name: webservice-config
+ mountPath: '/etc/krb5.conf'
+ subPath: krb5.conf
+
+ - name: webservice-config
mountPath: '/srv/gitlab/config/initializers/smtp_settings.rb'
subPath: smtp_settings.rb
- name: webservice-config
@@ -22108,7 +22150,7 @@
cpu: 300m
memory: 2.5G
- name: gitlab-workhorse
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v15.3.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v15.4.0"
ports:
- containerPort: 8181
name: http-workhorse
@@ -22149,6 +22191,7 @@
mountPath: /etc/pki/ca-trust/extracted/pem
readOnly: true
+
livenessProbe:
exec:
command:
@@ -22175,6 +22218,7 @@
+
- name: shared-tmp
emptyDir: {}
- name: webservice-metrics
@@ -22636,7 +22680,7 @@
annotations:
- checksum/configmap: 324e0c9cebd9c86dfa23ab3760a346eda51b9f8b67cdc34e5baaf515a50e40b5
+ checksum/configmap: 6f8cfe24ca42fa6cba1c6d3fdf5f4462d04712a18a7355927b33b1e6121eb3fb
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
@@ -22772,7 +22816,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-6.3.2
+ chart: gitlab-shell-6.4.0
release: gitlab-test
heritage: Helm
@@ -22797,7 +22841,7 @@
namespace: gitlab
labels:
app: kas
- chart: kas-6.3.2
+ chart: kas-6.4.0
release: gitlab-test
heritage: Helm
@@ -22822,7 +22866,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-6.3.2
+ chart: sidekiq-6.4.0
release: gitlab-test
heritage: Helm
@@ -22847,7 +22891,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-6.3.2
+ chart: webservice-6.4.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -22898,7 +22942,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-6.3.2
+ chart: gitaly-6.4.0
release: gitlab-test
heritage: Helm
@@ -22918,13 +22962,13 @@
labels:
storage: default
app: gitaly
- chart: gitaly-6.3.2
+ chart: gitaly-6.4.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 04bb3317988b6810e7506b435c4279221141f9ef540574573b20084740caae40
+ checksum/config: b9ceae6c14b8c80d0e3932e5e2f07cb16caf4b682aea489fde9f01caa4d00573
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
gitlab.com/prometheus_scrape: "true"
@@ -22991,7 +23035,7 @@
containers:
- name: gitaly
- image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v15.3.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v15.4.0"
ports:
- containerPort: 8075
name: grpc-gitaly
@@ -23099,7 +23143,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-6.3.2
+ chart: praefect-6.4.0
release: gitlab-test
heritage: Helm
@@ -23116,13 +23160,13 @@
metadata:
labels:
app: praefect
- chart: praefect-6.3.2
+ chart: praefect-6.4.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: fd516604c1191554482cd9f63399a74f54ae0cc264a5ada11ac24378f193df09
+ checksum/config: 9901db5a4b1a56b1bc95117fed92ff7cb14376c1bcf0cb7245e03c500103665f
gitlab.com/prometheus_scrape: "true"
gitlab.com/prometheus_port: "9236"
gitlab.com/prometheus_path: /metrics
@@ -23183,7 +23227,7 @@
containers:
- name: praefect
- image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v15.3.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v15.4.0"
ports:
- containerPort: 8075
- containerPort: 9236
@@ -23627,7 +23671,7 @@
namespace: gitlab
labels:
app: migrations
- chart: migrations-6.3.2
+ chart: migrations-6.4.0
release: gitlab-test
heritage: Helm
@@ -23638,7 +23682,7 @@
metadata:
labels:
app: migrations
- chart: migrations-6.3.2
+ chart: migrations-6.4.0
release: gitlab-test
heritage: Helm
@@ -23691,7 +23735,7 @@
containers:
- name: migrations
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v15.3.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v15.4.0"
args:
- /scripts/wait-for-deps
- /scripts/db-migrate
@@ -23853,7 +23897,7 @@
namespace: gitlab
labels:
app: kas
- chart: kas-6.3.2
+ chart: kas-6.4.0
release: gitlab-test
heritage: Helm
@@ -23890,7 +23934,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-6.3.2
+ chart: webservice-6.4.0
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -24151,7 +24195,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-6.3.2
+ chart: gitlab-6.4.0
release: gitlab-test
heritage: Helm
@@ -24168,7 +24212,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-6.3.2
+ chart: gitlab-6.4.0
release: gitlab-test
heritage: Helm
@@ -24208,7 +24252,7 @@
kubectl --namespace=$namespace label \
--overwrite \
- secret $secret_name app=gitlab chart=gitlab-6.3.2 release=gitlab-test heritage=Helm
+ secret $secret_name app=gitlab chart=gitlab-6.4.0 release=gitlab-test heritage=Helm
}
# Args: secretname, args
@@ -24374,7 +24418,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-6.3.2
+ chart: gitlab-6.4.0
release: gitlab-test
heritage: Helm
@@ -24493,7 +24537,7 @@
namespace: gitlab
labels:
app: shared-secrets
- chart: shared-secrets-6.3.2
+ chart: shared-secrets-6.4.0
release: gitlab-test
heritage: Helm
@@ -24541,7 +24585,7 @@
namespace: gitlab
labels:
app: shared-secrets
- chart: shared-secrets-6.3.2
+ chart: shared-secrets-6.4.0
release: gitlab-test
heritage: Helm
@@ -24562,15 +24606,21 @@
apiVersion: v1
kind: Pod
metadata:
- name: gitlab-test-webservice-test-runner-goigu
+ name: gitlab-test-webservice-test-runner-cydjt
namespace: gitlab
annotations:
"helm.sh/hook": test
"helm.sh/hook-delete-policy": hook-succeeded,hook-failed,before-hook-creation
+ labels:
+ app: webservice
+ chart: webservice-6.4.0
+ release: gitlab-test
+ heritage: Helm
+
spec:
containers:
- name: test-runner
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.3.2
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.4.0
command: ['sh', '/tests/test_login']
volumeMounts:
- name: tests
@@ -24641,11 +24691,11 @@
apiVersion: batch/v1
kind: Job
metadata:
- name: gitlab-test-shared-secrets-1-3os
+ name: gitlab-test-shared-secrets-1-67s
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-6.3.2
+ chart: gitlab-6.4.0
release: gitlab-test
heritage: Helm
@@ -24657,7 +24707,7 @@
metadata:
labels:
app: gitlab
- chart: gitlab-6.3.2
+ chart: gitlab-6.4.0
release: gitlab-test
heritage: Helm
@@ -24698,7 +24748,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-6.3.2
+ chart: gitlab-6.4.0
release: gitlab-test
heritage: Helm
@@ -24727,9 +24777,9 @@
command: ['/bin/sh', '/scripts/runcheck']
env:
- name: GITLAB_VERSION
- value: '15.3.2'
+ value: '15.4.0'
- name: CHART_VERSION
- value: '6.3.2'
+ value: '6.4.0'
volumeMounts:
- name: chart-info
mountPath: /chart-info