Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 1-29 release branch support #2693

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Add 1-29 release branch support #2693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions EKSD_LATEST_RELEASES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions UPSTREAM_PROJECTS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,6 @@ projects:
repos:
- name: autoscaler
versions:
- commit: 81727d2a6a7adb2153a4f6c7bd081211b71625b8
go_version: "1.18"
- commit: f69e14b5de2e595b55f4ee4dc64952e00e7c7ee9
go_version: "1.18"
- commit: e8d3e9b1d986d540a21913b756cb2b47ffddb918
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 6 additions & 0 deletions projects/aws/bottlerocket-bootstrap/buildspecs/batch-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions projects/kubernetes-sigs/image-builder/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you verify this based on the above rules?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kubernetes 1.29 had pause version 3.9 in the constants.go, and both 1.28 and 1.29 had 3.9 as the pause version in the Makefile. So I guess 1-28 should also work? But I can change it to 1-29.


HAS_RELEASE_BRANCHES=true
HAS_LICENSES=false
Expand Down
6 changes: 6 additions & 0 deletions projects/kubernetes-sigs/kind/buildspecs/batch-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
0 ...tes-sigs/metrics-server/1-23/HELM_GIT_TAG → ...tes-sigs/metrics-server/1-29/HELM_GIT_TAG
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...rm-helm-chart-to-packages-standards.patch → ...rm-helm-chart-to-packages-standards.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ke-imagePullSecrets-top-level-value.patch → ...ke-imagePullSecrets-top-level-value.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions ...Make-sourceRegistry-top-level-value.patch → ...Make-sourceRegistry-top-level-value.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
0 ...sigs/metrics-server/1-23/helm/schema.json → ...sigs/metrics-server/1-29/helm/schema.json
View file
Open in desktop
File renamed without changes.
0 ...metrics-server/1-23/helm/sedfile.template → ...metrics-server/1-29/helm/sedfile.template
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions projects/kubernetes-sigs/metrics-server/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions projects/kubernetes/autoscaler/1-23/CHECKSUMS
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion projects/kubernetes/autoscaler/1-23/GIT_TAG
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion projects/kubernetes/autoscaler/1-23/GOLANG_VERSION
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions projects/kubernetes/autoscaler/1-23/helm/sedfile.template
View file
Open in desktop

This file was deleted.

Loading