From f6ea6f8b5238dbd21c9b60ad61c5e5734aa53b3f Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Fri, 8 Sep 2023 15:32:02 -0500
Subject: [PATCH 01/15] Add script for vcluster-related functions

Adds a script with vcluster-related functions
to be called in CI, along with a dedicated Helm
values file to keep the script simple.
---
 scripts/ci/vcluster.sh               | 48 +++++++++++++++++++++++++++
 scripts/ci/vcluster_helm_values.yaml | 49 ++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100755 scripts/ci/vcluster.sh
 create mode 100644 scripts/ci/vcluster_helm_values.yaml

diff --git a/scripts/ci/vcluster.sh b/scripts/ci/vcluster.sh
new file mode 100755
index 0000000000..853365b3c5
--- /dev/null
+++ b/scripts/ci/vcluster.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+function cluster_connect() {
+  if [ -z ${AGENT_NAME+x} ] || [ -z ${AGENT_PROJECT_PATH+x} ]; then
+    echo "No AGENT_NAME or AGENT_PROJECT_PATH set, using the default"
+  else
+    kubectl config get-contexts
+    kubectl config use-context ${AGENT_PROJECT_PATH}:${AGENT_NAME}
+  fi
+}
+
+function vcluster_create() {
+  vcluster create ${VCLUSTER_NAME} \
+    --upgrade \
+    --namespace=${VCLUSTER_NAME} \
+    --kubernetes-version=${VCLUSTER_K8S_VERSION} \
+    --connect=false \
+    --update-current=false
+}
+
+function vcluster_run() {
+  vcluster connect ${VCLUSTER_NAME} -- $@
+}
+
+function vcluster_helm_deploy() {
+  helm dependency update
+
+  vcluster_run helm upgrade --install \
+    gitlab \
+    --wait --timeout 600s \
+    -f ./scripts/ci/vcluster_helm_values.yaml \
+    .
+}
+
+function vcluster_helm_rollout_status() {
+  vcluster_run kubectl rollout status deployment/gitlab-webservice-default --timeout=300s
+}
+
+function vcluster_delete() {
+  vcluster delete ${VCLUSTER_NAME}
+}
+
+function vcluster_info() {
+  echo "To connect to the virtual cluster:"
+  echo "1. Connect to host cluster via kubectl: ${AGENT_NAME}"
+  echo "2. Connect to virtual cluster: vcluster connect ${VCLUSTER_NAME}"
+  echo "3. Open a separate terminal window and run your kubectl and helm commands."
+}
diff --git a/scripts/ci/vcluster_helm_values.yaml b/scripts/ci/vcluster_helm_values.yaml
new file mode 100644
index 0000000000..5663ec9276
--- /dev/null
+++ b/scripts/ci/vcluster_helm_values.yaml
@@ -0,0 +1,49 @@
+global:
+  hosts:
+    https: false
+  image:
+    pullPolicy: Always
+  ingress:
+    configureCertmanager: false
+    tls:
+      enabled: false
+  appConfig:
+    initialDefaults:
+      signupEnabled: false
+gitlab:
+  webservice:
+    minReplicas: 1    # 2
+    maxReplicas: 3    # 10
+    resources:
+      requests:
+        cpu: 500m     # 900m
+        memory: 1500M # 2.5G
+  sidekiq:
+    minReplicas: 1    # 1
+    maxReplicas: 2    # 10
+    resources:
+      requests:
+        cpu: 500m     # 900m
+        memory: 1000M # 2G
+  gitlab-shell:
+    minReplicas: 1    # 2
+    maxReplicas: 2    # 10
+  toolbox:
+    enabled: true
+gitlab-runner:
+  install: false
+certmanager:
+  install: false
+nginx-ingress:
+  controller:
+    replicaCount: 1   # 2
+    service:
+      type: NodePort # to avoid creating a LoadBalancer
+redis:
+  resources:
+    requests:
+      cpu: 100m
+minio:
+  resources:
+    requests:
+      cpu: 100m
-- 
GitLab


From 8d26ab23270b73163363a0622d722c6c7da0881b Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Fri, 8 Sep 2023 15:34:19 -0500
Subject: [PATCH 02/15] Add CI template with vcluster jobs

