From c8cd5af7923d8cc003bd571d9091e621bdcc32db Mon Sep 17 00:00:00 2001 From: Abhay Krishna Arunachalam Date: Tue, 28 Nov 2023 10:47:21 -0800 Subject: [PATCH] Add 1-29 release branch support --- EKSD_LATEST_RELEASES | 3 + .../buildspecs/batch-build.yml | 6 ++ .../kind/buildspecs/batch-build.yml | 6 ++ .../buildspecs/batch-build.yml | 6 ++ release/SUPPORTED_RELEASE_BRANCHES | 3 +- release/checksums-build.yml | 27 ++++++++ release/staging-build.yml | 68 +++++++++++++++++++ 7 files changed, 118 insertions(+), 1 deletion(-) diff --git a/EKSD_LATEST_RELEASES b/EKSD_LATEST_RELEASES index 045cc46997..d4445d543f 100644 --- a/EKSD_LATEST_RELEASES +++ b/EKSD_LATEST_RELEASES @@ -32,4 +32,7 @@ releases: - branch: 1-28 number: 9 kubeVersion: v1.28.3 +- branch: 1-29 + number: 1 + kubeVersion: v1.29.0-rc.1 latest: 1-25 diff --git a/projects/aws/bottlerocket-bootstrap/buildspecs/batch-build.yml b/projects/aws/bottlerocket-bootstrap/buildspecs/batch-build.yml index acb7aed584..0d22e422f2 100644 --- a/projects/aws/bottlerocket-bootstrap/buildspecs/batch-build.yml +++ b/projects/aws/bottlerocket-bootstrap/buildspecs/batch-build.yml @@ -47,6 +47,12 @@ batch: compute-type: BUILD_GENERAL1_SMALL variables: RELEASE_BRANCH: 1-28 + - identifier: aws_bottlerocket_bootstrap_1_29 + env: + type: ARM_CONTAINER + compute-type: BUILD_GENERAL1_SMALL + variables: + RELEASE_BRANCH: 1-29 version: 0.2 phases: pre_build: diff --git a/projects/kubernetes-sigs/kind/buildspecs/batch-build.yml b/projects/kubernetes-sigs/kind/buildspecs/batch-build.yml index 0f823115c1..63f5934327 100644 --- a/projects/kubernetes-sigs/kind/buildspecs/batch-build.yml +++ b/projects/kubernetes-sigs/kind/buildspecs/batch-build.yml @@ -52,6 +52,12 @@ batch: compute-type: BUILD_GENERAL1_LARGE variables: RELEASE_BRANCH: 1-28 + - identifier: kubernetes_sigs_kind_1_29 + env: + type: LINUX_CONTAINER + compute-type: BUILD_GENERAL1_LARGE + variables: + RELEASE_BRANCH: 1-29 version: 0.2 env: variables: diff --git a/projects/kubernetes/cloud-provider-vsphere/buildspecs/batch-build.yml b/projects/kubernetes/cloud-provider-vsphere/buildspecs/batch-build.yml index b47a94d16d..b35848cbe1 100644 --- a/projects/kubernetes/cloud-provider-vsphere/buildspecs/batch-build.yml +++ b/projects/kubernetes/cloud-provider-vsphere/buildspecs/batch-build.yml @@ -47,6 +47,12 @@ batch: compute-type: BUILD_GENERAL1_SMALL variables: RELEASE_BRANCH: 1-28 + - identifier: kubernetes_cloud_provider_vsphere_1_29 + env: + type: ARM_CONTAINER + compute-type: BUILD_GENERAL1_SMALL + variables: + RELEASE_BRANCH: 1-29 version: 0.2 phases: pre_build: diff --git a/release/SUPPORTED_RELEASE_BRANCHES b/release/SUPPORTED_RELEASE_BRANCHES index 5478d65b65..12ddd15007 100644 --- a/release/SUPPORTED_RELEASE_BRANCHES +++ b/release/SUPPORTED_RELEASE_BRANCHES @@ -2,4 +2,5 @@ 1-25 1-26 1-27 -1-28 \ No newline at end of file +1-28 +1-29 \ No newline at end of file diff --git a/release/checksums-build.yml b/release/checksums-build.yml index 62e04568c7..9cd06c9636 100644 --- a/release/checksums-build.yml +++ b/release/checksums-build.yml @@ -244,6 +244,14 @@ batch: PROJECT_PATH: projects/kubernetes/autoscaler CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes.autoscaler RELEASE_BRANCH: 1-28 + - identifier: kubernetes_autoscaler_1_29 + env: + type: ARM_CONTAINER + compute-type: BUILD_GENERAL1_LARGE + variables: + PROJECT_PATH: projects/kubernetes/autoscaler + CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes.autoscaler + RELEASE_BRANCH: 1-29 - identifier: kubernetes_cloud_provider_aws_1_24 env: type: ARM_CONTAINER @@ -284,6 +292,14 @@ batch: PROJECT_PATH: projects/kubernetes/cloud-provider-aws CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes.cloud-provider-aws RELEASE_BRANCH: 1-28 + - identifier: kubernetes_cloud_provider_aws_1_29 + env: + type: ARM_CONTAINER + compute-type: BUILD_GENERAL1_SMALL + variables: + PROJECT_PATH: projects/kubernetes/cloud-provider-aws + CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes.cloud-provider-aws + RELEASE_BRANCH: 1-29 - identifier: kubernetes_cloud_provider_vsphere_1_24 env: type: ARM_CONTAINER @@ -324,6 +340,14 @@ batch: PROJECT_PATH: projects/kubernetes/cloud-provider-vsphere CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes.cloud-provider-vsphere RELEASE_BRANCH: 1-28 + - identifier: kubernetes_cloud_provider_vsphere_1_29 + env: + type: ARM_CONTAINER + compute-type: BUILD_GENERAL1_SMALL + variables: + PROJECT_PATH: projects/kubernetes/cloud-provider-vsphere + CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes.cloud-provider-vsphere + RELEASE_BRANCH: 1-29 - identifier: kubernetes_sigs_cluster_api env: type: ARM_CONTAINER @@ -530,16 +554,19 @@ batch: - kubernetes_autoscaler_1_26 - kubernetes_autoscaler_1_27 - kubernetes_autoscaler_1_28 + - kubernetes_autoscaler_1_29 - kubernetes_cloud_provider_aws_1_24 - kubernetes_cloud_provider_aws_1_25 - kubernetes_cloud_provider_aws_1_26 - kubernetes_cloud_provider_aws_1_27 - kubernetes_cloud_provider_aws_1_28 + - kubernetes_cloud_provider_aws_1_29 - kubernetes_cloud_provider_vsphere_1_24 - kubernetes_cloud_provider_vsphere_1_25 - kubernetes_cloud_provider_vsphere_1_26 - kubernetes_cloud_provider_vsphere_1_27 - kubernetes_cloud_provider_vsphere_1_28 + - kubernetes_cloud_provider_vsphere_1_29 - kubernetes_sigs_cluster_api - kubernetes_sigs_cluster_api_provider_cloudstack - kubernetes_sigs_cluster_api_provider_vsphere diff --git a/release/staging-build.yml b/release/staging-build.yml index 8d183df3b4..26a63b5699 100644 --- a/release/staging-build.yml +++ b/release/staging-build.yml @@ -69,6 +69,15 @@ batch: variables: PROJECT_PATH: projects/aws/bottlerocket-bootstrap RELEASE_BRANCH: 1-28 + - identifier: aws_bottlerocket_bootstrap_1_29 + depend-on: + - kubernetes_sigs_etcdadm + env: + type: ARM_CONTAINER + compute-type: BUILD_GENERAL1_SMALL + variables: + PROJECT_PATH: projects/aws/bottlerocket-bootstrap + RELEASE_BRANCH: 1-29 - identifier: aws_cluster_api_provider_aws_snow env: type: ARM_CONTAINER @@ -315,6 +324,14 @@ batch: PROJECT_PATH: projects/kubernetes/cloud-provider-aws CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes.cloud-provider-aws RELEASE_BRANCH: 1-28 + - identifier: kubernetes_cloud_provider_aws_1_29 + env: + type: ARM_CONTAINER + compute-type: BUILD_GENERAL1_SMALL + variables: + PROJECT_PATH: projects/kubernetes/cloud-provider-aws + CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes.cloud-provider-aws + RELEASE_BRANCH: 1-29 - identifier: kubernetes_cloud_provider_vsphere_1_24 env: type: ARM_CONTAINER @@ -355,6 +372,14 @@ batch: PROJECT_PATH: projects/kubernetes/cloud-provider-vsphere CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes.cloud-provider-vsphere RELEASE_BRANCH: 1-28 + - identifier: kubernetes_cloud_provider_vsphere_1_29 + env: + type: ARM_CONTAINER + compute-type: BUILD_GENERAL1_SMALL + variables: + PROJECT_PATH: projects/kubernetes/cloud-provider-vsphere + CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes.cloud-provider-vsphere + RELEASE_BRANCH: 1-29 - identifier: kubernetes_sigs_cluster_api env: type: ARM_CONTAINER @@ -440,6 +465,16 @@ batch: CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes-sigs.image-builder IMAGE_OS: bottlerocket RELEASE_BRANCH: 1-28 + - identifier: kubernetes_sigs_image_builder_bottlerocket_1_29_ova + buildspec: projects/kubernetes-sigs/image-builder/buildspecs/ova.yml + env: + type: ARM_CONTAINER + compute-type: BUILD_GENERAL1_SMALL + variables: + PROJECT_PATH: projects/kubernetes-sigs/image-builder + CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes-sigs.image-builder + IMAGE_OS: bottlerocket + RELEASE_BRANCH: 1-29 - identifier: kubernetes_sigs_image_builder_bottlerocket_1_24_raw buildspec: projects/kubernetes-sigs/image-builder/buildspecs/raw.yml env: @@ -490,6 +525,16 @@ batch: CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes-sigs.image-builder IMAGE_OS: bottlerocket RELEASE_BRANCH: 1-28 + - identifier: kubernetes_sigs_image_builder_bottlerocket_1_29_raw + buildspec: projects/kubernetes-sigs/image-builder/buildspecs/raw.yml + env: + type: ARM_CONTAINER + compute-type: BUILD_GENERAL1_SMALL + variables: + PROJECT_PATH: projects/kubernetes-sigs/image-builder + CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes-sigs.image-builder + IMAGE_OS: bottlerocket + RELEASE_BRANCH: 1-29 - identifier: kubernetes_sigs_image_builder_bottlerocket_1_24_ami buildspec: projects/kubernetes-sigs/image-builder/buildspecs/ami.yml env: @@ -540,6 +585,16 @@ batch: CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes-sigs.image-builder IMAGE_OS: bottlerocket RELEASE_BRANCH: 1-28 + - identifier: kubernetes_sigs_image_builder_bottlerocket_1_29_ami + buildspec: projects/kubernetes-sigs/image-builder/buildspecs/ami.yml + env: + type: ARM_CONTAINER + compute-type: BUILD_GENERAL1_SMALL + variables: + PROJECT_PATH: projects/kubernetes-sigs/image-builder + CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes-sigs.image-builder + IMAGE_OS: bottlerocket + RELEASE_BRANCH: 1-29 - identifier: kubernetes_sigs_kind buildspec: buildspecs/binaries.yml env: @@ -613,6 +668,19 @@ batch: PROJECT_PATH: projects/kubernetes-sigs/kind CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes-sigs.kind RELEASE_BRANCH: 1-28 + - identifier: kubernetes_sigs_kind_1_29 + buildspec: buildspecs/images.yml + depend-on: + - kubernetes_sigs_etcdadm + - kubernetes_sigs_cri_tools + - rancher_local_path_provisioner + env: + type: LINUX_CONTAINER + compute-type: BUILD_GENERAL1_LARGE + variables: + PROJECT_PATH: projects/kubernetes-sigs/kind + CLONE_URL: https://git-codecommit.us-west-2.amazonaws.com/v1/repos/kubernetes-sigs.kind + RELEASE_BRANCH: 1-29 - identifier: nutanix_cloud_native_cluster_api_provider_nutanix env: type: ARM_CONTAINER