Skip to content

WIP: A new version of gitlab (15.0.1) is available

FDO helm bot requested to merge upgrade-to-15.0.1 into master

current diff:

--- current-deployment.yaml
+++ future-deployment.yaml
@@ -7,7 +7,7 @@
   namespace: gitlab
   labels:
     app: gitaly
-    chart: gitaly-5.10.2
+    chart: gitaly-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -28,7 +28,7 @@
   namespace: gitlab
   labels:
     app: gitlab-shell
-    chart: gitlab-shell-5.10.2
+    chart: gitlab-shell-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -39,6 +39,25 @@
       app: gitlab-shell
       release: gitlab-test
 ---
+# Source: gitlab/charts/gitlab/charts/kas/templates/pdb.yaml
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: gitlab-test-kas
+  namespace: gitlab
+  labels:
+    app: kas
+    chart: kas-6.0.1
+    release: gitlab-test
+    heritage: Helm
+    
+spec:
+  maxUnavailable: 1
+  selector:
+    matchLabels:
+      app: kas
+      release: gitlab-test
+---
 # Source: gitlab/charts/gitlab/charts/praefect/templates/pdb.yaml
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
@@ -47,7 +66,7 @@
   namespace: gitlab
   labels:
     app: praefect
-    chart: praefect-5.10.2
+    chart: praefect-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -66,7 +85,7 @@
   namespace: gitlab
   labels:
     app: sidekiq
-    chart: sidekiq-5.10.2
+    chart: sidekiq-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -87,7 +106,7 @@
   namespace: gitlab
   labels:
     app: webservice
-    chart: webservice-5.10.2
+    chart: webservice-6.0.1
     release: gitlab-test
     heritage: Helm
     gitlab.com/webservice-name: default
@@ -360,7 +379,7 @@
   namespace: gitlab
   labels:
     app: gitaly
-    chart: gitaly-5.10.2
+    chart: gitaly-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -403,6 +422,7 @@
     token = <%= File.read('/etc/gitlab-secrets/gitaly/gitaly_token').strip.to_json %>
 
     [git]
+    use_bundled_binaries = true
 
     [gitaly-ruby]
     # The directory where gitaly-ruby is installed
@@ -439,7 +459,7 @@
   namespace: gitlab
   labels:
     app: gitlab-exporter
-    chart: gitlab-exporter-5.10.2
+    chart: gitlab-exporter-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -529,7 +549,7 @@
   namespace: gitlab
   labels:
     app: gitlab-shell
-    chart: gitlab-shell-5.10.2
+    chart: gitlab-shell-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -689,7 +709,7 @@
   namespace: gitlab
   labels:
     app: gitlab-shell
-    chart: gitlab-shell-5.10.2
+    chart: gitlab-shell-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -749,13 +769,55 @@
   namespace: gitlab
   labels:
     app: gitlab-shell
-    chart: gitlab-shell-5.10.2
+    chart: gitlab-shell-6.0.1
     release: gitlab-test
     heritage: Helm
     
 data:
-  "22": "gitlab/gitlab-test-gitlab-shell:22"
+  "22": "gitlab/gitlab-test-gitlab-shell:22::"
 ---
+# Source: gitlab/charts/gitlab/charts/kas/templates/configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: gitlab-test-kas
+  namespace: gitlab
+  labels:
+    app: kas
+    chart: kas-6.0.1
+    release: gitlab-test
+    heritage: Helm
+    
+data:
+  # See https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/pkg/kascfg/config_example.yaml
+  config.yaml: |
+    agent:
+      kubernetes_api:
+        listen:
+          address: :8154
+        url_path_prefix: /k8s-proxy
+      listen:
+        address: :8150
+        websocket: true
+    api:
+      listen:
+        address: :8153
+        authentication_secret_file: /etc/kas/.gitlab_kas_secret
+    gitlab:
+      address: http://gitlab-test-webservice-default.gitlab.svc:8181
+      authentication_secret_file: /etc/kas/.gitlab_kas_secret
+    observability:
+      listen:
+        address: :8151
+    private_api:
+      listen:
+        address: :8155
+        authentication_secret_file: /etc/kas/.gitlab_kas_private_api_secret
+    redis:
+      password_file: /etc/kas/redis/redis-password
+      server:
+        address: gitlab-test-redis-master.gitlab.svc:6379
+---
 # Source: gitlab/charts/gitlab/charts/migrations/templates/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
@@ -764,7 +826,7 @@
   namespace: gitlab
   labels:
     app: migrations
-    chart: migrations-5.10.2
+    chart: migrations-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -860,7 +922,7 @@
   namespace: gitlab
   labels:
     app: praefect
-    chart: praefect-5.10.2
+    chart: praefect-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -924,7 +986,7 @@
   namespace: gitlab
   labels:
     app: sidekiq
-    chart: sidekiq-5.10.2
+    chart: sidekiq-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -1016,8 +1078,6 @@
         object_store:
           enabled: true
           remote_directory: gitlab-artifacts
-          direct_upload: true
-          background_upload: false
           proxy_download: true
           connection:
             provider: AWS
@@ -1032,16 +1092,12 @@
         object_store:
           enabled: false
           remote_directory: git-lfs
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       uploads:
         enabled: true
         object_store:
           enabled: true
           remote_directory: gitlab-uploads
-          direct_upload: true
-          background_upload: false
           proxy_download: true
           connection:
             provider: AWS
@@ -1056,8 +1112,6 @@
         object_store:
           enabled: false
           remote_directory: gitlab-packages
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       external_diffs:
         enabled: false