Adds a dedicated CI file for vcluster-related jobs.
---
 .gitlab-ci.yml                       |  1 +
 .gitlab/ci/review-apps.gitlab-ci.yml | 49 ++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 .gitlab/ci/review-apps.gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9317f0928c..6e99b6a185 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,6 +84,7 @@ stages:
 
 include:
   - local: '/.gitlab/ci/rules.gitlab-ci.yml'
+  - local: '/.gitlab/ci/review-apps.gitlab-ci.yml'
   - template: Jobs/Dependency-Scanning.latest.gitlab-ci.yml
   - template: Jobs/Secret-Detection.latest.gitlab-ci.yml
   - template: Jobs/SAST.latest.gitlab-ci.yml
diff --git a/.gitlab/ci/review-apps.gitlab-ci.yml b/.gitlab/ci/review-apps.gitlab-ci.yml
new file mode 100644
index 0000000000..62948e5cd3
--- /dev/null
+++ b/.gitlab/ci/review-apps.gitlab-ci.yml
@@ -0,0 +1,49 @@
+.review_app_common:
+  stage: review
+  variables:
+    AGENT_NAME: "gke125-ci-cluster" # connect to 1.25 cluster until we have a dedicated cluster
+  environment:
+    name: gke125_vcluster/${VCLUSTER_NAME}
+    auto_stop_in: 1 hour
+  before_script:
+    - source scripts/ci/vcluster.sh
+  rules:
+    - if: '$PIPELINE_TYPE =~ /MR_PIPELINE$/'
+    - if: '$PIPELINE_TYPE =~ /FEATURE_BRANCH_PIPELINE$/'
+
+.review_app_template:
+  extends: .review_app_common
+  script:
+    - cluster_connect
+    - kubectl version
+    - vcluster_create
+    - vcluster_run kubectl version
+    - vcluster_helm_deploy
+    - vcluster_helm_rollout_status
+    - vcluster_info
+
+.stop_review_app_template:
+  extends: .review_app_common
+  dependencies: []
+  script:
+    - cluster_connect
+    - vcluster_delete
+  environment:
+    action: stop
+  when: manual
+
+# Below, create two jobs for each Kubernetes version:
+#  - one to create the environment
+#  - one to stop the environment
+
+review_gke_k8s_126:
+  extends: .review_app_template
+  variables:
+    VCLUSTER_K8S_VERSION: "1.26"
+    VCLUSTER_NAME: vcluster-1-26-${CI_COMMIT_REF_SLUG}
+  environment:
+    on_stop: stop_review_gke_k8s_126
+
+stop_review_gke_k8s_126:
+  extends: .stop_review_app_template
+  variables: !reference [review_gke_k8s_126, variables]
-- 
GitLab


From b1a232c86a04c436b93aae62ded816c6ba3cc27e Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Fri, 8 Sep 2023 15:35:07 -0500
Subject: [PATCH 03/15] Add kubeconform job for 1.26

Adds a kubeconform job to test 1.26.8.
---
 .gitlab-ci.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e99b6a185..07e29ab23a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -239,6 +239,22 @@ lint_package:
           cronJob:
             apiVersion: batch/v1
 
+"Validate 1.26.8":
+  extends: .kubeconform
+  variables:
+    KUBE_VERSION: "1.26.8"
+    HELM_SETTINGS: |
+      global:
+        ingress:
+          apiVersion: networking.k8s.io/v1
+        pdb:
+          apiVersion: policy/v1
+        hpa:
+          apiVersion: autoscaling/v2
+        batch:
+          cronJob:
+            apiVersion: batch/v1
+
 .review_template:
   stage: review
   variables:
-- 
GitLab


From 8aea93dc6ef3d92ba8e65758a4ab7d63347ccbbc Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Fri, 8 Sep 2023 15:35:43 -0500
Subject: [PATCH 04/15] To remove: override default image for one with vcluster

