WIP: A new version of gitlab (13.12.0) is available
current diff:
--- current-deployment.yaml
+++ future-deployment.yaml
@@ -7,7 +7,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-4.11.2
+ chart: gitaly-4.12.0
release: gitlab-test
heritage: Helm
@@ -28,7 +28,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-4.11.2
+ chart: gitlab-shell-4.12.0
release: gitlab-test
heritage: Helm
@@ -47,7 +47,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-4.11.2
+ chart: praefect-4.12.0
release: gitlab-test
heritage: Helm
@@ -66,7 +66,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-4.11.2
+ chart: sidekiq-4.12.0
release: gitlab-test
heritage: Helm
@@ -86,7 +86,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-4.11.2
+ chart: webservice-4.12.0
release: gitlab-test
heritage: Helm
@@ -153,7 +153,7 @@
namespace: gitlab
labels:
app: registry
- chart: registry-0.5.0
+ chart: registry-0.6.0
release: gitlab-test
heritage: Helm
@@ -240,7 +240,7 @@
app.kubernetes.io/component: default-backend
name: gitlab-test-nginx-ingress-backend
---
-# Source: gitlab/charts/prometheus/templates/node-exporter-serviceaccount.yaml
+# Source: gitlab/charts/prometheus/templates/node-exporter/serviceaccount.yaml
apiVersion: v1
kind: ServiceAccount
metadata:
@@ -248,11 +248,14 @@
component: "node-exporter"
app: prometheus
release: gitlab-test
- chart: prometheus-10.0.0
+ chart: prometheus-11.16.9
heritage: Helm
name: gitlab-test-prometheus-node-exporter
+ namespace: gitlab
+ annotations:
+ {}
---
-# Source: gitlab/charts/prometheus/templates/server-serviceaccount.yaml
+# Source: gitlab/charts/prometheus/templates/server/serviceaccount.yaml
apiVersion: v1
kind: ServiceAccount
metadata:
@@ -260,9 +263,12 @@
component: "server"
app: prometheus
release: gitlab-test
- chart: prometheus-10.0.0
+ chart: prometheus-11.16.9
heritage: Helm
name: gitlab-test-prometheus-server
+ namespace: gitlab
+ annotations:
+ {}
---
# Source: gitlab/charts/certmanager-issuer/templates/cert-manager.yml
apiVersion: v1
@@ -326,7 +332,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-4.11.2
+ chart: gitaly-4.12.0
release: gitlab-test
heritage: Helm
@@ -404,7 +410,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-4.11.2
+ chart: gitlab-exporter-4.12.0
release: gitlab-test
heritage: Helm
@@ -494,7 +500,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-4.11.2
+ chart: gitlab-shell-4.12.0
release: gitlab-test
heritage: Helm
@@ -654,7 +660,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-4.11.2
+ chart: gitlab-shell-4.12.0
release: gitlab-test
heritage: Helm
@@ -714,7 +720,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-4.11.2
+ chart: gitlab-shell-4.12.0
release: gitlab-test
heritage: Helm
@@ -729,7 +735,7 @@
namespace: gitlab
labels:
app: migrations
- chart: migrations-4.11.2
+ chart: migrations-4.12.0
release: gitlab-test
heritage: Helm
@@ -784,6 +790,8 @@
gitaly_address: tcp://gitlab-test-gitlab:8075
+ sidekiq:
+
configure: |
set -e
config_dir="/init-config"
@@ -812,7 +820,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-4.11.2
+ chart: praefect-4.12.0
release: gitlab-test
heritage: Helm
@@ -874,7 +882,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-4.11.2
+ chart: praefect-4.12.0
release: gitlab-test
heritage: Helm
@@ -895,7 +903,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-4.11.2
+ chart: sidekiq-4.12.0
release: gitlab-test
heritage: Helm
@@ -918,7 +926,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-4.11.2
+ chart: sidekiq-4.12.0
release: gitlab-test
heritage: Helm
@@ -1082,6 +1090,8 @@
dsn:
clientside_dsn:
environment:
+
+ sidekiq:
pages:
enabled: true
access_control: false
@@ -1113,7 +1123,7 @@
api_url: http://gitlab-test-registry.gitlab.svc:5000
key: /etc/gitlab/registry/gitlab-registry.key
issuer: gitlab-issuer
-
+ notification_secret: <%= YAML.load_file("/etc/gitlab/registry/notificationSecret").flatten.first %>
gitlab_ci:
ldap:
enabled: false
@@ -1193,7 +1203,7 @@
namespace: gitlab
labels:
app: task-runner
- chart: task-runner-4.11.2
+ chart: task-runner-4.12.0
release: gitlab-test
heritage: Helm
@@ -1343,6 +1353,8 @@
endpoint: http://gitlab-test-minio-svc.gitlab.svc:9000
path_style: true
+ sidekiq:
+
pages:
enabled: true
access_control: false
@@ -1374,7 +1386,7 @@
api_url: http://gitlab-test-registry.gitlab.svc:5000
key: /etc/gitlab/registry/gitlab-registry.key
issuer: gitlab-issuer
-
+ notification_secret: <%= YAML.load_file("/etc/gitlab/registry/notificationSecret").flatten.first %>
gitlab_ci:
ldap:
enabled: false
@@ -1458,7 +1470,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-4.11.2
+ chart: webservice-4.12.0
release: gitlab-test
heritage: Helm
@@ -1610,6 +1622,8 @@
dsn:
clientside_dsn:
environment:
+
+ sidekiq:
pages:
enabled: true
access_control: false
@@ -1698,7 +1712,7 @@
api_url: http://gitlab-test-registry.gitlab.svc:5000
key: /etc/gitlab/registry/gitlab-registry.key
issuer: omnibus-gitlab-issuer
-
+ notification_secret: <%= YAML.load_file("/etc/gitlab/registry/notificationSecret").flatten.first %>
smartcard:
enabled: false
ca_file: '/etc/gitlab/rails-secrets/smartcard-ca.crt'
@@ -1726,11 +1740,11 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: gitlab-test-workhorse-config
+ name: gitlab-test-workhorse-default
namespace: gitlab
labels:
app: webservice
- chart: webservice-4.11.2
+ chart: webservice-4.12.0
release: gitlab-test
heritage: Helm
data:
@@ -2128,7 +2142,7 @@
override.conf: |
max_connections=300
---
-# Source: gitlab/charts/prometheus/templates/server-configmap.yaml
+# Source: gitlab/charts/prometheus/templates/server/cm.yaml
apiVersion: v1
kind: ConfigMap
metadata:
@@ -2136,9 +2150,10 @@
component: "server"
app: prometheus
release: gitlab-test
- chart: prometheus-10.0.0
+ chart: prometheus-11.16.9
heritage: Helm
name: gitlab-test-prometheus-server
+ namespace: gitlab
data:
alerting_rules.yml: |
{}
@@ -2438,7 +2453,7 @@
namespace: gitlab
labels:
app: registry
- chart: registry-0.5.0
+ chart: registry-0.6.0
release: gitlab-test
heritage: Helm
@@ -2574,12 +2589,12 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-4.11.2
+ chart: gitlab-4.12.0
release: gitlab-test
heritage: Helm
data:
- gitlabVersion: "13.11.2"
- gitlabChartVersion: "4.11.2"
+ gitlabVersion: "13.12.0"
+ gitlabChartVersion: "4.12.0"
---
# Source: gitlab/templates/initdb-configmap.yaml
apiVersion: v1
@@ -2589,7 +2604,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-4.11.2
+ chart: gitlab-4.12.0
release: gitlab-test
heritage: Helm
data:
@@ -2623,7 +2638,7 @@
storageClassName: "rook-ceph-block"
selector:
---
-# Source: gitlab/charts/prometheus/templates/server-pvc.yaml
+# Source: gitlab/charts/prometheus/templates/server/pvc.yaml
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
@@ -2631,9 +2646,10 @@
component: "server"
app: prometheus
release: gitlab-test
- chart: prometheus-10.0.0
+ chart: prometheus-11.16.9
heritage: Helm
name: gitlab-test-prometheus-server
+ namespace: gitlab
spec:
accessModes:
- ReadWriteOnce
@@ -10428,15 +10444,15 @@
resources: ["certificates", "certificaterequests", "issuers"]
verbs: ["create", "delete", "deletecollection", "patch", "update"]
---
-# Source: gitlab/charts/prometheus/templates/server-clusterrole.yaml
-apiVersion: rbac.authorization.k8s.io/v1beta1
+# Source: gitlab/charts/prometheus/templates/server/clusterrole.yaml
+apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
component: "server"
app: prometheus
release: gitlab-test
- chart: prometheus-10.0.0
+ chart: prometheus-11.16.9
heritage: Helm
name: gitlab-test-prometheus-server
rules:
@@ -10457,6 +10473,7 @@
- watch
- apiGroups:
- "extensions"
+ - "networking.k8s.io"
resources:
- ingresses/status
- ingresses
@@ -10629,15 +10646,15 @@
namespace: "gitlab"
kind: ServiceAccount
---
-# Source: gitlab/charts/prometheus/templates/server-clusterrolebinding.yaml
-apiVersion: rbac.authorization.k8s.io/v1beta1
+# Source: gitlab/charts/prometheus/templates/server/clusterrolebinding.yaml
+apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
component: "server"
app: prometheus
release: gitlab-test
- chart: prometheus-10.0.0
+ chart: prometheus-11.16.9
heritage: Helm
name: gitlab-test-prometheus-server
subjects:
@@ -10835,7 +10852,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-4.11.2
+ chart: gitaly-4.12.0
release: gitlab-test
heritage: Helm
@@ -10863,7 +10880,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-4.11.2
+ chart: gitlab-exporter-4.12.0
release: gitlab-test
heritage: Helm
@@ -10889,7 +10906,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-4.11.2
+ chart: gitlab-shell-4.12.0
release: gitlab-test
heritage: Helm
@@ -10915,7 +10932,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-4.11.2
+ chart: praefect-4.12.0
release: gitlab-test
heritage: Helm
@@ -10950,7 +10967,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-4.11.2
+ chart: webservice-4.12.0
release: gitlab-test
heritage: Helm
@@ -11169,7 +11186,7 @@
release: "gitlab-test"
role: master
---
-# Source: gitlab/charts/prometheus/templates/node-exporter-service.yaml
+# Source: gitlab/charts/prometheus/templates/node-exporter/svc.yaml
apiVersion: v1
kind: Service
metadata:
@@ -11179,9 +11196,10 @@
component: "node-exporter"
app: prometheus
release: gitlab-test
- chart: prometheus-10.0.0
+ chart: prometheus-11.16.9
heritage: Helm
name: gitlab-test-prometheus-node-exporter
+ namespace: gitlab
spec:
clusterIP: None
ports:
@@ -11195,7 +11213,7 @@
release: gitlab-test
type: "ClusterIP"
---
-# Source: gitlab/charts/prometheus/templates/server-service.yaml
+# Source: gitlab/charts/prometheus/templates/server/service.yaml
apiVersion: v1
kind: Service
metadata:
@@ -11203,9 +11221,10 @@
component: "server"
app: prometheus
release: gitlab-test
- chart: prometheus-10.0.0
+ chart: prometheus-11.16.9
heritage: Helm
name: gitlab-test-prometheus-server
+ namespace: gitlab
spec:
ports:
- name: http
@@ -11294,7 +11313,7 @@
namespace: gitlab
labels:
app: registry
- chart: registry-0.5.0
+ chart: registry-0.6.0
release: gitlab-test
heritage: Helm
@@ -11312,7 +11331,7 @@
app: registry
release: gitlab-test
---
-# Source: gitlab/charts/prometheus/templates/node-exporter-daemonset.yaml
+# Source: gitlab/charts/prometheus/templates/node-exporter/daemonset.yaml
apiVersion: apps/v1
kind: DaemonSet
metadata:
@@ -11320,9 +11339,10 @@
component: "node-exporter"
app: prometheus
release: gitlab-test
- chart: prometheus-10.0.0
+ chart: prometheus-11.16.9
heritage: Helm
name: gitlab-test-prometheus-node-exporter
+ namespace: gitlab
spec:
selector:
matchLabels:
@@ -11337,17 +11357,18 @@
component: "node-exporter"
app: prometheus
release: gitlab-test
- chart: prometheus-10.0.0
+ chart: prometheus-11.16.9
heritage: Helm
spec:
serviceAccountName: gitlab-test-prometheus-node-exporter
containers:
- name: prometheus-node-exporter
- image: "prom/node-exporter:v0.18.1"
+ image: "prom/node-exporter:v1.0.1"
imagePullPolicy: "IfNotPresent"
args:
- --path.procfs=/host/proc
- --path.sysfs=/host/sys
+ - --web.listen-address=:9100
ports:
- name: metrics
containerPort: 9100
@@ -11481,7 +11502,7 @@
namespace: gitlab
labels:
app: gitlab-exporter
- chart: gitlab-exporter-4.11.2
+ chart: gitlab-exporter-4.12.0
release: gitlab-test
heritage: Helm
@@ -11499,13 +11520,13 @@
app: gitlab-exporter
release: gitlab-test
app: gitlab-exporter
- chart: gitlab-exporter-4.11.2
+ chart: gitlab-exporter-4.12.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: e121d3e65d64b49a02c57eb6ef4f88f83e8befcd3264aad8c1914a436f1bc09a
+ checksum/config: 98f8fb8b7ea25ff6fd614b2ba5762e10349aaf63e1bbd4de7627732cadb07772
gitlab.com/prometheus_path: /metrics
gitlab.com/prometheus_port: "9168"
gitlab.com/prometheus_scrape: "true"
@@ -11668,7 +11689,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-4.11.2
+ chart: gitlab-shell-4.12.0
release: gitlab-test
heritage: Helm
@@ -11683,14 +11704,14 @@
metadata:
labels:
app: gitlab-shell
- chart: gitlab-shell-4.11.2
+ chart: gitlab-shell-4.12.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: bd024c6ed3210409769899a0d5355cc30e5251b735ef2ccae860935d1b2d6851
- checksum/config-sshd: bd05bcd459350b8d902832f004509921ed104d1863ed46c6aede5579a6ac22a7
+ checksum/config: bea54a4d2f053a9cb170190edccb3d19c619e4542dbfe011bf29090a850b5fef
+ checksum/config-sshd: 643e329610d0224bbb10e556894e4857324a9709e6ddaf6fdcb40c997f12a034
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
initContainers:
@@ -11743,7 +11764,7 @@
containers:
- name: gitlab-shell
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v13.17.0"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v13.18.0"
ports:
- containerPort: 2222
@@ -11829,7 +11850,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-4.11.2
+ chart: sidekiq-4.12.0
release: gitlab-test
heritage: Helm
@@ -11846,16 +11867,16 @@
metadata:
labels:
app: sidekiq
- chart: sidekiq-4.11.2
+ chart: sidekiq-4.12.0
release: gitlab-test
heritage: Helm
queue-pod-name: native-chart
annotations:
- checksum/configmap: 6a8b3a534d8c5d9eac79a972c70711e9ac04fd29e23a98754f88281b322d6444
+ checksum/configmap: fb45261112688e08823a8b8c678bab90b0da5ab5ce9bf0d1a8b57fdca499a364
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
- checksum/configmap-pod: 6f54c7e669f0cbf2ebd04a8456c845824805a5b39ec2743fb51ae068b9262d68
+ checksum/configmap-pod: b28ba16a1f089643feec475efc6df701d0ba3dcadb9f06c9821881f06fb3964d
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
gitlab.com/prometheus_port: "3807"
@@ -11915,7 +11936,7 @@
requests:
cpu: 50m
- name: dependencies
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v13.11.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v13.12.0"
args:
- /scripts/wait-for-deps
@@ -11952,7 +11973,7 @@
containers:
- name: sidekiq
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v13.11.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v13.12.0"
env:
- name: prometheus_multiproc_dir
@@ -12095,8 +12116,12 @@
items:
- key: registry-auth.key
path: registry/gitlab-registry.key
+ - secret:
+ name: "gitlab-test-registry-notification"
+ items:
+ - key: "secret"
+ path: registry/notificationSecret
-
- secret:
name: "gitlab-test-gitlab-pages-secret"
items:
@@ -12139,7 +12164,7 @@
namespace: gitlab
labels:
app: task-runner
- chart: task-runner-4.11.2
+ chart: task-runner-4.12.0
release: gitlab-test
heritage: Helm
@@ -12147,24 +12172,23 @@
spec:
replicas: 1
- strategy:
- rollingUpdate: null
- type: Recreate
selector:
matchLabels:
app: task-runner
release: gitlab-test
+ strategy:
+ type: Recreate
template:
metadata:
labels:
app: task-runner
- chart: task-runner-4.11.2
+ chart: task-runner-4.12.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 2215f5a1e22fd6eb42cbb2b7c30a52804559d4a414f77a51e844fd3f6f29fa53
+ checksum/config: d8dd5fb63a4bb2005158f9c0e71b04c9d34f57ad1786a8a2b8a41e34e28cd61c
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
securityContext:
@@ -12223,7 +12247,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:v13.11.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-task-runner-ce:v13.12.0"
env:
- name: ARTIFACTS_BUCKET_NAME
@@ -12332,8 +12356,12 @@
items:
- key: registry-auth.key
path: registry/gitlab-registry.key
-
- secret:
+ name: "gitlab-test-registry-notification"
+ items:
+ - key: "secret"
+ path: registry/notificationSecret
+ - secret:
name: gitlab-test-freedesktop-backup-gcs-key
items:
- key: connection
@@ -12386,7 +12414,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-4.11.2
+ chart: webservice-4.12.0
release: gitlab-test
heritage: Helm
@@ -12406,7 +12434,7 @@
metadata:
labels:
app: webservice
- chart: webservice-4.11.2
+ chart: webservice-4.12.0
release: gitlab-test
heritage: Helm
@@ -12415,7 +12443,7 @@
annotations:
- checksum/config: a3e5ce052cd2ca70a3564c6e4cd1ce10e6e00a7e854c5749acb5bf6653ad9b21
+ checksum/config: f728a9f71551df0ca8b3bf1df9d346c412f13df40d8f56298d1e41ba56d721af
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
@@ -12488,7 +12516,7 @@
requests:
cpu: 50m
- name: dependencies
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v13.11.2
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v13.12.0
args:
- /scripts/wait-for-deps
@@ -12521,7 +12549,7 @@
containers:
- name: webservice
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v13.11.2
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v13.12.0
ports:
- containerPort: 8080
@@ -12617,7 +12645,7 @@
cpu: 300m
memory: 2.5G
- name: gitlab-workhorse
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v13.11.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v13.12.0"
ports:
- containerPort: 8181
@@ -12689,7 +12717,7 @@
name: gitlab-test-webservice
- name: workhorse-config
configMap:
- name: gitlab-test-workhorse-config
+ name: gitlab-test-workhorse-default
- name: init-webservice-secrets
projected:
defaultMode: 0400
@@ -12732,6 +12760,11 @@
- key: registry-auth.key
path: registry/gitlab-registry.key
- secret:
+ name: "gitlab-test-registry-notification"
+ items:
+ - key: "secret"
+ path: registry/notificationSecret
+ - secret:
name: "gitlab-test-gitlab-workhorse-secret"
items:
- key: "shared_secret"
@@ -12789,15 +12822,13 @@
annotations:
spec:
- strategy:
- type: Recreate
- # The following entry allows updates without intervention, due to previous defaults.
- rollingUpdate: null
selector:
matchLabels:
app: minio
release: "gitlab-test"
component: app
+ strategy:
+ type: Recreate
template:
metadata:
name: gitlab-test-minio
@@ -13067,7 +13098,7 @@
serviceAccountName: gitlab-test-nginx-ingress-backend
terminationGracePeriodSeconds: 60
---
-# Source: gitlab/charts/prometheus/templates/server-deployment.yaml
+# Source: gitlab/charts/prometheus/templates/server/deploy.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
@@ -13075,9 +13106,10 @@
component: "server"
app: prometheus
release: gitlab-test
- chart: prometheus-10.0.0
+ chart: prometheus-11.16.9
heritage: Helm
name: gitlab-test-prometheus-server
+ namespace: gitlab
spec:
selector:
matchLabels:
@@ -13085,19 +13117,22 @@
app: prometheus
release: gitlab-test
replicas: 1
+ strategy:
+ type: Recreate
+ rollingUpdate: null
template:
metadata:
labels:
component: "server"
app: prometheus
release: gitlab-test
- chart: prometheus-10.0.0
+ chart: prometheus-11.16.9
heritage: Helm
spec:
serviceAccountName: gitlab-test-prometheus-server
containers:
- name: prometheus-server-configmap-reload
- image: "jimmidyson/configmap-reload:v0.3.0"
+ image: "jimmidyson/configmap-reload:v0.4.0"
imagePullPolicy: "IfNotPresent"
args:
- --volume-dir=/etc/config
@@ -13110,7 +13145,7 @@
readOnly: true
- name: prometheus-server
- image: "prom/prometheus:v2.15.2"
+ image: "prom/prometheus:v2.21.0"
imagePullPolicy: "IfNotPresent"
args:
- --storage.tsdb.retention.time=15d
@@ -13126,6 +13161,7 @@
path: /-/ready
port: 9090
initialDelaySeconds: 30
+ periodSeconds: 5
timeoutSeconds: 30
failureThreshold: 3
successThreshold: 1
@@ -13134,6 +13170,7 @@
path: /-/healthy
port: 9090
initialDelaySeconds: 30
+ periodSeconds: 15
timeoutSeconds: 30
failureThreshold: 3
successThreshold: 1
@@ -13169,7 +13206,7 @@
namespace: gitlab
labels:
app: registry
- chart: registry-0.5.0
+ chart: registry-0.6.0
release: gitlab-test
heritage: Helm
@@ -13185,13 +13222,13 @@
metadata:
labels:
app: registry
- chart: registry-0.5.0
+ chart: registry-0.6.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/configmap: 292e83faa885debe5e3a902534d9ba32b2e33f2d5d67dde4f36cecd3880c5d8c
+ checksum/configmap: db64095868c8ed874cfb578d26c0dfd0418a6d93d3f3eca23b206e8710893dc3
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
spec:
@@ -13238,7 +13275,7 @@
containers:
- name: registry
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.3.0-gitlab"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.4.1-gitlab"
imagePullPolicy: "IfNotPresent"
env:
@@ -13309,7 +13346,7 @@
namespace: gitlab
labels:
app: gitlab-shell
- chart: gitlab-shell-4.11.2
+ chart: gitlab-shell-4.12.0
release: gitlab-test
heritage: Helm
@@ -13334,7 +13371,7 @@
namespace: gitlab
labels:
app: sidekiq
- chart: sidekiq-4.11.2
+ chart: sidekiq-4.12.0
release: gitlab-test
heritage: Helm
@@ -13359,7 +13396,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-4.11.2
+ chart: webservice-4.12.0
release: gitlab-test
heritage: Helm
@@ -13386,7 +13423,7 @@
namespace: gitlab
labels:
app: registry
- chart: registry-0.5.0
+ chart: registry-0.6.0
release: gitlab-test
heritage: Helm
@@ -13411,7 +13448,7 @@
namespace: gitlab
labels:
app: gitaly
- chart: gitaly-4.11.2
+ chart: gitaly-4.12.0
release: gitlab-test
heritage: Helm
@@ -13435,13 +13472,13 @@
labels:
storage: default
app: gitaly
- chart: gitaly-4.11.2
+ chart: gitaly-4.12.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 116a1806c82c1409d5e743946a07d18b138981b7149a3e612d8d6d30bb004cee
+ checksum/config: 1eb3de18c7ad6ad76285190b0d0d4e64261c90d67d887785d5d02f9502d08d43
co.elastic.logs/json.add_error_key: "true"
co.elastic.logs/json.keys_under_root: "false"
gitlab.com/prometheus_scrape: "true"
@@ -13501,7 +13538,7 @@
containers:
- name: gitaly
- image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v13.11.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v13.12.0"
ports:
- containerPort: 8075
@@ -13603,7 +13640,7 @@
namespace: gitlab
labels:
app: praefect
- chart: praefect-4.11.2
+ chart: praefect-4.12.0
release: gitlab-test
heritage: Helm
@@ -13619,13 +13656,13 @@
metadata:
labels:
app: praefect
- chart: praefect-4.11.2
+ chart: praefect-4.12.0
release: gitlab-test
heritage: Helm
annotations:
- checksum/config: 0fef437377d94b7b9ee275c76b16ae360aec9e820a54ffee5904c7c3ce13dbfe
+ checksum/config: ac4f297e46fe659960b0c3090b2f468188e6bbbe8f72728a2c1e1721eef313b6
spec:
affinity:
podAntiAffinity:
@@ -13676,7 +13713,7 @@
containers:
- name: praefect
- image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v13.11.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v13.12.0"
ports:
- containerPort: 8075
@@ -14116,7 +14153,7 @@
namespace: gitlab
labels:
app: migrations
- chart: migrations-4.11.2
+ chart: migrations-4.12.0
release: gitlab-test
heritage: Helm
@@ -14127,7 +14164,7 @@
metadata:
labels:
app: migrations
- chart: migrations-4.11.2
+ chart: migrations-4.12.0
release: gitlab-test
heritage: Helm
@@ -14176,17 +14213,12 @@
containers:
- name: migrations
- image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-task-runner-ce:v13.11.2"
+ image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-task-runner-ce:v13.12.0"
args:
- /scripts/wait-for-deps
- /scripts/db-migrate
env:
- - name: GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN
- valueFrom:
- secretKeyRef:
- name: "gitlab-test-gitlab-runner-secret"
- key: runner-registration-token
- name: CONFIG_TEMPLATE_DIRECTORY
value: '/var/opt/gitlab/templates'
- name: CONFIG_DIRECTORY
@@ -14208,6 +14240,9 @@
- name: migrations-secrets
mountPath: /srv/gitlab/config/initial_root_password
subPath: migrations/initial_root_password
+ - name: migrations-secrets
+ mountPath: /srv/gitlab/config/gitlab_shared_runners_registration_token
+ subPath: migrations/gitlab_shared_runners_registration_token
- name: etc-ssl-certs
mountPath: /etc/ssl/certs/
@@ -14259,6 +14294,11 @@
items:
- key: "password"
path: migrations/initial_root_password
+ - secret:
+ name: "gitlab-test-gitlab-runner-secret"
+ items:
+ - key: runner-registration-token
+ path: migrations/gitlab_shared_runners_registration_token
- name: migrations-secrets
emptyDir:
medium: "Memory"
@@ -14321,7 +14361,7 @@
namespace: gitlab
labels:
app: webservice
- chart: webservice-4.11.2
+ chart: webservice-4.12.0
release: gitlab-test
heritage: Helm
@@ -14397,7 +14437,7 @@
namespace: gitlab
labels:
app: registry
- chart: registry-0.5.0
+ chart: registry-0.6.0
release: gitlab-test
heritage: Helm
@@ -14423,15 +14463,15 @@
- registry.test.freedesktop.org
secretName: gitlab-test-registry-tls
---
-# Source: gitlab/charts/shared-secrets/templates/rbac-config.yaml
+# Source: gitlab/templates/shared-secrets/rbac-config.yaml
apiVersion: v1
kind: ServiceAccount
metadata:
name: gitlab-test-shared-secrets
namespace: gitlab
labels:
- app: shared-secrets
- chart: shared-secrets-0.1.0
+ app: gitlab
+ chart: gitlab-4.12.0
release: gitlab-test
heritage: Helm
annotations:
@@ -14439,15 +14479,15 @@
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
---
-# Source: gitlab/charts/shared-secrets/templates/configmap.yaml
+# Source: gitlab/templates/shared-secrets/configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: gitlab-test-shared-secrets
namespace: gitlab
labels:
- app: shared-secrets
- chart: shared-secrets-0.1.0
+ app: gitlab
+ chart: gitlab-4.12.0
release: gitlab-test
heritage: Helm
annotations:
@@ -14456,6 +14496,8 @@
"helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
data:
generate-secrets: |
+ # vim: set filetype=sh:
+
namespace=gitlab
release=gitlab-test
env=production
@@ -14483,7 +14525,7 @@
kubectl --namespace=$namespace label \
--overwrite \
- secret $secret_name app=shared-secrets chart=shared-secrets-0.1.0 release=gitlab-test heritage=Helm
+ secret $secret_name app=gitlab chart=gitlab-4.12.0 release=gitlab-test heritage=Helm
}
# Args: secretname, args
@@ -14621,11 +14663,11 @@
generate_secret_if_needed "gitlab-test-registry-httpsecret" --from-literal="secret"=$(gen_random 'a-z0-9' 128 | base64 -w 0)
# Container Registry notification_secret
+ generate_secret_if_needed "gitlab-test-registry-notification" --from-literal="secret"=[\"$(gen_random 'a-zA-Z0-9' 32)\"]
-
# Praefect DB password
generate_secret_if_needed "gitlab-test-praefect-dbsecret" --from-literal="secret"=$(gen_random 'a-zA-Z0-9', 32)
@@ -14640,7 +14682,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-4.11.2
+ chart: gitlab-4.12.0
release: gitlab-test
heritage: Helm
annotations:
@@ -14726,7 +14768,7 @@
fi
fi
---
-# Source: gitlab/charts/shared-secrets/templates/rbac-config.yaml
+# Source: gitlab/templates/shared-secrets/rbac-config.yaml
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
@@ -14734,7 +14776,7 @@
namespace: gitlab
labels:
app: shared-secrets
- chart: shared-secrets-0.1.0
+ chart: shared-secrets-4.12.0
release: gitlab-test
heritage: Helm
annotations:
@@ -14746,7 +14788,7 @@
resources: ["secrets"]
verbs: ["get", "list", "create", "patch"]
---
-# Source: gitlab/charts/shared-secrets/templates/rbac-config.yaml
+# Source: gitlab/templates/shared-secrets/rbac-config.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
@@ -14754,7 +14796,7 @@
namespace: gitlab
labels:
app: shared-secrets
- chart: shared-secrets-0.1.0
+ chart: shared-secrets-4.12.0
release: gitlab-test
heritage: Helm
annotations:
@@ -14774,7 +14816,7 @@
apiVersion: v1
kind: Pod
metadata:
- name: gitlab-test-webservice-test-runner-w0rxt
+ name: gitlab-test-webservice-test-runner-jwlc4
namespace: gitlab
annotations:
"helm.sh/hook": test
@@ -14782,7 +14824,7 @@
spec:
containers:
- name: test-runner
- image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v13.11.2
+ image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v13.12.0
command: ['sh', '/tests/test_login']
volumeMounts:
- name: tests
@@ -14803,15 +14845,15 @@
path: initial_root_password
restartPolicy: Never
---
-# Source: gitlab/charts/shared-secrets/templates/job.yaml
+# Source: gitlab/templates/shared-secrets/job.yaml
apiVersion: batch/v1
kind: Job
metadata:
- name: gitlab-test-shared-secrets-1-p4w
+ name: gitlab-test-shared-secrets-1-3ou
namespace: gitlab
labels:
- app: shared-secrets
- chart: shared-secrets-0.1.0
+ app: gitlab
+ chart: gitlab-4.12.0
release: gitlab-test
heritage: Helm
annotations:
@@ -14821,7 +14863,7 @@
template:
metadata:
labels:
- app: shared-secrets
+ app: gitlab
release: gitlab-test
annotations:
@@ -14834,7 +14876,7 @@
restartPolicy: Never
containers:
- - name: shared-secrets
+ - name: gitlab
image: "registry.gitlab.com/gitlab-org/build/cng/kubectl:1.13.12"
command: ['/bin/bash', '/scripts/generate-secrets']
@@ -14861,7 +14903,7 @@
namespace: gitlab
labels:
app: gitlab
- chart: gitlab-4.11.2
+ chart: gitlab-4.12.0
release: gitlab-test
heritage: Helm
annotations:
@@ -14889,9 +14931,9 @@
env:
- name: GITLAB_VERSION
- value: '13.11.2'
+ value: '13.12.0'
- name: CHART_VERSION
- value: '4.11.2'
+ value: '4.12.0'
volumeMounts:
- name: chart-info
mountPath: /chart-info
@@ -15744,8 +15786,8 @@
heritage: Helm
type: Opaque
data:
- accesskey: "bWR0S081YlpuSVNUd3B3OVlHdTg="
- secretkey: "R3RYOFF5OUt3aDZkM0NXNE04ZUdmeFNqSVIwT1V4Z1dVWmI1SGw0TA=="
+ accesskey: "MG44N0Q2YWhiY1I2MDl1dUlSSnQ="
+ secretkey: "T2NsenREb2NzOTVBNlFnWDJXb0lkZmdlWlJhVDZvTTA1VFd3Rk9Fcw=="
---
# Source: minio/templates/configmap.yaml
apiVersion: v1
@@ -15973,7 +16015,7 @@
app: minio
release: minio-test
annotations:
- checksum/secrets: c723b8d074696ce9f1c05fde6fc6a25980cdf6af8ec642b674342c0d6a8e9527
+ checksum/secrets: f05d2c6b51a90299ac739ef7a9efcc5689a4e040e6dd838441af0612967d1316
checksum/config: 43756797396cd63bc1cd504b723a4833317439960019986f7bcfef5e150689dc
spec:
serviceAccountName: "minio-test"
@@ -16135,8 +16177,8 @@
heritage: Helm
type: Opaque
data:
- accesskey: "NHExN1BZYTFrQkRhbTY3WkFOQ1M="
- secretkey: "bkNaMXdLazlUUFdHTmZzUTlKVm45VkJEMUo1eVZISVRHRXNzZzhGeg=="
+ accesskey: "d0pvVklkQko1NTRnUFd3VU1jODU="
+ secretkey: "eHBmREtuNFROU2lCR2NZSjVaZlEyeGhnTW9YbGtLU0E5alQ1ejVlZQ=="
---
# Source: minio/templates/configmap.yaml
# Source: minio/templates/configmap.yaml
@@ -16374,7 +16416,7 @@
app: minio
release: minio-artifacts-test
annotations:
- checksum/secrets: 898629fcf9d9c99cb976a0824db448d062243c2ea801a88c61657a0ab34de42f
+ checksum/secrets: a4cc29e6bddeafb10dafbccafccde5a528f8eab4fca4e115ed59b093e070e79c
checksum/config: 47dd6a9ce3fced1f792866068373d24fd54dfb863bfcbb08c7a8b08fcaa38aaf
spec:
serviceAccountName: "minio-artifacts-test"