@@ -1065,45 +1119,25 @@
         object_store:
           enabled: false
           remote_directory: gitlab-mr-diffs
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       terraform_state:
         enabled: false
         object_store:
           enabled: false
           remote_directory: gitlab-terraform-state
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       ci_secure_files:
         enabled: false
         object_store:
           enabled: false
           remote_directory: gitlab-ci-secure-files
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       dependency_proxy:
         enabled: false
         object_store:
           enabled: false
           remote_directory: gitlab-dependency-proxy
-          direct_upload: true
-          background_upload: false
           proxy_download: true
-      pseudonymizer:
-        manifest: config/pseudonymizer.yml
-        upload:
-          remote_directory: gitlab-pseudo
-          connection:
-            provider: AWS
-            region: us-east-1
-            aws_access_key_id: <%= File.read('/etc/gitlab/minio/accesskey').strip.to_json %>
-            aws_secret_access_key: <%= File.read('/etc/gitlab/minio/secretkey').strip.to_json %>
-            host: minio.test.freedesktop.org
-            endpoint: http://gitlab-test-minio-svc.gitlab.svc:9000
-            path_style: true
       
       sentry:
         enabled: false
@@ -1180,7 +1214,11 @@
           
       backup:
         path: "tmp/backups"   # Relative paths are relative to Rails.root (default: tmp/backups/)
-      
+      gitlab_kas:
+        enabled: true
+        secret_file: /etc/gitlab/kas/.gitlab_kas_secret
+        external_url: "wss://kas.test.freedesktop.org"
+        internal_url: "grpc://gitlab-test-kas.gitlab.svc:8153"
       gitlab_shell:
         path: /home/git/gitlab-shell/
         hooks_path: /home/git/gitlab-shell/hooks/
@@ -1229,7 +1267,7 @@
   namespace: gitlab
   labels:
     app: toolbox
-    chart: toolbox-5.10.2
+    chart: toolbox-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -1309,8 +1347,6 @@
         object_store:
           enabled: true
           remote_directory: gitlab-artifacts
-          direct_upload: true
-          background_upload: false
           proxy_download: true
           connection:
             provider: AWS
@@ -1325,16 +1361,12 @@
         object_store:
           enabled: false
           remote_directory: git-lfs
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       uploads:
         enabled: true
         object_store:
           enabled: true
           remote_directory: gitlab-uploads
-          direct_upload: true
-          background_upload: false
           proxy_download: true
           connection:
             provider: AWS
@@ -1349,8 +1381,6 @@
         object_store:
           enabled: false
           remote_directory: gitlab-packages
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       external_diffs:
         enabled: false
@@ -1358,45 +1388,25 @@
         object_store:
           enabled: false
           remote_directory: gitlab-mr-diffs
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       terraform_state:
         enabled: false
         object_store:
           enabled: false
           remote_directory: gitlab-terraform-state
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       ci_secure_files:
         enabled: false
         object_store:
           enabled: false
           remote_directory: gitlab-ci-secure-files
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       dependency_proxy:
         enabled: false
         object_store:
           enabled: false
           remote_directory: gitlab-dependency-proxy
-          direct_upload: true
-          background_upload: false
           proxy_download: true
-      pseudonymizer:
-        manifest: config/pseudonymizer.yml
-        upload:
-          remote_directory: gitlab-pseudo
-          connection:
-            provider: AWS
-            region: us-east-1
-            aws_access_key_id: <%= File.read('/etc/gitlab/minio/accesskey').strip.to_json %>
-            aws_secret_access_key: <%= File.read('/etc/gitlab/minio/secretkey').strip.to_json %>
-            host: minio.test.freedesktop.org
-            endpoint: http://gitlab-test-minio-svc.gitlab.svc:9000
-            path_style: true
       
       sidekiq:
       
@@ -1467,7 +1477,11 @@
           
       backup:
         path: "tmp/backups"   # Relative paths are relative to Rails.root (default: tmp/backups/)
-      
+      gitlab_kas:
+        enabled: true
+        secret_file: /etc/gitlab/kas/.gitlab_kas_secret
+        external_url: "wss://kas.test.freedesktop.org"
+        internal_url: "grpc://gitlab-test-kas.gitlab.svc:8153"
       gitlab_shell:
         path: /home/git/gitlab-shell/
         hooks_path: /home/git/gitlab-shell/hooks/
@@ -1518,7 +1532,7 @@
   namespace: gitlab
   labels:
     app: webservice
-    chart: webservice-5.10.2
+    chart: webservice-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -1610,8 +1624,6 @@
         object_store:
           enabled: true
           remote_directory: gitlab-artifacts
-          direct_upload: true
-          background_upload: false
           proxy_download: true
           connection:
             provider: AWS
@@ -1626,16 +1638,12 @@
         object_store:
           enabled: false
           remote_directory: git-lfs
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       uploads:
         enabled: true
         object_store:
           enabled: true
           remote_directory: gitlab-uploads
-          direct_upload: true
-          background_upload: false
           proxy_download: true
           connection:
             provider: AWS
@@ -1650,8 +1658,6 @@
         object_store:
           enabled: false
           remote_directory: gitlab-packages
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       external_diffs:
         enabled: false
@@ -1659,32 +1665,24 @@
         object_store:
           enabled: false
           remote_directory: gitlab-mr-diffs
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       terraform_state:
         enabled: false
         object_store:
           enabled: false
           remote_directory: gitlab-terraform-state
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       ci_secure_files:
         enabled: false
         object_store:
           enabled: false
           remote_directory: gitlab-ci-secure-files
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       dependency_proxy:
         enabled: false
         object_store:
           enabled: false
           remote_directory: gitlab-dependency-proxy
-          direct_upload: true
-          background_upload: false
           proxy_download: true
       
       sentry:
