From fc7e79c0611be3949548beebbac2707c5ce96217 Mon Sep 17 00:00:00 2001
From: dustinmm80 <dcollins@gitlab.com>
Date: Fri, 10 May 2024 10:27:28 -0500
Subject: [PATCH 1/2] Add vcluster 1.30 and preflight 1.29 CI jobs

Changelog: added
---
 .gitlab-ci.yml                       |  6 ++++++
 .gitlab/ci/review-apps.gitlab-ci.yml | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8d71cc1a7..2d29225a0c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -247,6 +247,12 @@ lint_package:
     KUBE_VERSION: "1.30.1"
     HELM_SETTINGS: !reference ["Validate 1.27.5", variables, HELM_SETTINGS]
 
+"Validate 1.29.1":
+  extends: .kubeconform
+  variables:
+    KUBE_VERSION: "1.29.1"
+    HELM_SETTINGS: !reference ["Validate 1.25.7", variables, HELM_SETTINGS]
+
 approve_cluster_tests:
   stage: approve-review-apps
   image: alpine:latest
diff --git a/.gitlab/ci/review-apps.gitlab-ci.yml b/.gitlab/ci/review-apps.gitlab-ci.yml
index a6ec432851..fb49294d72 100644
--- a/.gitlab/ci/review-apps.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps.gitlab-ci.yml
@@ -54,16 +54,16 @@ stop_review_vcluster_128:
   extends: .stop_review_app_template
   variables: !reference [review_vcluster_128, variables]
 
-# Kubernetes 1.29
+# Kubernetes 1.30
 
-review_vcluster_129:
+review_vcluster_130:
   extends: .review_app_template
   variables:
-    VCLUSTER_K8S_VERSION: "1.29"
-    VCLUSTER_NAME: vcluster-1-29-${REVIEW_REF_PREFIX}${CI_COMMIT_SHORT_SHA}
+    VCLUSTER_K8S_VERSION: "1.30"
+    VCLUSTER_NAME: vcluster-1-30-${REVIEW_REF_PREFIX}${CI_COMMIT_SHORT_SHA}
   environment:
-    on_stop: stop_review_vcluster_129
+    on_stop: stop_review_vcluster_130
 
-stop_review_vcluster_129:
+stop_review_vcluster_130:
   extends: .stop_review_app_template
-  variables: !reference [review_vcluster_129, variables]
+  variables: !reference [review_vcluster_130, variables]
-- 
GitLab


From 805df5532eec8c10e3f0c53286fa68b6536536b2 Mon Sep 17 00:00:00 2001
From: dustinmm80 <dcollins@gitlab.com>
Date: Mon, 24 Jun 2024 13:15:28 -0500
Subject: [PATCH 2/2] Fix references

---
 .gitlab-ci.yml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d29225a0c..439ab2114d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -213,10 +213,10 @@ lint_package:
     - if: '$PIPELINE_TYPE == "NIGHTLY_PIPELINE"'
   needs: ['lint_package']
 
-"Validate 1.27.5":
+"Validate 1.27.9":
   extends: .kubeconform
   variables:
-    KUBE_VERSION: "1.27.5"
+    KUBE_VERSION: "1.27.9"
     HELM_SETTINGS: |
       global:
         ingress:
@@ -233,25 +233,19 @@ lint_package:
   extends: .kubeconform
   variables:
     KUBE_VERSION: "1.28.3"
-    HELM_SETTINGS: !reference ["Validate 1.27.5", variables, HELM_SETTINGS]
+    HELM_SETTINGS: !reference ["Validate 1.27.9", variables, HELM_SETTINGS]
 
 "Validate 1.29.4":
   extends: .kubeconform
   variables:
     KUBE_VERSION: "1.29.4"
-    HELM_SETTINGS: !reference ["Validate 1.27.5", variables, HELM_SETTINGS]
+    HELM_SETTINGS: !reference ["Validate 1.27.9", variables, HELM_SETTINGS]
 
 "Validate 1.30.1":
   extends: .kubeconform
   variables:
     KUBE_VERSION: "1.30.1"
-    HELM_SETTINGS: !reference ["Validate 1.27.5", variables, HELM_SETTINGS]
-
-"Validate 1.29.1":
-  extends: .kubeconform
-  variables:
-    KUBE_VERSION: "1.29.1"
-    HELM_SETTINGS: !reference ["Validate 1.25.7", variables, HELM_SETTINGS]
+    HELM_SETTINGS: !reference ["Validate 1.27.9", variables, HELM_SETTINGS]
 
 approve_cluster_tests:
   stage: approve-review-apps
-- 
GitLab