WIP: A new version of gitlab (15.2.2) is available
current diff:
--- current-deployment.yaml
+++ future-deployment.yaml
@@ -7,7 +7,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-6.1.2
+ chart: gitaly-6.2.2
release: gitlab-test
heritage: Helm
@@ -28,7 +28,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-6.1.2
+ chart: gitlab-shell-6.2.2
release: gitlab-test
heritage: Helm
@@ -47,7 +47,7 @@
namespace: gitlab
labels:
app: kas
- chart: kas-6.1.2
+ chart: kas-6.2.2
release: gitlab-test
heritage: Helm
@@ -66,7 +66,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-6.1.2
+ chart: praefect-6.2.2
release: gitlab-test
heritage: Helm
@@ -85,7 +85,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-6.1.2
+ chart: sidekiq-6.2.2
release: gitlab-test
heritage: Helm
@@ -106,7 +106,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-6.1.2
+ chart: webservice-6.2.2
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -379,7 +379,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-6.1.2
+ chart: gitaly-6.2.2
release: gitlab-test
heritage: Helm
@@ -423,6 +423,7 @@
[git]
use_bundled_binaries = true
+ ignore_gitconfig = true
[gitaly-ruby]
# The directory where gitaly-ruby is installed
@@ -444,7 +445,6 @@
# password = somepass
# ca_file = /etc/ssl/cert.pem
# ca_path = /etc/pki/tls/certs
- self_signed_cert = false
[hooks]
# directory containing custom hooks
@@ -458,7 +458,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-6.1.2
+ chart: gitlab-exporter-6.2.2
release: gitlab-test
heritage: Helm
@@ -468,6 +468,7 @@
name: webrick
listen_address: 0.0.0.0
listen_port: 9168
+
probes:
db_common: &db_common
@@ -531,7 +532,7 @@
mkdir -p "${secret_dir}/${secret}"
cp -v -r -L "${config_dir}/${secret}/." "${secret_dir}/${secret}/"
done
- for secret in redis postgres ; do
+ 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}/"
@@ -548,7 +549,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-6.1.2
+ chart: gitlab-shell-6.2.2
release: gitlab-test
heritage: Helm
@@ -708,7 +709,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-6.1.2
+ chart: gitlab-shell-6.2.2
release: gitlab-test
heritage: Helm
@@ -740,9 +741,6 @@
secret_file: /etc/gitlab-secrets/shell/.gitlab_shell_secret
- http_settings:
- self_signed_cert: false
-
# File used as authorized_keys for gitlab user
auth_file: "/home/git/.ssh/authorized_keys"
@@ -768,7 +766,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-6.1.2
+ chart: gitlab-shell-6.2.2
release: gitlab-test
heritage: Helm
@@ -783,7 +781,7 @@
namespace: gitlab
labels:
app: kas
- chart: kas-6.1.2
+ chart: kas-6.2.2
release: gitlab-test
heritage: Helm
@@ -825,7 +823,7 @@
namespace: gitlab
labels:
app: migrations
- chart: migrations-6.1.2
+ chart: migrations-6.2.2
release: gitlab-test
heritage: Helm
@@ -921,7 +919,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-6.1.2
+ chart: praefect-6.2.2
release: gitlab-test
heritage: Helm
@@ -985,7 +983,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-6.1.2
+ chart: sidekiq-6.2.2
release: gitlab-test
heritage: Helm
@@ -1266,7 +1264,7 @@
namespace: gitlab
labels:
app: toolbox
- chart: toolbox-6.1.2
+ chart: toolbox-6.2.2
release: gitlab-test
heritage: Helm
@@ -1531,7 +1529,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-6.1.2
+ chart: webservice-6.2.2
release: gitlab-test
heritage: Helm
@@ -1689,6 +1687,9 @@
dsn:
clientside_dsn:
environment:
+ gitlab_docs:
+ enabled: false
+ host: ""
sidekiq:
pages:
@@ -1818,7 +1819,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-6.1.2
+ chart: webservice-6.2.2
release: gitlab-test
heritage: Helm
@@ -1864,13 +1865,16 @@
{%- else if eq $provider "AzureRM" %}
# Azure Blob storage configuration.
[object_storage.azurerm]
- azure_storage_account_name = "{% $azure_storage_account_name %}"
- azure_storage_access_key = "{% $azure_storage_access_key %}"
+ azure_storage_account_name = {% $azure_storage_account_name | strings.TrimSpace | data.ToJSON %}
+ azure_storage_access_key = {% $azure_storage_access_key | strings.TrimSpace | data.ToJSON %}
{%- end %}
{%- end %}
[image_resizer]
max_scaler_procs = 2
max_filesize = 250000
+ [[listeners]]
+ network = "tcp"
+ addr = "0.0.0.0:8181"
configure: |
set -e
mkdir -p /init-secrets-workhorse/gitlab-workhorse
@@ -1881,6 +1885,7 @@
mkdir -p /init-secrets-workhorse/minio
cp -v -r -L /init-config/minio/* /init-secrets-workhorse/minio/
fi
+
# Leave this here - This line denotes end of block to the parser.
---
# Source: gitlab/charts/gitlab/charts/webservice/templates/tests/tests.yaml
@@ -2274,6 +2279,11 @@
source_labels:
- __meta_kubernetes_pod_annotation_gitlab_com_prometheus_scrape
- action: replace
+ regex: (https?)
+ source_labels:
+ - __meta_kubernetes_pod_annotation_gitlab_com_prometheus_scheme
+ target_label: __scheme__
+ - action: replace
regex: (.+)
source_labels:
- __meta_kubernetes_pod_annotation_gitlab_com_prometheus_path
@@ -2593,6 +2603,12 @@
chmod 700 /registry/ssl
chmod 600 /registry/ssl/*.pem
fi
+ # Copy TLS certificates if present
+ if [ -d /config/tls ]; then
+ cp -r /config/tls/ /registry/tls
+ chmod 700 /registry/tls
+ chmod 600 /registry/tls/tls.*
+ fi
config.yml: |
version: 0.1
log:
@@ -2600,6 +2616,9 @@
service: registry
level: info
http:
+ addr: :5000
+ # `host` is not configurable
+ # `prefix` is not configurable
debug:
addr: ':5001'
prometheus:
@@ -2608,7 +2627,6 @@
draintimeout: 0
headers:
X-Content-Type-Options: [nosniff]
- addr: :5000
secret: "HTTP_SECRET"
relativeurls: false
health:
@@ -2687,13 +2705,13 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-6.1.2
+ chart: gitlab-6.2.2
release: gitlab-test
heritage: Helm
data:
- gitlabVersion: "15.1.2"
- gitlabChartVersion: "6.1.2"
+ gitlabVersion: "15.2.2"
+ gitlabChartVersion: "6.2.2"
---
# Source: gitlab/templates/initdb-configmap.yaml
apiVersion: v1
@@ -2703,7 +2721,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-6.1.2
+ chart: gitlab-6.2.2
release: gitlab-test
heritage: Helm
@@ -19960,7 +19978,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-6.1.2
+ chart: gitaly-6.2.2
release: gitlab-test
heritage: Helm
@@ -19991,7 +20009,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-6.1.2
+ chart: gitlab-exporter-6.2.2
release: gitlab-test
heritage: Helm
@@ -20017,7 +20035,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-6.1.2
+ chart: gitlab-shell-6.2.2
release: gitlab-test
heritage: Helm
@@ -20043,7 +20061,7 @@
namespace: gitlab
labels:
app: kas
- chart: kas-6.1.2
+ chart: kas-6.2.2
release: gitlab-test
heritage: Helm
@@ -20081,7 +20099,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-6.1.2
+ chart: praefect-6.2.2
release: gitlab-test
heritage: Helm
@@ -20116,7 +20134,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-6.1.2
+ chart: webservice-6.2.2
release: gitlab-test
heritage: Helm
@@ -20758,7 +20776,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-6.1.2
+ chart: gitlab-exporter-6.2.2
release: gitlab-test
heritage: Helm
@@ -20775,13 +20793,13 @@
metadata:
labels:
app: gitlab-exporter
- chart: gitlab-exporter-6.1.2
+ chart: gitlab-exporter-6.2.2
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 218c0599d37420f636d8f530cd2010a1fb993a68cac9092d0c8e461594b02f0e
+ checksum/config: 02060c6a5b9c1433a89a8188f260fd3572805da77dfd2087c2200cd2919228da
gitlab.com/prometheus_scrape: "true"
gitlab.com/prometheus_port: "9168"
gitlab.com/prometheus_path: /metrics
@@ -20824,6 +20842,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs
readOnly: false
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: false
resources:
requests:
cpu: 50m
@@ -20859,7 +20880,7 @@
containers:
- name: gitlab-exporter
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:11.16.0"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:11.17.1"
env:
- name: CONFIG_TEMPLATE_DIRECTORY
value: '/var/opt/gitlab-exporter/templates'
@@ -20889,6 +20910,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
readOnly: true
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: true
livenessProbe:
exec:
command:
@@ -20930,6 +20954,8 @@
items:
- key: "secret"
path: redis/redis-password
+
+
- name: gitlab-exporter-secrets
emptyDir:
medium: "Memory"
@@ -20937,6 +20963,9 @@
- name: etc-ssl-certs
emptyDir:
medium: "Memory"
+ - name: etc-pki-ca-trust-extracted-pem
+ emptyDir:
+ medium: "Memory"
---
# Source: gitlab/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml
apiVersion: apps/v1
@@ -20946,7 +20975,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-6.1.2
+ chart: gitlab-shell-6.2.2
release: gitlab-test
heritage: Helm
@@ -20962,14 +20991,14 @@
metadata:
labels:
app: gitlab-shell
- chart: gitlab-shell-6.1.2
+ chart: gitlab-shell-6.2.2
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 8477b861985b69f01272d069847af559082b2507df05ce534e738a2bfed6d4a4
- checksum/config-sshd: f927266cf872df9b6820d607a915fba09ed09c5fbc6ff575a7d0b6c4ddf143f7
+ checksum/config: dd1f173d59ee0bd72902061d1e86216ed0b27f8dd8371460cb70ad61210a2f66
+ checksum/config-sshd: ae595f1762860b0164c3b748c6878454526b0f4e8e315fcfd18a51e2e0c90c0a
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
initContainers:
@@ -20983,6 +21012,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs
readOnly: false
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: false
resources:
requests:
cpu: 50m
@@ -21024,7 +21056,7 @@
containers:
- name: gitlab-shell
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v14.7.4"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v14.9.0"
ports:
- containerPort: 2222
name: ssh
@@ -21055,6 +21087,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
readOnly: true
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: true
livenessProbe:
exec:
command:
@@ -21104,6 +21139,9 @@
- name: etc-ssl-certs
emptyDir:
medium: "Memory"
+ - name: etc-pki-ca-trust-extracted-pem
+ emptyDir:
+ medium: "Memory"
---
# Source: gitlab/charts/gitlab/charts/kas/templates/deployment.yaml
apiVersion: apps/v1
@@ -21113,7 +21151,7 @@
namespace: gitlab
labels:
app: kas
- chart: kas-6.1.2
+ chart: kas-6.2.2
release: gitlab-test
heritage: Helm
@@ -21129,12 +21167,13 @@
metadata:
labels:
app: kas
- chart: kas-6.1.2
+ chart: kas-6.2.2
release: gitlab-test
heritage: Helm
annotations:
+ checksum/config: 7d0509b798be594edb7b9bbabb92fc647baba4e1f91b1a6f5ee3cbd1fe34326b
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
gitlab.com/prometheus_scrape: "true"
gitlab.com/prometheus_port: "8151"
@@ -21144,6 +21183,7 @@
prometheus.io/path: /metrics
spec:
+ automountServiceAccountToken: false
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
@@ -21169,13 +21209,16 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs
readOnly: false
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: false
resources:
requests:
cpu: 50m
containers:
- name: kas
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-kas:v15.1.0"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-kas:v15.2.0"
args:
- "--configuration-file=/etc/kas/config.yaml"
env:
@@ -21216,12 +21259,18 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
readOnly: true
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: true
volumes:
- name: etc-ssl-certs
emptyDir:
medium: "Memory"
+ - name: etc-pki-ca-trust-extracted-pem
+ emptyDir:
+ medium: "Memory"
- name: init-etc-kas
projected:
defaultMode: 0440
@@ -21254,7 +21303,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-6.1.2
+ chart: sidekiq-6.2.2
release: gitlab-test
heritage: Helm
@@ -21272,14 +21321,14 @@
metadata:
labels:
app: sidekiq
- chart: sidekiq-6.1.2
+ chart: sidekiq-6.2.2
release: gitlab-test
heritage: Helm
queue-pod-name: native-chart
annotations:
- checksum/configmap: 41a7910c81eceeb010b2a8c4cb78848bece338d7634afd138f452f40bb98bde9
+ checksum/configmap: bbc971d3fb261875bb0d18960484312450f65370f7916af598a88c8e1e7fb989
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
@@ -21317,6 +21366,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs
readOnly: false
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: false
resources:
requests:
cpu: 50m
@@ -21344,7 +21396,7 @@
requests:
cpu: 50m
- name: dependencies
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v15.1.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v15.2.2"
args:
- /scripts/wait-for-deps
env:
@@ -21368,6 +21420,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
readOnly: true
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: true
- name: sidekiq-config
mountPath: '/var/opt/gitlab/templates'
readOnly: true
@@ -21384,7 +21439,7 @@
containers:
- name: sidekiq
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v15.1.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v15.2.2"
env:
- name: prometheus_multiproc_dir
value: /metrics
@@ -21444,6 +21499,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
readOnly: true
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: true
livenessProbe:
httpGet:
path: /liveness
@@ -21563,6 +21621,9 @@
- name: etc-ssl-certs
emptyDir:
medium: "Memory"
+ - name: etc-pki-ca-trust-extracted-pem
+ emptyDir:
+ medium: "Memory"
---
# Source: gitlab/charts/gitlab/charts/toolbox/templates/deployment.yaml
apiVersion: apps/v1
@@ -21572,7 +21633,7 @@
namespace: gitlab
labels:
app: toolbox
- chart: toolbox-6.1.2
+ chart: toolbox-6.2.2
release: gitlab-test
heritage: Helm
@@ -21591,13 +21652,13 @@
metadata:
labels:
app: toolbox
- chart: toolbox-6.1.2
+ chart: toolbox-6.2.2
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: f2c9d347d70bd74fc79710453e6f26041b3b1f40bf37bd8971f52ffd646b61e3
+ checksum/config: 411e3bfbf21cce5999218a7fa2530eabd4e8e64aef640fb8fdfebc93cbfa8513
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
securityContext:
@@ -21615,6 +21676,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs
readOnly: false
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: false
resources:
requests:
cpu: 50m
@@ -21657,7 +21721,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.1.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v15.2.2"
env:
- name: ARTIFACTS_BUCKET_NAME
value: gitlab-artifacts
@@ -21714,6 +21778,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
readOnly: true
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: true
resources:
requests:
cpu: 50m
@@ -21824,6 +21891,9 @@
- name: etc-ssl-certs
emptyDir:
medium: "Memory"
+ - name: etc-pki-ca-trust-extracted-pem
+ emptyDir:
+ medium: "Memory"
---
# Source: gitlab/charts/gitlab/charts/webservice/templates/deployment.yaml
apiVersion: apps/v1
@@ -21833,7 +21903,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-6.1.2
+ chart: webservice-6.2.2
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -21854,7 +21924,7 @@
metadata:
labels:
app: webservice
- chart: webservice-6.1.2
+ chart: webservice-6.2.2
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -21862,7 +21932,7 @@
annotations:
- checksum/config: 8149889df12b853c50e1fdea9e85435ef6727dba172337f501ed52b64a21b6ef
+ checksum/config: 783020003ef665e746822eb08eb5c45023030a7ee83ff1c2fbd10158ecf1fcb8
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
@@ -21901,6 +21971,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs
readOnly: false
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: false
resources:
requests:
cpu: 50m
@@ -21937,7 +22010,7 @@
requests:
cpu: 50m
- name: dependencies
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.1.2
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.2.2
args:
- /scripts/wait-for-deps
env:
@@ -21958,6 +22031,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
readOnly: true
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: true
- name: webservice-config
mountPath: '/var/opt/gitlab/templates'
- name: webservice-secrets
@@ -21973,7 +22049,7 @@
containers:
- name: webservice
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.1.2
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.2.2
ports:
- containerPort: 8080
name: http-webservice
@@ -22041,6 +22117,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
readOnly: true
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: true
livenessProbe:
httpGet:
@@ -22069,7 +22148,7 @@
cpu: 300m
memory: 2.5G
- name: gitlab-workhorse
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v15.1.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v15.2.2"
ports:
- containerPort: 8181
name: http-workhorse
@@ -22106,6 +22185,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
readOnly: true
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: true
livenessProbe:
exec:
@@ -22241,6 +22323,9 @@
- name: etc-ssl-certs
emptyDir:
medium: "Memory"
+ - name: etc-pki-ca-trust-extracted-pem
+ emptyDir:
+ medium: "Memory"
---
# Source: gitlab/charts/minio/templates/minio_deployment.yaml
apiVersion: apps/v1
@@ -22668,7 +22753,7 @@
annotations:
- checksum/configmap: 0de8fb4967c100c95ab01d3916dc9454d5779717aec97e6786249b3941641576
+ checksum/configmap: bb3658717fc35640ae7e4ffeaf37e3c0641f1e3937dc4aeab906528e50d09829
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
@@ -22696,6 +22781,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs
readOnly: false
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: false
resources:
requests:
cpu: 50m
@@ -22715,7 +22803,7 @@
containers:
- name: registry
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.48.0-gitlab"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.51.1-gitlab"
env:
@@ -22726,6 +22814,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
readOnly: true
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: true
ports:
- containerPort: 5000
name: http
@@ -22786,6 +22877,9 @@
- name: etc-ssl-certs
emptyDir:
medium: "Memory"
+ - name: etc-pki-ca-trust-extracted-pem
+ emptyDir:
+ medium: "Memory"
---
# Source: gitlab/charts/gitlab/charts/gitlab-shell/templates/hpa.yaml
apiVersion: autoscaling/v2beta1
@@ -22795,7 +22889,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-6.1.2
+ chart: gitlab-shell-6.2.2
release: gitlab-test
heritage: Helm
@@ -22807,10 +22901,10 @@
minReplicas: 2
maxReplicas: 10
metrics:
- - type: Resource
- resource:
- name: cpu
- targetAverageValue: 100m
+ - type: Resource
+ resource:
+ name: cpu
+ targetAverageValue: 100m
---
# Source: gitlab/charts/gitlab/charts/kas/templates/hpa.yaml
apiVersion: autoscaling/v2beta1
@@ -22820,7 +22914,7 @@
namespace: gitlab
labels:
app: kas
- chart: kas-6.1.2
+ chart: kas-6.2.2
release: gitlab-test
heritage: Helm
@@ -22832,10 +22926,10 @@
minReplicas: 2
maxReplicas: 10
metrics:
- - type: Resource
- resource:
- name: cpu
- targetAverageValue: 100m
+ - type: Resource
+ resource:
+ name: cpu
+ targetAverageValue: 100m
---
# Source: gitlab/charts/gitlab/charts/sidekiq/templates/hpa.yaml
apiVersion: autoscaling/v2beta1
@@ -22845,7 +22939,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-6.1.2
+ chart: sidekiq-6.2.2
release: gitlab-test
heritage: Helm
@@ -22857,10 +22951,10 @@
minReplicas: 1
maxReplicas: 10
metrics:
- - type: Resource
- resource:
- name: cpu
- targetAverageValue: 350m
+ - type: Resource
+ resource:
+ name: cpu
+ targetAverageValue: 350m
---
# Source: gitlab/charts/gitlab/charts/webservice/templates/hpa.yaml
apiVersion: autoscaling/v2beta1
@@ -22870,7 +22964,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-6.1.2
+ chart: webservice-6.2.2
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -22883,10 +22977,10 @@
minReplicas: 8
maxReplicas: 8
metrics:
- - type: Resource
- resource:
- name: cpu
- targetAverageValue: 1
+ - type: Resource
+ resource:
+ name: cpu
+ targetAverageValue: 1
---
# Source: gitlab/charts/registry/templates/hpa.yaml
apiVersion: autoscaling/v2beta1
@@ -22921,7 +23015,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-6.1.2
+ chart: gitaly-6.2.2
release: gitlab-test
heritage: Helm
@@ -22941,13 +23035,13 @@
labels:
storage: default
app: gitaly
- chart: gitaly-6.1.2
+ chart: gitaly-6.2.2
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: af6c91c8ac1f1a48b9d414ba59974b00dde00021de0cfa06e866120cb26371f0
+ checksum/config: 1d41d2bc29c8e71531664a345a0dd81bec75067b115f962b90d5a7558afd4863
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
gitlab.com/prometheus_scrape: "true"
@@ -22969,6 +23063,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs
readOnly: false
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: false
resources:
requests:
cpu: 50m
@@ -23011,7 +23108,7 @@
containers:
- name: gitaly
- image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v15.1.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v15.2.2"
ports:
- containerPort: 8075
name: grpc-gitaly
@@ -23034,6 +23131,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
readOnly: true
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: true
- name: gitaly-config
mountPath: '/etc/gitaly/templates'
- name: gitaly-secrets
@@ -23085,6 +23185,9 @@
- name: etc-ssl-certs
emptyDir:
medium: "Memory"
+ - name: etc-pki-ca-trust-extracted-pem
+ emptyDir:
+ medium: "Memory"
@@ -23113,7 +23216,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-6.1.2
+ chart: praefect-6.2.2
release: gitlab-test
heritage: Helm
@@ -23130,13 +23233,13 @@
metadata:
labels:
app: praefect
- chart: praefect-6.1.2
+ chart: praefect-6.2.2
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 840b84f59a210a016fd3717250a9d6732ade747a296d672971a322d801ebf0e8
+ checksum/config: 87f43509f7c10f8af3959d79522edbe44bf88170a06ded4e060c22dc80eec16c
gitlab.com/prometheus_scrape: "true"
gitlab.com/prometheus_port: "9236"
gitlab.com/prometheus_path: /metrics
@@ -23167,6 +23270,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs
readOnly: false
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: false
resources:
{}
- name: configure
@@ -23194,7 +23300,7 @@
containers:
- name: praefect
- image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v15.1.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v15.2.2"
ports:
- containerPort: 8075
- containerPort: 9236
@@ -23228,6 +23334,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
readOnly: true
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: true
- name: praefect-secrets
mountPath: /etc/gitlab-secrets
readOnly: true
@@ -23267,6 +23376,9 @@
- name: etc-ssl-certs
emptyDir:
medium: "Memory"
+ - name: etc-pki-ca-trust-extracted-pem
+ emptyDir:
+ medium: "Memory"
---
# Source: gitlab/charts/postgresql/templates/statefulset.yaml
apiVersion: apps/v1
@@ -23632,7 +23744,7 @@
namespace: gitlab
labels:
app: migrations
- chart: migrations-6.1.2
+ chart: migrations-6.2.2
release: gitlab-test
heritage: Helm
@@ -23643,7 +23755,7 @@
metadata:
labels:
app: migrations
- chart: migrations-6.1.2
+ chart: migrations-6.2.2
release: gitlab-test
heritage: Helm
@@ -23664,6 +23776,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs
readOnly: false
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: false
resources:
requests:
cpu: 50m
@@ -23693,7 +23808,7 @@
containers:
- name: migrations
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v15.1.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v15.2.2"
args:
- /scripts/wait-for-deps
- /scripts/db-migrate
@@ -23727,6 +23842,9 @@
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
readOnly: true
+ - name: etc-pki-ca-trust-extracted-pem
+ mountPath: /etc/pki/ca-trust/extracted/pem
+ readOnly: true
resources:
requests:
cpu: 250m
@@ -23787,6 +23905,9 @@
- name: etc-ssl-certs
emptyDir:
medium: "Memory"
+ - name: etc-pki-ca-trust-extracted-pem
+ emptyDir:
+ medium: "Memory"
---
# Source: gitlab/charts/minio/templates/create-buckets-job.yaml
apiVersion: batch/v1
@@ -23849,7 +23970,7 @@
namespace: gitlab
labels:
app: kas
- chart: kas-6.1.2
+ chart: kas-6.2.2
release: gitlab-test
heritage: Helm
@@ -23886,7 +24007,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-6.1.2
+ chart: webservice-6.2.2
release: gitlab-test
heritage: Helm
gitlab.com/webservice-name: default
@@ -24147,7 +24268,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-6.1.2
+ chart: gitlab-6.2.2
release: gitlab-test
heritage: Helm
@@ -24164,7 +24285,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-6.1.2
+ chart: gitlab-6.2.2
release: gitlab-test
heritage: Helm
@@ -24204,7 +24325,7 @@
kubectl --namespace=$namespace label \
--overwrite \
- secret $secret_name app=gitlab chart=gitlab-6.1.2 release=gitlab-test heritage=Helm
+ secret $secret_name app=gitlab chart=gitlab-6.2.2 release=gitlab-test heritage=Helm
}
# Args: secretname, args
@@ -24370,7 +24491,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-6.1.2
+ chart: gitlab-6.2.2
release: gitlab-test
heritage: Helm
@@ -24489,7 +24610,7 @@
namespace: gitlab
labels:
app: shared-secrets
- chart: shared-secrets-6.1.2
+ chart: shared-secrets-6.2.2
release: gitlab-test
heritage: Helm
@@ -24537,7 +24658,7 @@
namespace: gitlab
labels:
app: shared-secrets
- chart: shared-secrets-6.1.2
+ chart: shared-secrets-6.2.2
release: gitlab-test
heritage: Helm
@@ -24558,7 +24679,7 @@
apiVersion: v1
kind: Pod
metadata:
- name: gitlab-test-webservice-test-runner-uzzq1
+ name: gitlab-test-webservice-test-runner-gbhs2
namespace: gitlab
annotations:
"helm.sh/hook": test
@@ -24566,7 +24687,7 @@
spec:
containers:
- name: test-runner
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.1.2
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.2.2
command: ['sh', '/tests/test_login']
volumeMounts:
- name: tests
@@ -24637,11 +24758,11 @@
apiVersion: batch/v1
kind: Job
metadata:
- name: gitlab-test-shared-secrets-1-1ym
+ name: gitlab-test-shared-secrets-1-hem
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-6.1.2
+ chart: gitlab-6.2.2
release: gitlab-test
heritage: Helm
@@ -24653,7 +24774,7 @@
metadata:
labels:
app: gitlab
- chart: gitlab-6.1.2
+ chart: gitlab-6.2.2
release: gitlab-test
heritage: Helm
@@ -24694,7 +24815,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-6.1.2
+ chart: gitlab-6.2.2
release: gitlab-test
heritage: Helm
@@ -24723,9 +24844,9 @@
command: ['/bin/sh', '/scripts/runcheck']
env:
- name: GITLAB_VERSION
- value: '15.1.2'
+ value: '15.2.2'
- name: CHART_VERSION
- value: '6.1.2'
+ value: '6.2.2'
volumeMounts:
- name: chart-info
mountPath: /chart-info