@@ -1753,7 +1751,11 @@
           
       backup:
         path: "tmp/backups"   # Relative paths are relative to Rails.root (default: tmp/backups/)
-      
+      gitlab_kas:
+        enabled: true
+        secret_file: /etc/gitlab/kas/.gitlab_kas_secret
+        external_url: "wss://kas.test.freedesktop.org"
+        internal_url: "grpc://gitlab-test-kas.gitlab.svc:8153"
       gitlab_shell:
         path: /home/git/gitlab-shell/
         hooks_path: /home/git/gitlab-shell/hooks/
@@ -1817,7 +1819,7 @@
   namespace: gitlab
   labels:
     app: webservice
-    chart: webservice-5.10.2
+    chart: webservice-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -2006,7 +2008,6 @@
     createBucket gitlab-backups none false
     createBucket gitlab-packages none false
     createBucket tmp none false
-    createBucket gitlab-pseudo none false
     createBucket gitlab-mr-diffs none false
     createBucket gitlab-terraform-state none false
     createBucket gitlab-ci-secure-files none false
@@ -2196,7 +2197,7 @@
     
   server-tokens: "false"
     
-  ssl-ciphers: "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"
+  ssl-ciphers: "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"
     
   ssl-protocols: "TLSv1.3 TLSv1.2"
     
@@ -2687,13 +2688,13 @@
   namespace: gitlab
   labels:
     app: gitlab
-    chart: gitlab-5.10.2
+    chart: gitlab-6.0.1
     release: gitlab-test
     heritage: Helm
     
 data:
-  gitlabVersion: "14.10.2"
-  gitlabChartVersion: "5.10.2"
+  gitlabVersion: "15.0.1"
+  gitlabChartVersion: "6.0.1"
 ---
 # Source: gitlab/templates/initdb-configmap.yaml
 apiVersion: v1
@@ -2703,7 +2704,7 @@
   namespace: gitlab
   labels:
     app: gitlab
-    chart: gitlab-5.10.2
+    chart: gitlab-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -19960,7 +19961,7 @@
   namespace: gitlab
   labels:
     app: gitaly
-    chart: gitaly-5.10.2
+    chart: gitaly-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -19991,7 +19992,7 @@
   namespace: gitlab
   labels:
     app: gitlab-exporter
-    chart: gitlab-exporter-5.10.2
+    chart: gitlab-exporter-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -20017,7 +20018,7 @@
   namespace: gitlab
   labels:
     app: gitlab-shell
-    chart: gitlab-shell-5.10.2
+    chart: gitlab-shell-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -20035,6 +20036,44 @@
     app: gitlab-shell
     release: gitlab-test
 ---
+# Source: gitlab/charts/gitlab/charts/kas/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: gitlab-test-kas
+  namespace: gitlab
+  labels:
+    app: kas
+    chart: kas-6.0.1
+    release: gitlab-test
+    heritage: Helm
+    
+    
+  annotations:
+    
+spec:
+  type: "ClusterIP"
+  ports:
+    - port: 8150
+      targetPort: 8150
+      protocol: TCP
+      name: tcp-kas-external-api
+    - port: 8153
+      targetPort: 8153
+      protocol: TCP
+      name: tcp-kas-internal-api
+    - port: 8154
+      targetPort: 8154
+      protocol: TCP
+      name: tcp-kas-k8s-api
+    - port: 8151
+      targetPort: http-metrics
+      protocol: TCP
+      name: http-metrics
+  selector:
+    app: kas
+    release: gitlab-test
+---
 # Source: gitlab/charts/gitlab/charts/praefect/templates/service.yaml
 apiVersion: v1
 kind: Service
@@ -20043,7 +20082,7 @@
   namespace: gitlab
   labels:
     app: praefect
-    chart: praefect-5.10.2
+    chart: praefect-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -20078,7 +20117,7 @@
   namespace: gitlab
   labels:
     app: webservice
-    chart: webservice-5.10.2
+    chart: webservice-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -20720,7 +20759,7 @@
   namespace: gitlab
   labels:
     app: gitlab-exporter
-    chart: gitlab-exporter-5.10.2
+    chart: gitlab-exporter-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -20737,13 +20776,13 @@
     metadata:
       labels:
         app: gitlab-exporter
-        chart: gitlab-exporter-5.10.2
+        chart: gitlab-exporter-6.0.1
         release: gitlab-test
         heritage: Helm
         
         
       annotations:
-        checksum/config: 10122b165c743abf86f7498ff78b15dff8c1ebc4bfb668e0b19cbe3436927fea
+        checksum/config: 33698c4233d9c107b56b2a47175fef35733bcd73a0907917cc6f82b46bd5bead
         gitlab.com/prometheus_scrape: "true"
         gitlab.com/prometheus_port: "9168"
         gitlab.com/prometheus_path: /metrics
@@ -20781,6 +20820,7 @@
             value: "0.055"
           - name: RUBY_GC_HEAP_INIT_SLOTS
             value: "80000"
+          
           volumeMounts:
           - name: etc-ssl-certs
             mountPath: /etc/ssl/certs
@@ -20801,6 +20841,7 @@
             value: "0.055"
           - name: RUBY_GC_HEAP_INIT_SLOTS
             value: "80000"
+          
           volumeMounts:
           
           
@@ -20819,7 +20860,7 @@
       containers:
         
         - name: gitlab-exporter
-          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:11.14.0"          
+          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-exporter:11.15.0"          
           env:
             - name: CONFIG_TEMPLATE_DIRECTORY
               value: '/var/opt/gitlab-exporter/templates'
@@ -20834,6 +20875,7 @@
               value: "0.055"
             - name: RUBY_GC_HEAP_INIT_SLOTS
               value: "80000"
