Add 1-29 release branch support (aws#2693)

abhay-krishna · Nov 30, 2023 · 91ce512 · 91ce512
1 parent 5bee9f9
commit 91ce512
Show file tree

Hide file tree

Showing 53 changed files with 3,972 additions and 44,131 deletions.
diff --git a/EKSD_LATEST_RELEASES b/EKSD_LATEST_RELEASES
@@ -32,4 +32,8 @@ releases:
 - branch: 1-28
   number: 9
   kubeVersion: v1.28.3
+- branch: 1-29
+  number: 1
+  kubeVersion: v1.29.0-rc.1
+  dev: true
 latest: 1-25
diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml
@@ -137,8 +137,6 @@ projects:
     repos:
       - name: autoscaler
         versions:
-          - commit: 81727d2a6a7adb2153a4f6c7bd081211b71625b8
-            go_version: "1.18"
           - commit: f69e14b5de2e595b55f4ee4dc64952e00e7c7ee9
             go_version: "1.18"
           - commit: e8d3e9b1d986d540a21913b756cb2b47ffddb918
@@ -149,24 +147,24 @@ projects:
             go_version: "1.20"
           - commit: 5bcb526e08c17ff93cc6093ee89a95730a90e45b
             go_version: "1.20"
+          - commit: 1caf2ddb61efd51b3c7c4c1837d8f7655abbef13
+            go_version: "1.21"
       - name: cloud-provider-aws
         versions:
           - tag: v1.27.0
             go_version: "1.19"
           - tag: v1.27.0
             go_version: "1.19"
-          - tag: v1.27.0
-            go_version: "1.19"
           - tag: v1.27.1
             go_version: "1.19"
           - tag: v1.27.1
             go_version: "1.19"
           - tag: v1.28.1
             go_version: "1.20"
+          - tag: v1.28.1
+            go_version: "1.20"
       - name: cloud-provider-vsphere
         versions:
-          - tag: v1.23.4
-            go_version: "1.17"
           - tag: v1.24.4
             go_version: "1.18"
           - tag: v1.25.1
@@ -177,6 +175,8 @@ projects:
             go_version: "1.20"
           - tag: v1.28.0
             go_version: "1.20"
+          - tag: v1.28.0
+            go_version: "1.20"
   - org: kubernetes-sigs
     repos:
       - name: cluster-api

diff --git 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/image-builder/Makefile b/projects/kubernetes-sigs/image-builder/Makefile
@@ -67,6 +67,7 @@ ADDITIONAL_PAUSE_1-25_FROM=1-24
 ADDITIONAL_PAUSE_1-26_FROM=1-26
 ADDITIONAL_PAUSE_1-27_FROM=1-27
 ADDITIONAL_PAUSE_1-28_FROM=1-28
+ADDITIONAL_PAUSE_1-29_FROM=1-28
 
 HAS_RELEASE_BRANCHES=true
 HAS_LICENSES=false

diff --git 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/...tes-sigs/metrics-server/1-23/HELM_GIT_TAG → ...tes-sigs/metrics-server/1-29/HELM_GIT_TAG b/...tes-sigs/metrics-server/1-23/HELM_GIT_TAG → ...tes-sigs/metrics-server/1-29/HELM_GIT_TAG
diff --git a/...rm-helm-chart-to-packages-standards.patch → ...rm-helm-chart-to-packages-standards.patch b/...rm-helm-chart-to-packages-standards.patch → ...rm-helm-chart-to-packages-standards.patch
@@ -166,8 +166,8 @@ index 6a97505..7583ac6 100644
 -  tag: ""
 -  pullPolicy: IfNotPresent
 +  sourceRegistry: public.ecr.aws/eks-anywhere
-+  repository: metrics-server/eks-distro/kubernetes-sigs/metrics-server
-+  digest: {{eks-distro/kubernetes-sigs/metrics-server}}
++  repository: metrics-server/h1r8a7l5/kubernetes-sigs/metrics-server
++  digest: {{h1r8a7l5/kubernetes-sigs/metrics-server}}
 
 -imagePullSecrets: []
 -# - registrySecretName

diff --git a/...ke-imagePullSecrets-top-level-value.patch → ...ke-imagePullSecrets-top-level-value.patch b/...ke-imagePullSecrets-top-level-value.patch → ...ke-imagePullSecrets-top-level-value.patch
@@ -12,7 +12,7 @@ index 7583ac6..70b6f7d 100644
 --- a/charts/metrics-server/values.yaml
 +++ b/charts/metrics-server/values.yaml
 @@ -8,8 +8,8 @@ image:
-   digest: {{eks-distro/kubernetes-sigs/metrics-server}}
+   digest: {{h1r8a7l5/kubernetes-sigs/metrics-server}}
 
    pullPolicy: IfNotPresent
 -  imagePullSecrets:

diff --git a/...Make-sourceRegistry-top-level-value.patch → ...Make-sourceRegistry-top-level-value.patch b/...Make-sourceRegistry-top-level-value.patch → ...Make-sourceRegistry-top-level-value.patch
@@ -33,8 +33,8 @@ index 70b6f7d..7930a5b 100644
 +
  image:
 -  sourceRegistry: public.ecr.aws/eks-anywhere
-   repository: metrics-server/eks-distro/kubernetes-sigs/metrics-server
-   digest: {{eks-distro/kubernetes-sigs/metrics-server}}
+   repository: metrics-server/h1r8a7l5/kubernetes-sigs/metrics-server
+   digest: {{h1r8a7l5/kubernetes-sigs/metrics-server}}
 
 -- 
 2.30.1 (Apple Git-130)

diff --git a/...sigs/metrics-server/1-23/helm/schema.json → ...sigs/metrics-server/1-29/helm/schema.json b/...sigs/metrics-server/1-23/helm/schema.json → ...sigs/metrics-server/1-29/helm/schema.json
diff --git a/...metrics-server/1-23/helm/sedfile.template → ...metrics-server/1-29/helm/sedfile.template b/...metrics-server/1-23/helm/sedfile.template → ...metrics-server/1-29/helm/sedfile.template
diff --git a/projects/kubernetes-sigs/metrics-server/Makefile b/projects/kubernetes-sigs/metrics-server/Makefile
@@ -7,7 +7,6 @@ HELM_GIT_TAG=$(shell cat $(RELEASE_BRANCH)/HELM_GIT_TAG)
 IMAGE_TAG=$(EKS_D_TAG)
 
 HAS_RELEASE_BRANCHES=true
-SKIPPED_K8S_VERSIONS=1-20
 
 REPO_OWNER=kubernetes-sigs
 REPO=metrics-server
@@ -28,7 +27,7 @@ HELM_SOURCE_IMAGE_REPO=public.ecr.aws
 HELM_SOURCE_OWNER=kubernetes-sigs
 HELM_SOURCE_REPOSITORY=metrics-server
 HELM_DIRECTORY=charts/metrics-server
-HELM_IMAGE_LIST=eks-distro/kubernetes-sigs/metrics-server
+HELM_IMAGE_LIST=$(if $(filter true,$(shell yq e ".releases[] | select(.branch==\"${RELEASE_BRANCH}\").dev" $(BASE_DIRECTORY)/EKSD_LATEST_RELEASES)),h1r8a7l5,eks-distro)/kubernetes-sigs/metrics-server
 HELM_USE_UPSTREAM_IMAGE=true
 
 HELM_CHART_NAMES=metrics-server/charts/metrics-server

diff --git a/projects/kubernetes/autoscaler/1-23/CHECKSUMS b/projects/kubernetes/autoscaler/1-23/CHECKSUMS
diff --git a/projects/kubernetes/autoscaler/1-23/GIT_TAG b/projects/kubernetes/autoscaler/1-23/GIT_TAG
diff --git a/projects/kubernetes/autoscaler/1-23/GOLANG_VERSION b/projects/kubernetes/autoscaler/1-23/GOLANG_VERSION
diff --git a/projects/kubernetes/autoscaler/1-23/helm/sedfile.template b/projects/kubernetes/autoscaler/1-23/helm/sedfile.template