From 3993d41384b4ade42b30dcf2d5c64b7ba8d70035 Mon Sep 17 00:00:00 2001 From: dustinmm80 Date: Wed, 17 Apr 2024 14:50:37 -0500 Subject: [PATCH 1/3] CI: Add jobs for Kubernetes 1.27 Changelog: added --- .gitlab-ci.yml | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6df3f0c4b..cb362ba55f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -337,6 +337,12 @@ pin_image_versions: KUBE_INGRESS_BASE_DOMAIN: "cloud-native-v127.helm-charts.win" KUBE_NAMESPACE: "helm-charts-win" +.review_gke129_common_vars: &review_gke129_common_vars + DNS_PROVIDER: "google" + AGENT_NAME: "gke129-ci-cluster" + KUBE_INGRESS_BASE_DOMAIN: "cloud-native-v129.helm-charts.win" + KUBE_NAMESPACE: "helm-charts-win" + .review_eks_common_vars: &review_eks_common_vars DNS_PROVIDER: "aws" AGENT_NAME: "eks127-ci-cluster" @@ -436,6 +442,33 @@ review_gke127: auto_stop_in: "${REVIEW_APPS_AUTO_STOP_IN}" action: access +# See comments in create_review_gke125. +create_review_gke129: + stage: review + image: busybox + variables: + <<: *review_gke129_common_vars + GIT_STRATEGY: none + script: + - echo "Configuring gke129_review/$REVIEW_REF_PREFIX$CI_COMMIT_SHORT_SHA to automatically stop in $REVIEW_APPS_AUTO_STOP_IN." + environment: + name: gke129_review/$REVIEW_REF_PREFIX$CI_COMMIT_SHORT_SHA + url: https://gitlab-$CI_ENVIRONMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN + on_stop: stop_review_gke129 + auto_stop_in: $REVIEW_APPS_AUTO_STOP_IN + action: start + +review_gke129: + variables: + <<: *review_gke129_common_vars + extends: .review_template + environment: + name: gke129_review/$REVIEW_REF_PREFIX$CI_COMMIT_SHORT_SHA + url: https://gitlab-$CI_ENVIRONMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN + on_stop: stop_review_gke129 + auto_stop_in: "${REVIEW_APPS_AUTO_STOP_IN}" + action: access + # See comments in create_review_gke125. create_review_eks: stage: review @@ -504,6 +537,14 @@ stop_review_gke127: name: gke127_review/$REVIEW_REF_PREFIX$CI_COMMIT_SHORT_SHA action: stop +stop_review_gke129: + variables: + <<: *review_gke129_common_vars + extends: .stop_review_template + environment: + name: gke129_review/$REVIEW_REF_PREFIX$CI_COMMIT_SHORT_SHA + action: stop + stop_review_eks: variables: <<: *review_eks_common_vars @@ -738,6 +779,22 @@ review_specs_gke127: - !reference [.specs, rules] needs: ['review_gke127'] +review_specs_gke129: + extends: .specs + variables: + <<: *review_gke129_common_vars + VARIABLES_FILE: "variables/review_gke129" + RSPEC_TAGS: type:feature + environment: + name: gke129_review/$REVIEW_REF_PREFIX$CI_COMMIT_SHORT_SHA + url: https://gitlab-$CI_ENVIRONENMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN + on_stop: stop_review_gke129 + action: access + rules: + - !reference [.rule:skip_if_no_cluster] + - !reference [.specs, rules] + needs: ['review_gke129'] + review_specs_eks: extends: .specs variables: @@ -937,6 +994,20 @@ qa_gke127: - job: review_specs_gke127 artifacts: false +qa_gke129: + extends: .qa_branch + variables: + VARIABLES_FILE: "variables/review_gke129" + TEST_SUITE: $QA_SANITY_SUITE_OPTIONS + environment: + name: gke129_review/$REVIEW_REF_PREFIX$CI_COMMIT_SHORT_SHA + on_stop: stop_review_gke129 + action: access + needs: + - review_gke129 + - job: review_specs_gke129 + artifacts: false + qa_eks: extends: .qa_branch variables: @@ -973,6 +1044,10 @@ qa_gke127_full_suite_manual_trigger: extends: .qa_full_suite_manual_trigger script: echo 'The job will trigger Full E2E suite against GKE127' +qa_gke129_full_suite_manual_trigger: + extends: .qa_full_suite_manual_trigger + script: echo 'The job will trigger Full E2E suite against GKE129' + qa_gke125_manual_full_suite: extends: .qa_branch parallel: 7 @@ -1009,6 +1084,18 @@ qa_gke127_manual_full_suite: action: access needs: [ "qa_gke127_full_suite_manual_trigger"] +qa_gke129_manual_full_suite: + extends: .qa_branch + parallel: 7 + variables: + VARIABLES_FILE: "variables/review_gke129" + TEST_SUITE: $QA_FULL_SUITE_OPTIONS + environment: + name: gke129_review/$REVIEW_REF_PREFIX$CI_COMMIT_SHORT_SHA + on_stop: stop_review_gke129 + action: access + needs: [ "qa_gke129_full_suite_manual_trigger"] + qa_eks_full_suite_manual_trigger: extends: .qa_full_suite_manual_trigger script: echo 'The job will trigger Full E2E suite against EKS' -- GitLab From f808544feab48529bccb637a87f05f45a8daa32d Mon Sep 17 00:00:00 2001 From: dustinmm80 Date: Thu, 2 May 2024 14:42:24 -0500 Subject: [PATCH 2/3] Add 1.28,1.29 to supported table in docs --- doc/installation/cloud/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/installation/cloud/index.md b/doc/installation/cloud/index.md index 9097db14f4..c323a5389c 100644 --- a/doc/installation/cloud/index.md +++ b/doc/installation/cloud/index.md @@ -23,6 +23,8 @@ The GitLab Helm chart supports the following Kubernetes releases: | Kubernetes release | Status | Minimum GitLab version | Architectures | End of life | |--------------------|------------|------------------------|---------------|-------------| +| 1.29 | Supported | 16.6 | x86-64 | 2025-02-28 | +| 1.28 | Supported | 16.6 | x86-64 | 2024-10-28 | | 1.27 | Supported | 16.6 | x86-64 | 2024-06-28 | | 1.26 | Supported | 16.5 | x86-64 | 2024-02-28 | | 1.25 | Deprecated | 16.5 | x86-64 | 2023-10-28 | -- GitLab From ffd6bb4074bd5d352a17d79738fafdb8becaa38f Mon Sep 17 00:00:00 2001 From: Dustin Collins <714871-dustinmm80@users.noreply.gitlab.com> Date: Thu, 9 May 2024 18:15:56 +0000 Subject: [PATCH 3/3] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Clemens Beck --- doc/installation/cloud/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/installation/cloud/index.md b/doc/installation/cloud/index.md index c323a5389c..635603d548 100644 --- a/doc/installation/cloud/index.md +++ b/doc/installation/cloud/index.md @@ -23,8 +23,8 @@ The GitLab Helm chart supports the following Kubernetes releases: | Kubernetes release | Status | Minimum GitLab version | Architectures | End of life | |--------------------|------------|------------------------|---------------|-------------| -| 1.29 | Supported | 16.6 | x86-64 | 2025-02-28 | -| 1.28 | Supported | 16.6 | x86-64 | 2024-10-28 | +| 1.29 | Supported | 17.0 | x86-64 | 2025-02-28 | +| 1.28 | Supported | 17.0 | x86-64 | 2024-10-28 | | 1.27 | Supported | 16.6 | x86-64 | 2024-06-28 | | 1.26 | Supported | 16.5 | x86-64 | 2024-02-28 | | 1.25 | Deprecated | 16.5 | x86-64 | 2023-10-28 | -- GitLab