+            
           ports:
           - containerPort: 9168
             name: http-metrics
@@ -20905,7 +20947,7 @@
   namespace: gitlab
   labels:
     app: gitlab-shell
-    chart: gitlab-shell-5.10.2
+    chart: gitlab-shell-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -20921,14 +20963,14 @@
     metadata:
       labels:
         app: gitlab-shell
-        chart: gitlab-shell-5.10.2
+        chart: gitlab-shell-6.0.1
         release: gitlab-test
         heritage: Helm
         
         
       annotations:
-        checksum/config: 2aaab1e9622cee7af3eb5f1a75571e7f7b916d5b33d1c8df72dcd8c06dd1a38f
-        checksum/config-sshd: 833fecb665ec2596578e3841b34f434d155b17c7642abbd1a726175fce4e8fd9
+        checksum/config: 6f422516b3b333a42c6a6d68cd6d3e0de56df3c14e156e8f957e443397956167
+        checksum/config-sshd: a6df538cb2a0214cbaa751e2ecdbab0f9ca8b6aae4ae5d80541a98bd2a38c13c
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
     spec:
       initContainers:
@@ -20937,6 +20979,7 @@
           image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:367d437d024d7647432d67fb2442e3e5723af5930bad77d3535f4f8f4f8630d9"  
           env:
           
+          
           volumeMounts:
           - name: etc-ssl-certs
             mountPath: /etc/ssl/certs
@@ -20949,6 +20992,7 @@
           image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"          
           env:
           
+          
           volumeMounts:
           
           - name: shell-config
@@ -20981,7 +21025,7 @@
       containers:
         
         - name: gitlab-shell
-          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v13.25.1"          
+          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-shell:v14.3.0"          
           ports:
             - containerPort: 2222
               name: ssh
@@ -20997,6 +21041,7 @@
             - name: SSH_DAEMON
               value: "openssh"
             
+            
           volumeMounts:
             - name: shell-config
               mountPath: '/etc/gitlab-shell'
@@ -21060,6 +21105,147 @@
         emptyDir:
           medium: "Memory"
 ---
+# Source: gitlab/charts/gitlab/charts/kas/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: gitlab-test-kas
+  namespace: gitlab
+  labels:
+    app: kas
+    chart: kas-6.0.1
+    release: gitlab-test
+    heritage: Helm
+    
+  annotations:
+    
+spec:
+  selector:
+    matchLabels:
+      app: kas
+      release: gitlab-test
+      
+  template:
+    metadata:
+      labels:
+        app: kas
+        chart: kas-6.0.1
+        release: gitlab-test
+        heritage: Helm
+        
+        
+      annotations:
+        cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
+        gitlab.com/prometheus_scrape: "true"
+        gitlab.com/prometheus_port: "8151"
+        gitlab.com/prometheus_path: /metrics
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "8151"
+        prometheus.io/path: /metrics
+    spec:
+      
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 1
+            podAffinityTerm:
+              topologyKey: "kubernetes.io/hostname"
+              labelSelector:
+                matchLabels:
+                  app: kas
+                  release: gitlab-test
+                  
+      securityContext:
+        runAsUser: 65532
+        runAsGroup: 65532
+        fsGroup: 65532      
+      initContainers:
+        - name: certificates
+          image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:367d437d024d7647432d67fb2442e3e5723af5930bad77d3535f4f8f4f8630d9"  
+          env:
+          
+          
+          volumeMounts:
+          - name: etc-ssl-certs
+            mountPath: /etc/ssl/certs
+            readOnly: false
+          resources:
+            requests:
+              cpu: 50m
+      containers:
+        
+        - name: kas
+          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-kas:v15.0.0"          
+          args:
+            - "--configuration-file=/etc/kas/config.yaml"
+          env:
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: OWN_PRIVATE_API_URL
+              value: "grpc://$(POD_IP):8155"
+          ports:
+            - containerPort: 8150
+              name: kas
+            - containerPort: 8154
+              name: kas-k8s-api
+            - containerPort: 8155
+              name: kas-private-api
+            - containerPort: 8151
+              name: http-metrics
+          readinessProbe:
+            tcpSocket:
+              port: 8150
+            initialDelaySeconds: 5
+            periodSeconds: 10
+          livenessProbe:
+            tcpSocket:
+              port: 8150
+            initialDelaySeconds: 15
+            periodSeconds: 20
+          resources:
+            requests:
+              cpu: 100m
+              memory: 100M
+          volumeMounts:
+            - name: init-etc-kas
+              mountPath: /etc/kas
+              readOnly: true
+            
+            - name: etc-ssl-certs
+              mountPath: /etc/ssl/certs/
+              readOnly: true
+      volumes:
+      
+      
+      - name: etc-ssl-certs
+        emptyDir:
+          medium: "Memory"
+      - name: init-etc-kas
+        projected:
+          defaultMode: 0440
+          sources:
+            - configMap:
+                name: gitlab-test-kas
+            - secret:
+                name: "gitlab-test-gitlab-kas-secret"
+                items:
+                  - key: "kas_shared_secret"
+                    path: .gitlab_kas_secret
+            - secret:
+                name: "gitlab-test-kas-private-api"
+                items:
+                  - key: "kas_private_api_secret"
+                    path: .gitlab_kas_private_api_secret
+            
+            
+            - secret:
+                name: "gitlab-test-redis-secret"
+                items:
+                  - key: "secret"
+                    path: redis/redis-password
+---
 # Source: gitlab/charts/gitlab/charts/sidekiq/templates/deployment.yaml
 apiVersion: apps/v1
 kind: Deployment
@@ -21068,7 +21254,7 @@
   namespace: gitlab
   labels:
     app: sidekiq