Overrides the default image to include one that has
vcluster included. We can revert this commit once
the base image has vcluster built in.
---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07e29ab23a..c339da5f6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,9 @@
 # Note: Auto CI does not work with multiple buildpacks yet
 
 default:
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base-helm-3.7
+  # image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base-helm-3.7
+  # TODO: restore image above once it contains `vcluster`
+  image: registry.gitlab.com/mnielsen/tmp-registry/gitlab-charts-build-base:vcluster
 
 variables:
   AUTO_DEPLOY_TAG_REGEX: '^[0-9]+\.[0-9]+\.[0-9]+\+[a-z0-9]{7,}$'
-- 
GitLab


From 98ec621a940ecd3f022495b512d3c834f0862990 Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Fri, 8 Sep 2023 16:33:57 -0500
Subject: [PATCH 05/15] Add jobs to test against Kubernetes 1.27

---
 .gitlab-ci.yml                       | 16 ++++++++++++++++
 .gitlab/ci/review-apps.gitlab-ci.yml | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c339da5f6f..8342cf5936 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -257,6 +257,22 @@ lint_package:
           cronJob:
             apiVersion: batch/v1
 
+"Validate 1.27.5":
+  extends: .kubeconform
+  variables:
+    KUBE_VERSION: "1.27.5"
+    HELM_SETTINGS: |
+      global:
+        ingress:
+          apiVersion: networking.k8s.io/v1
+        pdb:
+          apiVersion: policy/v1
+        hpa:
+          apiVersion: autoscaling/v2
+        batch:
+          cronJob:
+            apiVersion: batch/v1
+
 .review_template:
   stage: review
   variables:
diff --git a/.gitlab/ci/review-apps.gitlab-ci.yml b/.gitlab/ci/review-apps.gitlab-ci.yml
index 62948e5cd3..996662fefb 100644
--- a/.gitlab/ci/review-apps.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps.gitlab-ci.yml
@@ -36,6 +36,8 @@
 #  - one to create the environment
 #  - one to stop the environment
 
+# Kubernetes 1.26
+
 review_gke_k8s_126:
   extends: .review_app_template
   variables:
@@ -47,3 +49,17 @@ review_gke_k8s_126:
 stop_review_gke_k8s_126:
   extends: .stop_review_app_template
   variables: !reference [review_gke_k8s_126, variables]
+
+# Kubernetes 1.27
+
+review_gke_k8s_127:
+  extends: .review_app_template
+  variables:
+    VCLUSTER_K8S_VERSION: "1.27"
+    VCLUSTER_NAME: vcluster-1-27-${CI_COMMIT_REF_SLUG}
+  environment:
+    on_stop: stop_review_gke_k8s_127
+
+stop_review_gke_k8s_127:
+  extends: .stop_review_app_template
+  variables: !reference [review_gke_k8s_127, variables]
-- 
GitLab


From 104cd7db58444c668051b86ddac29b61f2b320d2 Mon Sep 17 00:00:00 2001
From: Clemens Beck <cbeck@gitlab.com>
Date: Thu, 14 Sep 2023 15:10:41 +0000
Subject: [PATCH 06/15] DRY up HELM_SETTINGS configs

---
 .gitlab-ci.yml | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8342cf5936..9602e73cce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -245,33 +245,13 @@ lint_package:
   extends: .kubeconform
   variables:
     KUBE_VERSION: "1.26.8"
-    HELM_SETTINGS: |
-      global:
-        ingress:
-          apiVersion: networking.k8s.io/v1
-        pdb:
-          apiVersion: policy/v1
-        hpa:
-          apiVersion: autoscaling/v2
-        batch:
-          cronJob:
-            apiVersion: batch/v1
+    HELM_SETTINGS: !reference ["Validate 1.25.7", variables, HELM_SETTINGS]
 
 "Validate 1.27.5":
   extends: .kubeconform
   variables:
     KUBE_VERSION: "1.27.5"
-    HELM_SETTINGS: |
-      global:
-        ingress:
-          apiVersion: networking.k8s.io/v1
-        pdb:
-          apiVersion: policy/v1
-        hpa:
-          apiVersion: autoscaling/v2
-        batch:
-          cronJob:
-            apiVersion: batch/v1
+    HELM_SETTINGS: !reference ["Validate 1.25.7", variables, HELM_SETTINGS]
 
 .review_template:
   stage: review
-- 
GitLab


