diff --git a/packages/kubernetes-1.28/0001-Make-gomaxprocs-install-optional-limit-to-tests.patch b/packages/kubernetes-1.28/0001-Make-gomaxprocs-install-optional-limit-to-tests.patch deleted file mode 100644 index b110fcc49d0..00000000000 --- a/packages/kubernetes-1.28/0001-Make-gomaxprocs-install-optional-limit-to-tests.patch +++ /dev/null @@ -1,78 +0,0 @@ -From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001 -From: Jordan Liggitt -Date: Wed, 16 Aug 2023 09:33:02 -0400 -Subject: [PATCH] Make gomaxprocs install optional, limit to tests - ---- - hack/lib/golang.sh | 25 +++++++++++++++---------- - hack/make-rules/test-e2e-node.sh | 1 + - hack/make-rules/test.sh | 1 + - 3 files changed, 17 insertions(+), 10 deletions(-) - -diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh -index 66772f08a81..983ff368e25 100755 ---- a/hack/lib/golang.sh -+++ b/hack/lib/golang.sh -@@ -556,20 +556,25 @@ kube::golang::setup_env() { - - # This seems to matter to some tools - export GO15VENDOREXPERIMENT=1 -+} - -+kube::golang::setup_gomaxprocs() { - # GOMAXPROCS by default does not reflect the number of cpu(s) available - # when running in a container, please see https://github.com/golang/go/issues/33803 -- if ! command -v ncpu >/dev/null 2>&1; then -- # shellcheck disable=SC2164 -- pushd "${KUBE_ROOT}/hack/tools" >/dev/null -- GO111MODULE=on go install ./ncpu -- # shellcheck disable=SC2164 -- popd >/dev/null -+ if [[ -z "${GOMAXPROCS:-}" ]]; then -+ if ! command -v ncpu >/dev/null 2>&1; then -+ # shellcheck disable=SC2164 -+ pushd "${KUBE_ROOT}/hack/tools" >/dev/null -+ GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS" -+ # shellcheck disable=SC2164 -+ popd >/dev/null -+ fi -+ if command -v ncpu >/dev/null 2>&1; then -+ GOMAXPROCS=$(ncpu) -+ export GOMAXPROCS -+ kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}" -+ fi - fi -- -- GOMAXPROCS=${GOMAXPROCS:-$(ncpu)} -- export GOMAXPROCS -- kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}" - } - - # This will take binaries from $GOPATH/bin and copy them to the appropriate -diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh -index 43dde0c740f..49e3e04ac71 100755 ---- a/hack/make-rules/test-e2e-node.sh -+++ b/hack/make-rules/test-e2e-node.sh -@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. - source "${KUBE_ROOT}/hack/lib/init.sh" - - kube::golang::setup_env -+kube::golang::setup_gomaxprocs - - # start the cache mutation detector by default so that cache mutators will be found - KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" -diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh -index e9074678a8f..4aa72730d83 100755 ---- a/hack/make-rules/test.sh -+++ b/hack/make-rules/test.sh -@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../.. - source "${KUBE_ROOT}/hack/lib/init.sh" - - kube::golang::setup_env -+kube::golang::setup_gomaxprocs - - # start the cache mutation detector by default so that cache mutators will be found - KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}" --- -2.25.1 - diff --git a/packages/kubernetes-1.28/Cargo.toml b/packages/kubernetes-1.28/Cargo.toml index c0b0f5210d9..a85989e0588 100644 --- a/packages/kubernetes-1.28/Cargo.toml +++ b/packages/kubernetes-1.28/Cargo.toml @@ -14,8 +14,8 @@ path = "../packages.rs" package-name = "kubernetes-1.28" [[package.metadata.build-package.external-files]] -url = "https://distro.eks.amazonaws.com/kubernetes-1-28/releases/2/artifacts/kubernetes/v1.28.0/kubernetes-src.tar.gz" -sha512 = "2ac33a02a614c59f8c347a82daad9cfe4332599c25e3e220fb66055ff156cfdcbf1079489a272c685893ffbe25bcc6cbbcde9327357604924c575fd83fabe1b6" +url = "https://distro.eks.amazonaws.com/kubernetes-1-28/releases/4/artifacts/kubernetes/v1.28.1/kubernetes-src.tar.gz" +sha512 = "b65c9144cc2af9a4311a14912a5e338f12b661e8efee0c04fa79f1d09967507c5b6cf7657c909bd5bbd5d5126b1fea238f940a8cd678af04ca841197b30df36d" # RPM BuildRequires [build-dependencies] diff --git a/packages/kubernetes-1.28/kubernetes-1.28.spec b/packages/kubernetes-1.28/kubernetes-1.28.spec index 82a9deadd6b..341618b92a7 100644 --- a/packages/kubernetes-1.28/kubernetes-1.28.spec +++ b/packages/kubernetes-1.28/kubernetes-1.28.spec @@ -10,7 +10,7 @@ %global gorepo kubernetes %global goimport %{goproject}/%{gorepo} -%global gover 1.28.0 +%global gover 1.28.1 %global rpmver %{gover} %global _dwz_low_mem_die_limit 0 @@ -55,8 +55,6 @@ Source22: make-kubelet-dirs.conf Source1000: clarify.toml -Patch9001: 0001-Make-gomaxprocs-install-optional-limit-to-tests.patch - BuildRequires: git BuildRequires: rsync BuildRequires: %{_cross_os}glibc-devel