-    chart: sidekiq-5.10.2
+    chart: sidekiq-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -21086,14 +21272,14 @@
     metadata:
       labels:
         app: sidekiq
-        chart: sidekiq-5.10.2
+        chart: sidekiq-6.0.1
         release: gitlab-test
         heritage: Helm
         
         
         queue-pod-name: native-chart
       annotations:
-        checksum/configmap: 177eee98ae0e2346e6b5271a21829b0f151da39d36df619fe42787e493e635a4
+        checksum/configmap: 2163aafa5ab571ed0c41c25c9c179825a3c89a4ce347020a16a164f44b192486
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
         co.elastic.logs/json.add_error_key: "true"
         co.elastic.logs/json.keys_under_root: "false"
@@ -21126,6 +21312,7 @@
           image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:367d437d024d7647432d67fb2442e3e5723af5930bad77d3535f4f8f4f8630d9"  
           env:
           
+          
           volumeMounts:
           - name: etc-ssl-certs
             mountPath: /etc/ssl/certs
@@ -21138,6 +21325,7 @@
           image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"          
           env:
           
+          
           volumeMounts:
           
           
@@ -21156,7 +21344,7 @@
             requests:
               cpu: 50m
         - name: dependencies
-          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.10.2"          
+          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v15.0.1"          
           args:
             - /scripts/wait-for-deps
           env:
@@ -21173,6 +21361,7 @@
             - name: ENABLE_BOOTSNAP
               value: "1"
             
+            
           volumeMounts:
           
           
@@ -21195,7 +21384,7 @@
       containers:
         
         - name: sidekiq
-          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v14.10.2"          
+          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-sidekiq-ce:v15.0.1"          
           env:
             - name: prometheus_multiproc_dir
               value: /metrics
@@ -21341,7 +21530,12 @@
               items:
                 - key: "shared_secret"
                   path: pages/secret
-          
+          # mount secret for kas
+          - secret:
+              name: "gitlab-test-gitlab-kas-secret"
+              items:
+                - key: "kas_shared_secret"
+                  path: kas/.gitlab_kas_secret
           # mount secret for minio
           - secret:
               name: "gitlab-test-minio-secret"
@@ -21360,7 +21554,6 @@
           # mount secret for ci_secure_files
           # mount secret for dependency_proxy
           # mount secret for pages
-          # mount secret for pseudonymizer
           # mount secrets for LDAP
           
       - name: sidekiq-secrets
@@ -21379,7 +21572,7 @@
   namespace: gitlab
   labels:
     app: toolbox
-    chart: toolbox-5.10.2
+    chart: toolbox-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -21398,13 +21591,13 @@
     metadata:
       labels:
         app: toolbox
-        chart: toolbox-5.10.2
+        chart: toolbox-6.0.1
         release: gitlab-test
         heritage: Helm
         
         
       annotations:
-        checksum/config: 115949642660b146b72b0b76e81ee4214c9447c32614c267e869260b6151a33f
+        checksum/config: 3755be10e85568e01fe8b5ab3b066417b5bcee5cdbb5499f9d8e69b37b48da7c
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
     spec:
       securityContext:
@@ -21417,6 +21610,7 @@
           image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:367d437d024d7647432d67fb2442e3e5723af5930bad77d3535f4f8f4f8630d9"  
           env:
           
+          
           volumeMounts:
           - name: etc-ssl-certs
             mountPath: /etc/ssl/certs
@@ -21429,6 +21623,7 @@
           image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"          
           env:
           
+          
           volumeMounts:
           
           
@@ -21462,7 +21657,7 @@
             - /bin/bash
             - -c
             - sh /var/opt/gitlab/templates/configure-gsutil && while sleep 3600; do :; done
-          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.10.2"          
+          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v15.0.1"          
           env:
             - name: ARTIFACTS_BUCKET_NAME
               value: gitlab-artifacts
@@ -21499,6 +21694,7 @@
             - name: GOOGLE_APPLICATION_CREDENTIALS
               value: '/etc/gitlab/objectstorage/connection'
             
+            
           volumeMounts:
             
             - name: toolbox-config
@@ -21595,7 +21791,12 @@
               items:
                 - key: "shared_secret"
                   path: pages/secret
-          
+          # mount secret for kas
+          - secret:
+              name: "gitlab-test-gitlab-kas-secret"
+              items:
+                - key: "kas_shared_secret"
+                  path: kas/.gitlab_kas_secret
           # mount secret for minio
           - secret:
               name: "gitlab-test-minio-secret"
@@ -21614,7 +21815,6 @@
           # mount secret for ci_secure_files
           # mount secret for dependency_proxy
           # mount secret for pages
-          # mount secret for pseudonymizer
           # mount secrets for LDAP
           
       - name: toolbox-secrets
@@ -21633,7 +21833,7 @@
   namespace: gitlab
   labels:
     app: webservice
-    chart: webservice-5.10.2
+    chart: webservice-6.0.1
     release: gitlab-test
     heritage: Helm
     gitlab.com/webservice-name: default
@@ -21654,7 +21854,7 @@
     metadata:
       labels:
         app: webservice
-        chart: webservice-5.10.2
+        chart: webservice-6.0.1
         release: gitlab-test
         heritage: Helm
         gitlab.com/webservice-name: default
@@ -21662,7 +21862,7 @@
         
         
       annotations:
-        checksum/config: 5c346318c2082041b932f2982b68c89807b2eb2979807c1cd7e98a9f0fec4a33
+        checksum/config: d2be433e719691eaac6574261a2e41089d5a7f85e3719957404aff64e8516739
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
         co.elastic.logs/json.add_error_key: "true"
         co.elastic.logs/json.keys_under_root: "false"
