From 055e727a07352937c483ef2887a6d25b3a4962be Mon Sep 17 00:00:00 2001 From: Gavin Inglis Date: Thu, 2 May 2024 16:26:31 +0000 Subject: [PATCH 1/2] ecr-credential-provider: add 1.30 release sources Update the ecr-credential-provider-1.30 package to remove boilerplate and use the recently released v1.30 of the upstream source. Signed-off-by: Gavin Inglis --- packages/ecr-credential-provider-1.30/Cargo.toml | 7 +++---- .../ecr-credential-provider-1.30.spec | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/ecr-credential-provider-1.30/Cargo.toml b/packages/ecr-credential-provider-1.30/Cargo.toml index 40109f990f1..91b2f74f66b 100644 --- a/packages/ecr-credential-provider-1.30/Cargo.toml +++ b/packages/ecr-credential-provider-1.30/Cargo.toml @@ -15,10 +15,9 @@ package-name = "ecr-credential-provider-1.30" releases-url = "https://github.com/kubernetes/cloud-provider-aws/releases" [[package.metadata.build-package.external-files]] -# TODO: update to 1.30 release once available -url = "https://codeload.github.com/kubernetes/cloud-provider-aws/tar.gz/v1.29.0" -path = "cloud-provider-aws-1.29.0.tar.gz" -sha512 = "30b08ca55d182de4b2289f58acf0af4476cbeff74ea2668d7e9d4c53e2fdbb38016d7cf434a55bba895230255a699233d4484333b5b516c16acb0515df514876" +url = "https://codeload.github.com/kubernetes/cloud-provider-aws/tar.gz/v1.30.0" +path = "cloud-provider-aws-1.30.0.tar.gz" +sha512 = "d9b9c63f2f2b6d9e910650464acc5000ba0cc2e35d0f5f27c4121c5e3cd539682a4b89f80358a5fb2a4c8409e2d82a66c5409e9895c58546c78bbb78b39d96be" bundle-modules = [ "go" ] [build-dependencies] diff --git a/packages/ecr-credential-provider-1.30/ecr-credential-provider-1.30.spec b/packages/ecr-credential-provider-1.30/ecr-credential-provider-1.30.spec index 3f8c435556c..51d09cfeef7 100644 --- a/packages/ecr-credential-provider-1.30/ecr-credential-provider-1.30.spec +++ b/packages/ecr-credential-provider-1.30/ecr-credential-provider-1.30.spec @@ -2,8 +2,7 @@ %global gorepo cloud-provider-aws %global goimport %{goproject}/%{gorepo} -%global gover 1.29.0 -# %%global gover 1.30.0 +%global gover 1.30.0 %global rpmver %{gover} %global _dwz_low_mem_die_limit 0 @@ -50,6 +49,8 @@ Conflicts: (%{_cross_os}image-feature(no-fips) or %{name}-bin) %build %set_cross_go_flags +export GO_VERSION="1.22.2" + go build -ldflags="${GOLDFLAGS}" -o=ecr-credential-provider cmd/ecr-credential-provider/*.go gofips build -ldflags="${GOLDFLAGS}" -o=fips/ecr-credential-provider cmd/ecr-credential-provider/*.go From 944002c2787ec983e4fe1b67996229be0935c512 Mon Sep 17 00:00:00 2001 From: Gavin Inglis Date: Thu, 2 May 2024 16:29:03 +0000 Subject: [PATCH 2/2] kubernetes: add 1.30 sources Remove TODOs from the boilerplate and use k8s 1.30 sources from upstream. Signed-off-by: Gavin Inglis --- packages/kubernetes-1.30/Cargo.toml | 6 +++--- packages/kubernetes-1.30/kubernetes-1.30.spec | 11 ++++++----- variants/Cargo.lock | 9 ++++++++- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/packages/kubernetes-1.30/Cargo.toml b/packages/kubernetes-1.30/Cargo.toml index f8c8c63e9c0..6be02ebf5c6 100644 --- a/packages/kubernetes-1.30/Cargo.toml +++ b/packages/kubernetes-1.30/Cargo.toml @@ -15,8 +15,8 @@ package-name = "kubernetes-1.30" [[package.metadata.build-package.external-files]] # TODO: update this URL to 1.30 release once available. -url = "https://distro.eks.amazonaws.com/kubernetes-1-29/releases/7/artifacts/kubernetes/v1.29.1/kubernetes-src.tar.gz" -sha512 = "9940027197f83702516775047664d3c30a83e69202dcca5aa89f320e78c27a930eb1373777277f240b3c5a63c351ccab3199c577424e760fe122692065895e2f" +url = "https://distro.eks.amazonaws.com/kubernetes-1-30/releases/3/artifacts/kubernetes/v1.30.0/kubernetes-src.tar.gz" +sha512 = "2becf971b5ebbc6752509bc04659b036c4fe99e1638a336436555d6403247094b69ab3bde2187391606de59e3a5b23acfce01a2d3c7f4e4b7516025e2812333c" # RPM BuildRequires [build-dependencies] @@ -25,7 +25,7 @@ glibc = { path = "../glibc" } # RPM Requires [dependencies] aws-signing-helper = { path = "../aws-signing-helper" } -ecr-credential-provider-1_29 = { path = "../ecr-credential-provider-1.29" } +ecr-credential-provider-1_30 = { path = "../ecr-credential-provider-1.30" } static-pods = { path = "../static-pods" } # `conntrack-tools`, `containerd` and `findutils` are only needed at runtime, # and are pulled in by `release`. diff --git a/packages/kubernetes-1.30/kubernetes-1.30.spec b/packages/kubernetes-1.30/kubernetes-1.30.spec index 175a4cea86e..4fe2f7eb873 100644 --- a/packages/kubernetes-1.30/kubernetes-1.30.spec +++ b/packages/kubernetes-1.30/kubernetes-1.30.spec @@ -10,8 +10,7 @@ %global gorepo kubernetes %global goimport %{goproject}/%{gorepo} -%global gover 1.29.1 -# %%global gover 1.30.0 +%global gover 1.30.0 %global rpmver %{gover} %global _dwz_low_mem_die_limit 0 @@ -33,7 +32,7 @@ Summary: Container cluster management # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause License: Apache-2.0 AND BSD-3-Clause URL: https://%{goimport} -Source0: https://distro.eks.amazonaws.com/kubernetes-1-30/releases/7/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz +Source0: https://distro.eks.amazonaws.com/kubernetes-1-30/releases/3/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz Source1: kubelet.service Source2: kubelet-env Source3: kubelet-config @@ -69,8 +68,7 @@ Summary: Container cluster node agent Requires: %{_cross_os}conntrack-tools Requires: %{_cross_os}containerd Requires: %{_cross_os}findutils -# TODO: update to ecr-credential-provider-1.30 -Requires: %{_cross_os}ecr-credential-provider-1.29 +Requires: %{_cross_os}ecr-credential-provider-1.30 Requires: %{_cross_os}aws-signing-helper Requires: %{_cross_os}static-pods Requires: %{_cross_os}kubelet-1.30(binaries) @@ -108,6 +106,9 @@ cp third_party/forked/golang/PATENTS PATENTS.golang %build export FORCE_HOST_GO=1 + +export GO_VERSION="1.22.2" + # Build codegen programs with the host toolchain. make hack/update-codegen.sh diff --git a/variants/Cargo.lock b/variants/Cargo.lock index 56d257fcde4..3176733797d 100644 --- a/variants/Cargo.lock +++ b/variants/Cargo.lock @@ -464,6 +464,13 @@ dependencies = [ "glibc", ] +[[package]] +name = "ecr-credential-provider-1_30" +version = "0.1.0" +dependencies = [ + "glibc", +] + [[package]] name = "ecs-agent" version = "0.1.0" @@ -694,7 +701,7 @@ name = "kubernetes-1_30" version = "0.1.0" dependencies = [ "aws-signing-helper", - "ecr-credential-provider-1_29", + "ecr-credential-provider-1_30", "glibc", "static-pods", ]