From eb72670428419c29220155d35a93a2ef383acd8f Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Thu, 14 Sep 2023 10:21:53 -0500
Subject: [PATCH 07/15] Rename vcluster review app jobs

Renames the vcluster review app jobs, replacing 'gke_k8s'
with 'vcluster' because 'gke' and 'k8s' are a bit irrelevant/redundant.
---
 .gitlab/ci/review-apps.gitlab-ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab/ci/review-apps.gitlab-ci.yml b/.gitlab/ci/review-apps.gitlab-ci.yml
index 996662fefb..60ac65e2cc 100644
--- a/.gitlab/ci/review-apps.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps.gitlab-ci.yml
@@ -38,28 +38,28 @@
 
 # Kubernetes 1.26
 
-review_gke_k8s_126:
+review_vcluster_126:
   extends: .review_app_template
   variables:
     VCLUSTER_K8S_VERSION: "1.26"
     VCLUSTER_NAME: vcluster-1-26-${CI_COMMIT_REF_SLUG}
   environment:
-    on_stop: stop_review_gke_k8s_126
+    on_stop: stop_review_vcluster_126
 
-stop_review_gke_k8s_126:
+stop_review_vcluster_126:
   extends: .stop_review_app_template
-  variables: !reference [review_gke_k8s_126, variables]
+  variables: !reference [review_vcluster_126, variables]
 
 # Kubernetes 1.27
 
-review_gke_k8s_127:
+review_vcluster_127:
   extends: .review_app_template
   variables:
     VCLUSTER_K8S_VERSION: "1.27"
     VCLUSTER_NAME: vcluster-1-27-${CI_COMMIT_REF_SLUG}
   environment:
-    on_stop: stop_review_gke_k8s_127
+    on_stop: stop_review_vcluster_127
 
-stop_review_gke_k8s_127:
+stop_review_vcluster_127:
   extends: .stop_review_app_template
-  variables: !reference [review_gke_k8s_127, variables]
+  variables: !reference [review_vcluster_127, variables]
-- 
GitLab


From 5bdc41a3bb146563159941c3d50817e853b7faab Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Thu, 21 Sep 2023 20:32:42 -0500
Subject: [PATCH 08/15] Add jobs to test against Kubernetes 1.28

---
 .gitlab-ci.yml                       |  6 ++++++
 .gitlab/ci/review-apps.gitlab-ci.yml | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9602e73cce..333983beca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -253,6 +253,12 @@ lint_package:
     KUBE_VERSION: "1.27.5"
     HELM_SETTINGS: !reference ["Validate 1.25.7", variables, HELM_SETTINGS]
 
+"Validate 1.28.3":
+  extends: .kubeconform
+  variables:
+    KUBE_VERSION: "1.28.3"
+    HELM_SETTINGS: !reference ["Validate 1.25.7", variables, HELM_SETTINGS]
+
 .review_template:
   stage: review
   variables:
diff --git a/.gitlab/ci/review-apps.gitlab-ci.yml b/.gitlab/ci/review-apps.gitlab-ci.yml
index 60ac65e2cc..9dd71b3393 100644
--- a/.gitlab/ci/review-apps.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps.gitlab-ci.yml
@@ -63,3 +63,17 @@ review_vcluster_127:
 stop_review_vcluster_127:
   extends: .stop_review_app_template
   variables: !reference [review_vcluster_127, variables]
+
+# Kubernetes 1.28
+
+review_vcluster_128:
+  extends: .review_app_template
+  variables:
+    VCLUSTER_K8S_VERSION: "1.28"
+    VCLUSTER_NAME: vcluster-1-28-${CI_COMMIT_REF_SLUG}
+  environment:
+    on_stop: stop_review_vcluster_128
+
+stop_review_vcluster_128:
+  extends: .stop_review_app_template
+  variables: !reference [review_vcluster_128, variables]
-- 
GitLab


From 81e779620d3931f55ec71fbec3004a2c2ec070b8 Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Fri, 29 Sep 2023 11:41:19 -0500
Subject: [PATCH 09/15] Update development docs with a CI section

Adds a CI section to the development docs that also
mentions how vcluster is implemented.
---
 doc/development/index.md | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/doc/development/index.md b/doc/development/index.md