@@ -21696,6 +21896,7 @@
           image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:367d437d024d7647432d67fb2442e3e5723af5930bad77d3535f4f8f4f8630d9"  
           env:
           
+          
           volumeMounts:
           - name: etc-ssl-certs
             mountPath: /etc/ssl/certs
@@ -21709,6 +21910,7 @@
           image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"          
           env:
             
+            
           volumeMounts:
           
           
@@ -21735,7 +21937,7 @@
             requests:
               cpu: 50m
         - name: dependencies
-          image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.10.2          
+          image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.0.1          
           args:
             - /scripts/wait-for-deps
           env:
@@ -21750,6 +21952,7 @@
             - name: ENABLE_BOOTSNAP
               value: "1"
             
+            
           volumeMounts:
             
             - name: etc-ssl-certs
@@ -21770,7 +21973,7 @@
       containers:
         
         - name: webservice
-          image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.10.2          
+          image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.0.1          
           ports:
             - containerPort: 8080
               name: http-webservice
@@ -21811,6 +22014,7 @@
             - name: WORKHORSE_ARCHIVE_CACHE_DISABLED
               value: "true"
             
+            
           volumeMounts:
             - name: webservice-metrics
               mountPath: '/metrics'
@@ -21852,10 +22056,10 @@
               path: /-/readiness
               port: 8080
             initialDelaySeconds: 0
-            periodSeconds: 10
+            periodSeconds: 5
             timeoutSeconds: 2
             successThreshold: 1
-            failureThreshold: 3
+            failureThreshold: 2
           lifecycle:
             preStop:
               exec:
@@ -21865,7 +22069,7 @@
               cpu: 300m
               memory: 2.5G
         - name: gitlab-workhorse
-          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v14.10.2"          
+          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ce:v15.0.1"          
           ports:
             - containerPort: 8181
               name: http-workhorse
@@ -21884,6 +22088,7 @@
               value: '/srv/gitlab/config'
             
             
+            
           volumeMounts:
             - name: workhorse-config
               mountPath: '/var/opt/gitlab/templates'
@@ -21996,7 +22201,12 @@
               items:
                 - key: "shared_secret"
                   path: pages/secret
-          
+          # mount secret for kas
+          - secret:
+              name: "gitlab-test-gitlab-kas-secret"
+              items:
+                - key: "kas_shared_secret"
+                  path: kas/.gitlab_kas_secret
           # mount secret for minio
           - secret:
               name: "gitlab-test-minio-secret"
@@ -22479,6 +22689,7 @@
           image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:367d437d024d7647432d67fb2442e3e5723af5930bad77d3535f4f8f4f8630d9"  
           env:
           
+          
           volumeMounts:
           - name: etc-ssl-certs
             mountPath: /etc/ssl/certs
@@ -22498,12 +22709,14 @@
             requests:
               cpu: 50m
           env:
+          
                 
       containers:
         - name: registry
-          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.39.0-gitlab"          
+          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.41.1-gitlab"          
           env:
           
+          
           volumeMounts:
           - name: registry-server-config
             mountPath: /etc/docker/registry/
@@ -22580,7 +22793,7 @@
   namespace: gitlab
   labels:
     app: gitlab-shell
-    chart: gitlab-shell-5.10.2
+    chart: gitlab-shell-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -22597,6 +22810,31 @@
       name: cpu
       targetAverageValue: 100m
 ---
+# Source: gitlab/charts/gitlab/charts/kas/templates/hpa.yaml
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: gitlab-test-kas
+  namespace: gitlab
+  labels:
+    app: kas
+    chart: kas-6.0.1
+    release: gitlab-test
+    heritage: Helm
+    
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: gitlab-test-kas
+  minReplicas: 2
+  maxReplicas: 10
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      targetAverageValue: 100m
+---
 # Source: gitlab/charts/gitlab/charts/sidekiq/templates/hpa.yaml
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
@@ -22605,7 +22843,7 @@
   namespace: gitlab
   labels:
     app: sidekiq
-    chart: sidekiq-5.10.2
+    chart: sidekiq-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -22630,7 +22868,7 @@
   namespace: gitlab
   labels:
     app: webservice
-    chart: webservice-5.10.2
+    chart: webservice-6.0.1
     release: gitlab-test
     heritage: Helm
     gitlab.com/webservice-name: default
@@ -22681,7 +22919,7 @@
   namespace: gitlab
   labels:
     app: gitaly
-    chart: gitaly-5.10.2
+    chart: gitaly-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -22701,13 +22939,13 @@
       labels:
         storage: default
         app: gitaly
-        chart: gitaly-5.10.2
+        chart: gitaly-6.0.1
         release: gitlab-test
         heritage: Helm
         
         
       annotations:
-        checksum/config: 2ddfa231c20ef09cec97257b05614e91deeda59f833948414641bc725d77bc63
+        checksum/config: d065c83a14e13668d1def58ebc11c273adc9dd9738cfec980c04486895b99555
         co.elastic.logs/json.add_error_key: "true"
         co.elastic.logs/json.keys_under_root: "false"
         gitlab.com/prometheus_scrape: "true"
@@ -22724,6 +22962,7 @@
           image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:367d437d024d7647432d67fb2442e3e5723af5930bad77d3535f4f8f4f8630d9"  
           env:
           
+          
           volumeMounts:
           - name: etc-ssl-certs
             mountPath: /etc/ssl/certs
@@ -22736,6 +22975,7 @@
           image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"          
           env:
           
+          
           volumeMounts:
           
           - name: gitaly-config
@@ -22769,7 +23009,7 @@
       containers:
         
         - name: gitaly
-          image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.10.2"          
+          image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v15.0.1"          
           ports:
             - containerPort: 8075
               name: grpc-gitaly
@@ -22786,6 +23026,7 @@
               value: '/etc/ssl/certs'
             
             
+            
           volumeMounts:
             
             - name: etc-ssl-certs
@@ -22870,7 +23111,7 @@
   namespace: gitlab
   labels:
     app: praefect
-    chart: praefect-5.10.2
+    chart: praefect-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -22887,13 +23128,13 @@
     metadata:
       labels:
         app: praefect
-        chart: praefect-5.10.2
+        chart: praefect-6.0.1
         release: gitlab-test
         heritage: Helm
         
         
       annotations:
-        checksum/config: 52566c385f677ed1f5207ce01a3e1135c45b10a2823db040bfcfa787618996db
+        checksum/config: 296b061e0c466dde271550cb18bed5c7c1aae4a1efc4288d2bb3aa3dc6d37b79
         gitlab.com/prometheus_scrape: "true"
         gitlab.com/prometheus_port: "9236"
         gitlab.com/prometheus_path: /metrics
@@ -22919,6 +23160,7 @@
           image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:367d437d024d7647432d67fb2442e3e5723af5930bad77d3535f4f8f4f8630d9"  
           env:
           
+          
           volumeMounts:
           - name: etc-ssl-certs
             mountPath: /etc/ssl/certs
@@ -22930,6 +23172,7 @@
           image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"          
           env:
           
+          
           volumeMounts:
           
           - name: praefect-config
@@ -22949,7 +23192,7 @@
       containers:
       
       - name: praefect
-        image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v14.10.2"        
+        image: "registry.gitlab.com/gitlab-org/build/cng/gitaly:v15.0.1"        
         ports:
           - containerPort: 8075
           - containerPort: 9236
@@ -22971,6 +23214,7 @@
           value: '1'
         
         
+        
         resources:
           requests:
             cpu: 100m
@@ -23365,7 +23609,7 @@
       restartPolicy: OnFailure      
       containers:
         - name: create-issuer
-          image: "registry.gitlab.com/gitlab-org/build/cng/kubectl:1.18.20@sha256:f0bc9adaccd131d993fdabf6aa39fe4ff0e22035c2deca20341074c9e2e40a5b"
+          image: "registry.gitlab.com/gitlab-org/build/cng/kubectl:1.18.20@sha256:8d27c191af306cafddba2f293c5613f8966363f779d79a5599ad0231e60069e4"
           command: ['/bin/bash', '/scripts/create-issuer', '/scripts/issuer.yml']          
           volumeMounts:
             - name: scripts
@@ -23386,7 +23630,7 @@
   namespace: gitlab
   labels:
     app: migrations
-    chart: migrations-5.10.2
+    chart: migrations-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -23397,7 +23641,7 @@
     metadata:
       labels:
         app: migrations
-        chart: migrations-5.10.2
+        chart: migrations-6.0.1
         release: gitlab-test
         heritage: Helm
         
@@ -23413,6 +23657,7 @@
           image: "registry.gitlab.com/gitlab-org/build/cng/alpine-certificates:20191127-r2@sha256:367d437d024d7647432d67fb2442e3e5723af5930bad77d3535f4f8f4f8630d9"  
           env:
           
+          
           volumeMounts:
           - name: etc-ssl-certs
             mountPath: /etc/ssl/certs
@@ -23425,6 +23670,7 @@
           image: "registry.gitlab.com/gitlab-org/cloud-native/mirror/images/busybox:latest"          
           env:
           
+          
           volumeMounts:
           
           
@@ -23445,7 +23691,7 @@
       containers:
         
         - name: migrations
-          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v14.10.2"
+          image: "registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ce:v15.0.1"
           args:
             - /scripts/wait-for-deps
             - /scripts/db-migrate          
@@ -23459,6 +23705,7 @@
             - name: ENABLE_BOOTSNAP
               value: '1'
             
+            
           volumeMounts:
             - name: migrations-config
               mountPath: '/var/opt/gitlab/templates'
@@ -23493,6 +23740,7 @@
         projected:
           defaultMode: 0400
           sources:
+          
           - secret:
               name: "gitlab-test-rails-secret"
               items:
@@ -23590,6 +23838,41 @@
           requests:
             cpu: 50m
 ---
+# Source: gitlab/charts/gitlab/charts/kas/templates/ingress.yaml
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: gitlab-test-kas
+  namespace: gitlab
+  labels:
+    app: kas
+    chart: kas-6.0.1
+    release: gitlab-test
+    heritage: Helm
+    
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+    kubernetes.io/ingress.provider: "nginx"
+    cert-manager.io/issuer: "gitlab-test-issuer"
+spec:
+  
+  rules:
+    - host: kas.test.freedesktop.org
+      http:
+        paths:
+          - path: "/"
+            backend:
+              serviceName: gitlab-test-kas
+              servicePort: 8150
+          - path: "/k8s-proxy/"
+            backend:
+              serviceName: gitlab-test-kas
+              servicePort: 8154
+  tls:
+    - hosts:
+      - kas.test.freedesktop.org
+      secretName: gitlab-test-kas-tls
+---
 # Source: gitlab/charts/gitlab/charts/webservice/templates/ingress.yaml
 apiVersion: extensions/v1beta1
 kind: Ingress
@@ -23598,7 +23881,7 @@
   namespace: gitlab
   labels:
     app: webservice
-    chart: webservice-5.10.2
+    chart: webservice-6.0.1
     release: gitlab-test
     heritage: Helm
     gitlab.com/webservice-name: default
@@ -23859,7 +24142,7 @@
   namespace: gitlab
   labels:
     app: gitlab