index d3398846ee..98d36e121f 100644
--- a/doc/development/index.md
+++ b/doc/development/index.md
@@ -59,6 +59,41 @@ Details on the version scheme, branching and tags can be found in [release docum
 
 All `CHANGELOG.md` entries should be created via the [changelog entries](changelog.md) workflow.
 
+## Pipelines
+
+GitLab CI pipelines run on pipelines for:
+
+- Merge requests
+- Default branch
+- Stable branches
+- Tags
+
+The configuration for these CI pipelines is managed in:
+
+- [`.gitlab-ci.yml`](https://gitlab.com/gitlab-org/charts/gitlab/tree/master/.gitlab-ci.yml)
+- Files under [`.gitlab/ci/`](https://gitlab.com/gitlab-org/charts/gitlab/tree/master/.gitlab/ci/)
+
+### Review apps
+
+We use [Review apps](https://docs.gitlab.com/ee/ci/review_apps/) in CI to
+deploy running instances of the Helm Charts and test against them.
+
+We deploy these Review apps to our EKS and GKE clusters, confirm that the Helm
+release is created successfully, and then run [GitLab QA](gitlab-qa/index.md)
+and other [RSpec tests](rspec.md).
+
+For merge requests specifically, we make use of
+[`vcluster`](https://www.vcluster.com) to create ephemeral clusters. This
+allows us to test against newer versions of Kubernetes more quickly due to the
+ease of configuration and simplified environments that do not include External
+DNS or Cert Manager dependencies. In this case, we simply deploy the Helm
+Charts, confirm the release was created successfully, and validate that
+Webservice is in the `Ready` state. This approach takes advantage of
+[Kubernetes readiness probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
+to ensure that the application is in a healthy state. See
+[issue 5013](https://gitlab.com/gitlab-org/charts/gitlab/-/issues/5013) for
+more information on our `vcluster` implementation plan.
+
 ## When to fork upstream charts
 
 ### No changes, no fork
-- 
GitLab


From 98fedc2535df2f92d8ddc3845781a0ef1b4bdc4b Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Thu, 19 Oct 2023 15:23:09 -0500
Subject: [PATCH 10/15] Revert "To remove: override default image for one with
 vcluster"

This reverts commit 8aea93dc6ef3d92ba8e65758a4ab7d63347ccbbc.
---
 .gitlab-ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 333983beca..c1f7fef978 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,9 +25,7 @@
 # Note: Auto CI does not work with multiple buildpacks yet
 
 default:
-  # image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base-helm-3.7
-  # TODO: restore image above once it contains `vcluster`
-  image: registry.gitlab.com/mnielsen/tmp-registry/gitlab-charts-build-base:vcluster
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base-helm-3.7
 
 variables:
   AUTO_DEPLOY_TAG_REGEX: '^[0-9]+\.[0-9]+\.[0-9]+\+[a-z0-9]{7,}$'
-- 
GitLab


From c5ff58a894ab6488921596e299e27abca5335719 Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Thu, 19 Oct 2023 15:25:40 -0500
Subject: [PATCH 11/15] Confirm rollout status of all release Deployments

Rather than just checking the Webservice Deployment rollout
status, this change uses the `-l` labels syntax available
in newer Kubernetes versions to confirm the rollout status of
all Deployments in the release.
---
 scripts/ci/vcluster.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/vcluster.sh b/scripts/ci/vcluster.sh
index 853365b3c5..1ef98df43b 100755
--- a/scripts/ci/vcluster.sh
+++ b/scripts/ci/vcluster.sh
@@ -33,7 +33,7 @@ function vcluster_helm_deploy() {
 }
 
 function vcluster_helm_rollout_status() {
-  vcluster_run kubectl rollout status deployment/gitlab-webservice-default --timeout=300s
+  vcluster_run kubectl rollout status deployments -l release=gitlab --timeout=300s
 }
 
 function vcluster_delete() {
-- 
GitLab


From fc5531e19afa77ae137356e5c0e3d561f97bba8c Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Fri, 20 Oct 2023 17:07:57 -0500
Subject: [PATCH 12/15] Allow failure in vcluster-related jobs

Because the vcluster-related jobs are currently serving
the purpose of validating forward-looking versions of Kubernetes,
let's allow failure so that they don't block any merge request
pipelilnes.
---
 .gitlab/ci/review-apps.gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab/ci/review-apps.gitlab-ci.yml b/.gitlab/ci/review-apps.gitlab-ci.yml
index 9dd71b3393..7e3a606a68 100644
--- a/.gitlab/ci/review-apps.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps.gitlab-ci.yml
@@ -7,6 +7,7 @@
     auto_stop_in: 1 hour
   before_script:
     - source scripts/ci/vcluster.sh
+  allow_failure: true
   rules:
     - if: '$PIPELINE_TYPE =~ /MR_PIPELINE$/'
     - if: '$PIPELINE_TYPE =~ /FEATURE_BRANCH_PIPELINE$/'
-- 
GitLab


From 76fad1e2c8e2f9f38be62daa24e4220bf0b130e2 Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Mon, 23 Oct 2023 14:28:52 -0500
Subject: [PATCH 13/15] Check the rollout status of StatefulSets

Also checks the rollout status of StatefulSets in addition
to Deployments, ensuring that components like PostgreSQL
are up and running.
---
 scripts/ci/vcluster.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ci/vcluster.sh b/scripts/ci/vcluster.sh
index 1ef98df43b..6963006bdd 100755
--- a/scripts/ci/vcluster.sh
+++ b/scripts/ci/vcluster.sh
@@ -33,6 +33,7 @@ function vcluster_helm_deploy() {
 }
 
 function vcluster_helm_rollout_status() {
+  vcluster_run kubectl rollout status statefulset -l release=gitlab --timeout=300s
   vcluster_run kubectl rollout status deployments -l release=gitlab --timeout=300s
 }
 
-- 
GitLab


From be9bed8bd197930a43e5071c6870b6baeca3ca38 Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Mon, 23 Oct 2023 14:30:14 -0500
Subject: [PATCH 14/15] Skip review app jobs if no cluster

Skips review app jobs if there is no cluster connection.
---
 .gitlab/ci/review-apps.gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab/ci/review-apps.gitlab-ci.yml b/.gitlab/ci/review-apps.gitlab-ci.yml
index 7e3a606a68..a20427f604 100644
--- a/.gitlab/ci/review-apps.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps.gitlab-ci.yml
@@ -9,6 +9,7 @@
     - source scripts/ci/vcluster.sh
   allow_failure: true
   rules:
+    - !reference [.rule:skip_if_no_cluster]
     - if: '$PIPELINE_TYPE =~ /MR_PIPELINE$/'
     - if: '$PIPELINE_TYPE =~ /FEATURE_BRANCH_PIPELINE$/'
 
-- 
GitLab


From 12f448f14834161ec5f43f78a1c050bcda2a4b33 Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Tue, 24 Oct 2023 10:06:16 -0500
Subject: [PATCH 15/15] Remove vcluster jobs for K8s 1.26

With https://gitlab.com/gitlab-org/charts/gitlab/-/merge_requests/3430,
we now test against a dedicated 1.26 cluster, so no need to test there
in vcluster anymore.
---
 .gitlab/ci/review-apps.gitlab-ci.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/.gitlab/ci/review-apps.gitlab-ci.yml b/.gitlab/ci/review-apps.gitlab-ci.yml
index a20427f604..b0f1c6d8f8 100644
--- a/.gitlab/ci/review-apps.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps.gitlab-ci.yml
@@ -38,20 +38,6 @@
 #  - one to create the environment
 #  - one to stop the environment
 
-# Kubernetes 1.26
-
-review_vcluster_126:
-  extends: .review_app_template
-  variables:
-    VCLUSTER_K8S_VERSION: "1.26"
-    VCLUSTER_NAME: vcluster-1-26-${CI_COMMIT_REF_SLUG}
-  environment:
-    on_stop: stop_review_vcluster_126
-
-stop_review_vcluster_126:
-  extends: .stop_review_app_template
-  variables: !reference [review_vcluster_126, variables]
-
 # Kubernetes 1.27
 
 review_vcluster_127:
-- 
GitLab