-    chart: gitlab-5.10.2
+    chart: gitlab-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -23876,7 +24159,7 @@
   namespace: gitlab
   labels:
     app: gitlab
-    chart: gitlab-5.10.2
+    chart: gitlab-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -23916,7 +24199,7 @@
     
       kubectl --namespace=$namespace label \
         --overwrite \
-        secret $secret_name app=gitlab chart=gitlab-5.10.2 release=gitlab-test heritage=Helm 
+        secret $secret_name app=gitlab chart=gitlab-6.0.1 release=gitlab-test heritage=Helm 
     }
     
     # Args: secretname, args
@@ -23988,12 +24271,17 @@
     # GitLab Pages OAuth secret
     
     
+    # Gitlab-kas secret
+    generate_secret_if_needed "gitlab-test-gitlab-kas-secret" --from-literal="kas_shared_secret"=$(gen_random 'a-zA-Z0-9' 32 | base64)
     
+    # Gitlab-kas private API secret
+    generate_secret_if_needed "gitlab-test-kas-private-api" --from-literal="kas_private_api_secret"=$(gen_random 'a-zA-Z0-9' 32 | base64)
     
     
     
     
     
+    
     # Registry certificates
     mkdir -p certs
     openssl req -new -newkey rsa:4096 -subj "/CN=gitlab-issuer" -nodes -x509 -keyout certs/registry-example-com.key -out certs/registry-example-com.crt -days 3650
@@ -24077,7 +24365,7 @@
   namespace: gitlab
   labels:
     app: gitlab
-    chart: gitlab-5.10.2
+    chart: gitlab-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -24118,8 +24406,8 @@
         fi
       fi
     fi
-    MIN_VERSION=14.0
-    CHART_MIN_VERSION=5.0
+    MIN_VERSION=14.10
+    CHART_MIN_VERSION=5.10
     
     # Only run check for semver releases
     if ! awk 'BEGIN{exit(!(ARGV[1] ~ /^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/))}' "$GITLAB_VERSION"; then
@@ -24158,7 +24446,7 @@
       if ( ! greater_version $OLD_MINOR_VERSION $MIN_VERSION ) || ( ! greater_version $OLD_CHART_MINOR_VERSION $CHART_MIN_VERSION ); then
         notify "It seems you are upgrading the GitLab Helm Chart from ${OLD_CHART_VERSION_STRING} (GitLab ${OLD_VERSION_STRING}) to ${CHART_VERSION} (GitLab ${GITLAB_VERSION})."
         notify "It is required to upgrade to the latest ${CHART_MIN_VERSION}.x version first before proceeding."
-        notify "Please follow the upgrade documentation at https://docs.gitlab.com/charts/releases/5_0.html"
+        notify "Please follow the upgrade documentation at https://docs.gitlab.com/charts/releases/6_0.html"
         notify "and upgrade to GitLab Helm Chart version ${CHART_MIN_VERSION}.x before upgrading to ${CHART_VERSION}."
         exit 1
       fi
@@ -24196,7 +24484,7 @@
   namespace: gitlab
   labels:
     app: shared-secrets
-    chart: shared-secrets-5.10.2
+    chart: shared-secrets-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -24244,7 +24532,7 @@
   namespace: gitlab
   labels:
     app: shared-secrets
-    chart: shared-secrets-5.10.2
+    chart: shared-secrets-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -24265,7 +24553,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: gitlab-test-webservice-test-runner-blphn
+  name: gitlab-test-webservice-test-runner-ixt6w
   namespace: gitlab
   annotations:
     "helm.sh/hook": test
@@ -24273,7 +24561,7 @@
 spec:
   containers:
   - name: test-runner
-    image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v14.10.2
+    image: registry.gitlab.com/gitlab-org/build/cng/gitlab-webservice-ce:v15.0.1
     command: ['sh', '/tests/test_login']
     volumeMounts:
       - name: tests
@@ -24344,11 +24632,11 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: gitlab-test-shared-secrets-1-db5
+  name: gitlab-test-shared-secrets-1-cmj
   namespace: gitlab
   labels:
     app: gitlab
-    chart: gitlab-5.10.2
+    chart: gitlab-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -24360,7 +24648,7 @@
     metadata:
       labels:
         app: gitlab
-        chart: gitlab-5.10.2
+        chart: gitlab-6.0.1
         release: gitlab-test
         heritage: Helm
         
@@ -24376,7 +24664,7 @@
       
       containers:
         - name: gitlab
-          image: "registry.gitlab.com/gitlab-org/build/cng/kubectl:1.18.20@sha256:f0bc9adaccd131d993fdabf6aa39fe4ff0e22035c2deca20341074c9e2e40a5b"          
+          image: "registry.gitlab.com/gitlab-org/build/cng/kubectl:1.18.20@sha256:8d27c191af306cafddba2f293c5613f8966363f779d79a5599ad0231e60069e4"          
           command: ['/bin/bash', '/scripts/generate-secrets']
           volumeMounts:
             - name: scripts
@@ -24401,7 +24689,7 @@
   namespace: gitlab
   labels:
     app: gitlab
-    chart: gitlab-5.10.2
+    chart: gitlab-6.0.1
     release: gitlab-test
     heritage: Helm
     
@@ -24429,9 +24717,9 @@
           command: ['/bin/sh', '/scripts/runcheck']          
           env:
             - name: GITLAB_VERSION
-              value: '14.10.2'
+              value: '15.0.1'
             - name: CHART_VERSION
-              value: '5.10.2'
+              value: '6.0.1'
           volumeMounts:
             - name: chart-info
               mountPath: /chart-info

Merge request reports

Loading