From 1303b09f3c20450b15a7f4bb897e145bf9659e10 Mon Sep 17 00:00:00 2001 From: Vineeth Bandi Date: Tue, 9 Jul 2024 13:50:58 -0500 Subject: [PATCH] update kubernetes for 1.27-1.30 --- projects/kubernetes/kubernetes/1-27/CHECKSUMS | 38 +++++++++---------- projects/kubernetes/kubernetes/1-27/GIT_TAG | 2 +- ...dmission-webhook-exclusion-from-file.patch | 4 +- ...PATCH-Fix-CVE-for-kube-proxy-v1.27.3.patch | 10 ++--- projects/kubernetes/kubernetes/1-28/CHECKSUMS | 38 +++++++++---------- projects/kubernetes/kubernetes/1-28/GIT_TAG | 2 +- ...dmission-webhook-exclusion-from-file.patch | 4 +- ...cd-storage_events_received_total-met.patch | 2 +- projects/kubernetes/kubernetes/1-29/CHECKSUMS | 38 +++++++++---------- projects/kubernetes/kubernetes/1-29/GIT_TAG | 2 +- ...dmission-webhook-exclusion-from-file.patch | 4 +- ...cd-storage_events_received_total-met.patch | 2 +- projects/kubernetes/kubernetes/1-30/CHECKSUMS | 38 +++++++++---------- projects/kubernetes/kubernetes/1-30/GIT_TAG | 2 +- ...dmission-webhook-exclusion-from-file.patch | 16 ++++---- ...-log-verbosity-for-node-health-and-t.patch | 1 + 16 files changed, 102 insertions(+), 101 deletions(-) diff --git a/projects/kubernetes/kubernetes/1-27/CHECKSUMS b/projects/kubernetes/kubernetes/1-27/CHECKSUMS index 0a4c79041e..96d7e43c9d 100644 --- a/projects/kubernetes/kubernetes/1-27/CHECKSUMS +++ b/projects/kubernetes/kubernetes/1-27/CHECKSUMS @@ -1,19 +1,19 @@ -c21ae7515a141fe47ae1b5fdc40aa95b811b1622a3e1046225f9468d3b6b26b0 _output/1-27/bin/darwin/amd64/kubectl -7a294a42a393e6df23cddc25a9fc58775a37b49cadb1e3e2b259429f0201d683 _output/1-27/bin/linux/amd64/kube-apiserver -ca72d42a5aa7678570860ad79ade50783ba8d38dd4cbd2cc9ca265c09fd1b6e2 _output/1-27/bin/linux/amd64/kube-controller-manager -b75f8d9f7f4cbdf6e9ae2ec5714a59b1cabf876c21a0d980bba52e962058dd18 _output/1-27/bin/linux/amd64/kube-proxy -75ba91c44e6d2422182d1eeceaca01ef2cba4512460d8d009d202d19a0a8d091 _output/1-27/bin/linux/amd64/kube-scheduler -018ecfdfac7f713e96ef50be9d1a40ba1f57bf1dbb597b043d7fa9e0378a5e6d _output/1-27/bin/linux/amd64/kubeadm -e34c14ce757ce328a315561f54cc61917d6ba6790de9831ea3a94e4a1c455042 _output/1-27/bin/linux/amd64/kubectl -8c60f30314811a0c786acc68bb27efd9d79971ad33e3c97cbf6a8d7f6e860faf _output/1-27/bin/linux/amd64/kubelet -cee09ce4395adc4358fbc79e5b175d21d8d9f46e248a09544fbfb7721cde76c0 _output/1-27/bin/linux/arm64/kube-apiserver -7d8ddc29de514ff6b9f6e660518b104905d6f6b1bc3a3c2a4c2eecdbad76abe4 _output/1-27/bin/linux/arm64/kube-controller-manager -1f9569b63b016d68422381a13b8823d36241a7ace8da845e210d4365eb51eeec _output/1-27/bin/linux/arm64/kube-proxy -59f52ad85b8848e56ab857447ced91b77a741f002948119f5c72180ead800cd1 _output/1-27/bin/linux/arm64/kube-scheduler -3402ab5f978bbf944b5fea1edd4e93e6e8df1cea968ec99283a0536845f02bd7 _output/1-27/bin/linux/arm64/kubeadm -061301b8ae4abbad030b81bbbf8f939db22c8369c0e69f8502889d309f8071cc _output/1-27/bin/linux/arm64/kubectl -a65248d009d888477dde6e79c5c0d0f471edececf18eb94641116c10786bc6a4 _output/1-27/bin/linux/arm64/kubelet -a8b3ef206c7ca352fb562bb7efb816050d9280bb9bd2f36edf9ba3189990acae _output/1-27/bin/windows/amd64/kube-proxy.exe -39b6e1c3eed3635e0b88474e064267db107e7e6f4206a91f557095076b31aa4f _output/1-27/bin/windows/amd64/kubeadm.exe -92b56511286b3410f8f2ebbc074953007936d9274975de0e52ca97f95a24e881 _output/1-27/bin/windows/amd64/kubectl.exe -b9439522010589195289609bbd5ef6c90ff6ca3a1ccad1a26af8bdc5a372ece7 _output/1-27/bin/windows/amd64/kubelet.exe +a4e574081574fae9fdbcb908e5ba6e9ec08d7b3c4eb0ef5482f8e8453af014a9 _output/1-27/bin/darwin/amd64/kubectl +641ae7914c888d54f04981456ee418262b99f257161fd227ae497607750603b4 _output/1-27/bin/linux/amd64/kube-apiserver +954c71ecde0a1d9e44f2bf8951f03865528451d451a72850edfddf6d2b09c5a0 _output/1-27/bin/linux/amd64/kube-controller-manager +1f51b60308065ec4a8e7ee720baf5c5c7f7d7950b159c0162aaaf6aaa419b3ec _output/1-27/bin/linux/amd64/kube-proxy +45cd61c636f4e7ae8144a6d546a1215e1327e312e68fe0f597736c02ed0563c0 _output/1-27/bin/linux/amd64/kube-scheduler +2e646e2ed3f74c746920ff699ac641dc285adf5f23bde8e33eeb8ddf0ac292c9 _output/1-27/bin/linux/amd64/kubeadm +a3ca736245a63660cbf4d9d2d396678d67b0c12f43bc6c047b635098b3015f4d _output/1-27/bin/linux/amd64/kubectl +c719fc839f68fc4d6e592301ca15cd945671f3c7fd1e05fa4027d25813060a14 _output/1-27/bin/linux/amd64/kubelet +590ce885261d857aac0cb96f7e207be2738084b18ca779aec55f0128692da8fa _output/1-27/bin/linux/arm64/kube-apiserver +44b62819e892ba5cebbf99dfdc300fcc4358475d745542e01a2020e87766d311 _output/1-27/bin/linux/arm64/kube-controller-manager +7d810341c9cd07af78851fe97203567a0101e3a589d41c3addf35380e78e9cfe _output/1-27/bin/linux/arm64/kube-proxy +6f7998bbbb87f247a71a90b01477abd934a5214d165def21457e2e8d8190baad _output/1-27/bin/linux/arm64/kube-scheduler +d3dd43a1ef6854d7e61a96e471ce3cea3be0d29433bc07501c526fbeca8458f0 _output/1-27/bin/linux/arm64/kubeadm +b16ffd43f93da3705630cae2e33654e046894de5ebe08d797c50074affb3cad1 _output/1-27/bin/linux/arm64/kubectl +87b5144e7bcfd9e3d332d5c0b59c70a15830c8a6f82e94b41808d453c7f70b55 _output/1-27/bin/linux/arm64/kubelet +011e4e7a1f570bff9ce5c7285d7bf1f1b58386783f4fbf87d5df2ac8eab17cf4 _output/1-27/bin/windows/amd64/kube-proxy.exe +c68dd9db05cf0db0942d3973260c39e1810827072562af9ba95dfa864f3e8e85 _output/1-27/bin/windows/amd64/kubeadm.exe +e7e8481b132a17723dfed9c4095b50d3422bf5ae9dafd62ee677e7fdc2d1f0f0 _output/1-27/bin/windows/amd64/kubectl.exe +46aa3d4ffe9b8943b456e52b0848b65bbbd88894357fa3a31270549ce10da146 _output/1-27/bin/windows/amd64/kubelet.exe diff --git a/projects/kubernetes/kubernetes/1-27/GIT_TAG b/projects/kubernetes/kubernetes/1-27/GIT_TAG index def2409fd3..c0929951a1 100644 --- a/projects/kubernetes/kubernetes/1-27/GIT_TAG +++ b/projects/kubernetes/kubernetes/1-27/GIT_TAG @@ -1 +1 @@ -v1.27.14 +v1.27.15 diff --git a/projects/kubernetes/kubernetes/1-27/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch b/projects/kubernetes/kubernetes/1-27/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch index bc91dd1a30..5f8b532c86 100644 --- a/projects/kubernetes/kubernetes/1-27/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch +++ b/projects/kubernetes/kubernetes/1-27/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch @@ -1765,10 +1765,10 @@ index 00000000000..2c26ca24870 + } +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index d729de0593b..151056e0981 100644 +index 0716864ed81..2486f8384ef 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt -@@ -1425,6 +1425,7 @@ k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1 +@@ -1427,6 +1427,7 @@ k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1 k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1 k8s.io/apiserver/pkg/admission/plugin/webhook/errors k8s.io/apiserver/pkg/admission/plugin/webhook/generic diff --git a/projects/kubernetes/kubernetes/1-27/patches/0005-EKS-PATCH-Fix-CVE-for-kube-proxy-v1.27.3.patch b/projects/kubernetes/kubernetes/1-27/patches/0005-EKS-PATCH-Fix-CVE-for-kube-proxy-v1.27.3.patch index ba714e9105..87308a4942 100644 --- a/projects/kubernetes/kubernetes/1-27/patches/0005-EKS-PATCH-Fix-CVE-for-kube-proxy-v1.27.3.patch +++ b/projects/kubernetes/kubernetes/1-27/patches/0005-EKS-PATCH-Fix-CVE-for-kube-proxy-v1.27.3.patch @@ -14,7 +14,7 @@ Updating go module github.com/docker/distribution to v2.8.2-beta.1 to solve CVE- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod -index 7c59efda633..e18d7a4519d 100644 +index 805cdc544d3..a5d22ca7019 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( @@ -27,7 +27,7 @@ index 7c59efda633..e18d7a4519d 100644 github.com/emicklei/go-restful/v3 v3.9.0 github.com/evanphx/json-patch v4.12.0+incompatible diff --git a/go.sum b/go.sum -index 4cf914614e0..fdbbd5e1d45 100644 +index 0d66b29cdcf..a5e6bc04757 100644 --- a/go.sum +++ b/go.sum @@ -335,8 +335,9 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm @@ -42,7 +42,7 @@ index 4cf914614e0..fdbbd5e1d45 100644 github.com/docker/docker v20.10.21+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod -index 7f2c1401630..5dd459d7e92 100644 +index bbac03d2d58..e310134fedc 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -8,7 +8,7 @@ require ( @@ -55,7 +55,7 @@ index 7f2c1401630..5dd459d7e92 100644 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d github.com/fatih/camelcase v1.0.0 diff --git a/staging/src/k8s.io/kubectl/go.sum b/staging/src/k8s.io/kubectl/go.sum -index 664baed7e34..fb3e3efa0fb 100644 +index a4b3477c8c0..969e01ddef1 100644 --- a/staging/src/k8s.io/kubectl/go.sum +++ b/staging/src/k8s.io/kubectl/go.sum @@ -29,8 +29,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c @@ -90,7 +90,7 @@ index 8c0c23b2fe1..b7cd00b0d68 100644 // // tag := /[\w][\w.-]{0,127}/ diff --git a/vendor/modules.txt b/vendor/modules.txt -index 151056e0981..95d609f307d 100644 +index 2486f8384ef..ca373fe039e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -182,7 +182,7 @@ github.com/davecgh/go-spew/spew diff --git a/projects/kubernetes/kubernetes/1-28/CHECKSUMS b/projects/kubernetes/kubernetes/1-28/CHECKSUMS index 17a42ae011..a0f053254a 100644 --- a/projects/kubernetes/kubernetes/1-28/CHECKSUMS +++ b/projects/kubernetes/kubernetes/1-28/CHECKSUMS @@ -1,19 +1,19 @@ -2e6de2d2c21e3303ec095e1ffee0b61f3b5583a3887c0da7892125082fe80e07 _output/1-28/bin/darwin/amd64/kubectl -38c05fe92fb21ce67f425c5722f46067360a85b5c690547289bf7d25b6fc350d _output/1-28/bin/linux/amd64/kube-apiserver -8afd5e91d75f7777e3d6511430f4d77810031f1eab587fb116834d82c5510850 _output/1-28/bin/linux/amd64/kube-controller-manager -036074846ca411e98ee712bdfa66836001f4f9b22173c715190cfbea2dee24d5 _output/1-28/bin/linux/amd64/kube-proxy -44b4c468f6d833a167d90cfac4aef52298e9f892fe4394ca60d767f7fdbe9486 _output/1-28/bin/linux/amd64/kube-scheduler -12f95c72f7bbe676b0a3f9d0f57733dac2f669cc5589a30829f5e644e1faa018 _output/1-28/bin/linux/amd64/kubeadm -edbba2b5f4d51580f8c579d19a9398df36950e6ba7bdbcac5b6b3c2b4e461af9 _output/1-28/bin/linux/amd64/kubectl -2881ed27cf9cff44191208caa452cbdcd1a58e8e34e152bb5ca725887f089bb1 _output/1-28/bin/linux/amd64/kubelet -e71cf69535b68e6faec6dfba4c97d678361fa85eebe7584d142854a3816ac790 _output/1-28/bin/linux/arm64/kube-apiserver -b3033ebf4a4e087ddda54de692e462e2b5e8a7ad76ef67dbb0f7f340e130db2b _output/1-28/bin/linux/arm64/kube-controller-manager -ff6bd6bae4813f3d44b880d7c10b9edccccd17022543ec17090e7bff7c7fa577 _output/1-28/bin/linux/arm64/kube-proxy -082830d285389deaa86ac1076e94a8e5d8efd6bdd99440bd481d0f6f915c2970 _output/1-28/bin/linux/arm64/kube-scheduler -c8917da576e975039d38072f1608640ed7484ea3b030c4533fe3556b3e8465c3 _output/1-28/bin/linux/arm64/kubeadm -c7aca5e606ab77cf5dddc844e4e608d4cfceeca428cd63deffd39c416d3f8590 _output/1-28/bin/linux/arm64/kubectl -eab672375468279698b55221f970b34f513fc2e05c3fd6390168f4a98c4db25c _output/1-28/bin/linux/arm64/kubelet -3677cab3f7c7081c9a4cb9ccad39290015d8874023ca66d77dc9e6ee6967439e _output/1-28/bin/windows/amd64/kube-proxy.exe -6083037e99ef21f3eb4dadb499afed82f3e48cfb5665fd6b5f6bb7ce6f73295c _output/1-28/bin/windows/amd64/kubeadm.exe -c24ba787144226f52b7e80746c684043549f4b0eedce981e8cd1fa784abf3c3a _output/1-28/bin/windows/amd64/kubectl.exe -a52856a0c53b8d987958f4ef83845f92ae69f93729075625014cf6a46d59810c _output/1-28/bin/windows/amd64/kubelet.exe +d4ebef7cc919adb099cb83dfdee7ed38edf15adb397a04fe6b252676070552a3 _output/1-28/bin/darwin/amd64/kubectl +61f3a1b60e604faaaf91d9a91f98fe6b68fe32281a06abf85cfe8a6dfe0c0b3d _output/1-28/bin/linux/amd64/kube-apiserver +137008dde86f03eacf237d3de52d700e34d544bd8690f281af80138f6618fe6c _output/1-28/bin/linux/amd64/kube-controller-manager +0de6bc15836309ebc6c4e3529308e4afbfaa3dde3d9ffd7f8f971a98df4960e0 _output/1-28/bin/linux/amd64/kube-proxy +229dc86e0f2a461bf09a5c311cbc9c15aaac3b1d40a4630c22e8b89134743a16 _output/1-28/bin/linux/amd64/kube-scheduler +b77b45315713b017035365758cb00e12fbed864f61b9b616762a4e5b3ad9d4c9 _output/1-28/bin/linux/amd64/kubeadm +fdd686849ad4628aa4187148f4ee2e654a6ca3ebb5d1ce1b5429f55221e8c111 _output/1-28/bin/linux/amd64/kubectl +c665b780e0beb3c9a89bd853828edb1fbd8ad4c4c8c734f1f59b0b1130d1b16c _output/1-28/bin/linux/amd64/kubelet +ca960f286240acc5661f25ab6bff39e23dd4df209f5a761d7e57af959ce28b0d _output/1-28/bin/linux/arm64/kube-apiserver +b6ba7f8909ae5e79a64e18c51d1d045651bbd8e23e0b01435096ae9dfad83ed0 _output/1-28/bin/linux/arm64/kube-controller-manager +dd02156a8479705fc5dad3035876b22a347c0812df7a9c102a57dc616ed3a4bd _output/1-28/bin/linux/arm64/kube-proxy +ad32cb478c99ccf4116faf6a2eddf6d28a30b76b98ecafcb4cc52a61f85d5b32 _output/1-28/bin/linux/arm64/kube-scheduler +8a83523f23d5ea0631c83dff759b3ab89dd3eab4237427db8286284e4ad08500 _output/1-28/bin/linux/arm64/kubeadm +62e58d7f1c2ea9b4b99475a17ddcb3cda9fe063af5a229d49e2ab58f13dbd77b _output/1-28/bin/linux/arm64/kubectl +6203e239c93765b55f9cf981436df9f45f811c2a2f436206591130e1b80625aa _output/1-28/bin/linux/arm64/kubelet +3a1d46b1a4036c0b57aebd64d2dec7d297dda1a10da89ebb1d8225f650776a96 _output/1-28/bin/windows/amd64/kube-proxy.exe +6df862149c3f9eab0a2d8036c0c977b40f0ba6d0c4d952ce66275d1198a935a2 _output/1-28/bin/windows/amd64/kubeadm.exe +1f7c8d0851d9d5e4f7cb4265e329cd874820b5dc75a9527e454a4b6e6ffe38ee _output/1-28/bin/windows/amd64/kubectl.exe +d02c8ee61fdcbbed9f9613ae6f69c345ff2a0cac3ec3a0d7b7c11788120c30a4 _output/1-28/bin/windows/amd64/kubelet.exe diff --git a/projects/kubernetes/kubernetes/1-28/GIT_TAG b/projects/kubernetes/kubernetes/1-28/GIT_TAG index 0e0ec18a4c..5777589c41 100644 --- a/projects/kubernetes/kubernetes/1-28/GIT_TAG +++ b/projects/kubernetes/kubernetes/1-28/GIT_TAG @@ -1 +1 @@ -v1.28.10 +v1.28.11 diff --git a/projects/kubernetes/kubernetes/1-28/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch b/projects/kubernetes/kubernetes/1-28/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch index 10bbdce369..26c2bb459c 100644 --- a/projects/kubernetes/kubernetes/1-28/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch +++ b/projects/kubernetes/kubernetes/1-28/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch @@ -1765,10 +1765,10 @@ index 00000000000..2c26ca24870 + } +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index fda86da98db..e6e3b5419be 100644 +index a33eb6490ea..ea6c1c4bb31 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt -@@ -1445,6 +1445,7 @@ k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1 +@@ -1447,6 +1447,7 @@ k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1 k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1 k8s.io/apiserver/pkg/admission/plugin/webhook/errors k8s.io/apiserver/pkg/admission/plugin/webhook/generic diff --git a/projects/kubernetes/kubernetes/1-28/patches/0003-EKS-PATCH-Fix-etcd-storage_events_received_total-met.patch b/projects/kubernetes/kubernetes/1-28/patches/0003-EKS-PATCH-Fix-etcd-storage_events_received_total-met.patch index ca5422ea9d..c55f2f863d 100644 --- a/projects/kubernetes/kubernetes/1-28/patches/0003-EKS-PATCH-Fix-etcd-storage_events_received_total-met.patch +++ b/projects/kubernetes/kubernetes/1-28/patches/0003-EKS-PATCH-Fix-etcd-storage_events_received_total-met.patch @@ -14,7 +14,7 @@ https://github.com/kubernetes/kubernetes/commit/ceb7ca93875cd74bea60500812cf7f02 1 file changed, 1 insertion(+) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go -index ac023d55d8c..bb2b86e2129 100644 +index e3147323d7b..bc3462b66eb 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go @@ -167,6 +167,7 @@ func Register() { diff --git a/projects/kubernetes/kubernetes/1-29/CHECKSUMS b/projects/kubernetes/kubernetes/1-29/CHECKSUMS index f2a9feedc9..6dc2499602 100644 --- a/projects/kubernetes/kubernetes/1-29/CHECKSUMS +++ b/projects/kubernetes/kubernetes/1-29/CHECKSUMS @@ -1,19 +1,19 @@ -e1f1d7d3842a08e8c0f7fc232919f400f60fdbc356b62e43a943aa87b845314b _output/1-29/bin/darwin/amd64/kubectl -bd3bc76f6528a76b77ddce892fe8ee01b2dbc93411a0ca0f28d5977a72d27127 _output/1-29/bin/linux/amd64/kube-apiserver -f34844e51256a3fc06b47e20f00eed32395c8542b9c207af2abb1a4044874cfe _output/1-29/bin/linux/amd64/kube-controller-manager -6a7a7859fe14c84130b32b5f2fce7ca7dec6f52b07ec143a2b8fc399686a8044 _output/1-29/bin/linux/amd64/kube-proxy -2308170a06cb660cf28e00ab370cb7ff0dc03799f8ce10134c3a19a6116d51b4 _output/1-29/bin/linux/amd64/kube-scheduler -2b6b25c2e69f44971e6198bd3d28031242af3f24cd32a77265efb98afb23b0fd _output/1-29/bin/linux/amd64/kubeadm -1fda527ed21006d85e78f91ef953621cebc9cbe05e6e5dc57d8886fafdbe3525 _output/1-29/bin/linux/amd64/kubectl -2b94cbffac6fc6c562f7ec60c94e381d510721220e89188e1daea5f4a0998ea1 _output/1-29/bin/linux/amd64/kubelet -ff4c9b13ef9c3f92039fdd9cce34f90ab2e530c8ed5c96205de2117ba11403a8 _output/1-29/bin/linux/arm64/kube-apiserver -31238384078d62322950619be21e1632518845a3192f523e18e76f88f69ac944 _output/1-29/bin/linux/arm64/kube-controller-manager -ab6d9af98c858019e54105a2109d15ecccb9c50ea6f4dc2a00cbb9175923c2c9 _output/1-29/bin/linux/arm64/kube-proxy -19132f74ff50c32a211f546b51123971d3c0f3b14d690f39ee5fd986a992ba7a _output/1-29/bin/linux/arm64/kube-scheduler -d063d34496077e335ca2359a03b4304e477a518adf8158c31828ecff49d5adee _output/1-29/bin/linux/arm64/kubeadm -5aa92d112371c1fcdfe58acc8c3306b9c146f1afa8cb53d17ca6e18ff52858e3 _output/1-29/bin/linux/arm64/kubectl -b916b93e2a8c17e92277d0d5d23024c266e35adbb297378c746c150f74308451 _output/1-29/bin/linux/arm64/kubelet -315e776b5c159a8bc60efe67b0c213f0168447666d679dabf27e190332747890 _output/1-29/bin/windows/amd64/kube-proxy.exe -cfb6499b64915affe9087a6b3d0069735d042ce560dffc88758a5ebb5fc8e33d _output/1-29/bin/windows/amd64/kubeadm.exe -c2972fb86d109cebbf691247b6b7adfccdde0ab058ba05c59e6579f0a7165046 _output/1-29/bin/windows/amd64/kubectl.exe -4ca28b0fc5b6673c5212dc278ef3e095b1fefb637e4f6e3cc47c8f6a82aa64ff _output/1-29/bin/windows/amd64/kubelet.exe +601df2f85625a142aa91522b8b0d0874864863a3cb7e37640e095795d38ea288 _output/1-29/bin/darwin/amd64/kubectl +e59034178810e9e830ec671b7a979afe2ffa479036eb55cb05276b751c79c283 _output/1-29/bin/linux/amd64/kube-apiserver +d9907385e5807087eafa35b539082164330db79a0524602369e575bbc84bc5f4 _output/1-29/bin/linux/amd64/kube-controller-manager +590e35986dd08e47cf455ef0491aecff13f3a42d4d6517af332fd9d5a1f9ad24 _output/1-29/bin/linux/amd64/kube-proxy +899e2f9b0ad3e4151c2ea8e1dc8e91550284f33427b933031cb3c923520da151 _output/1-29/bin/linux/amd64/kube-scheduler +b719d13c186cee1faf7f92a178051852484aa585783f12dc2ea88339b211b722 _output/1-29/bin/linux/amd64/kubeadm +d2ca97401b4f71963125981e076ed0f61e4e423805871be14cd486626ec594d0 _output/1-29/bin/linux/amd64/kubectl +2b53c75cf5cb075e882afee031087f04bd64e08e99959567509abf3fefc4b9e5 _output/1-29/bin/linux/amd64/kubelet +65987e54596f3ee83aa62f32d5b9c9cfd61dc21a3a66cfc94990271d7bb3b18e _output/1-29/bin/linux/arm64/kube-apiserver +e4092be87d5a344b56ea55fd0bf68d9f7b9e3d77e553d9339d84c26f10997ec0 _output/1-29/bin/linux/arm64/kube-controller-manager +7331c38d52a67c90f8613daa19c986c8beae9d3ed1cdf95082b9212f81192a58 _output/1-29/bin/linux/arm64/kube-proxy +eff548516cf268918d5cdc67e076e50e9555dbd7097d317271bc3dcfb43938a2 _output/1-29/bin/linux/arm64/kube-scheduler +2985e3d70bc0a8d43bd0f4934911ea4c04de14b15e17ce7e04d42adc0ac7b43d _output/1-29/bin/linux/arm64/kubeadm +1f146ae41999cdb3b316a2d75555dc32faa590ede0d6e0028cd254cafc04de0d _output/1-29/bin/linux/arm64/kubectl +9009d0f55fc479383ee90b5a0cfed2c83f184dedf47777f701e7f904c51e0790 _output/1-29/bin/linux/arm64/kubelet +b8fc635171e61f9f770e8ed59236255f7f42392a96a8f418a4424170b60552e6 _output/1-29/bin/windows/amd64/kube-proxy.exe +56e24a9cb654681f399123ff17d96807a5edbb655e10a01ed3090d98c0db4e1f _output/1-29/bin/windows/amd64/kubeadm.exe +72dcc9057fa9959a21ef04736f4e89ce4e51c823d5a4904fe1e943e537e0c23f _output/1-29/bin/windows/amd64/kubectl.exe +f92545c7ff859cebccce46ed5578707597a640116191e40e5c48d2c9db7afbc9 _output/1-29/bin/windows/amd64/kubelet.exe diff --git a/projects/kubernetes/kubernetes/1-29/GIT_TAG b/projects/kubernetes/kubernetes/1-29/GIT_TAG index e5bb4cbb1f..84f4142f1b 100644 --- a/projects/kubernetes/kubernetes/1-29/GIT_TAG +++ b/projects/kubernetes/kubernetes/1-29/GIT_TAG @@ -1 +1 @@ -v1.29.5 +v1.29.6 diff --git a/projects/kubernetes/kubernetes/1-29/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch b/projects/kubernetes/kubernetes/1-29/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch index 9a3f404b6b..bbd6e61cbb 100644 --- a/projects/kubernetes/kubernetes/1-29/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch +++ b/projects/kubernetes/kubernetes/1-29/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch @@ -1765,10 +1765,10 @@ index 00000000000..2c26ca24870 + } +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index b949fa35b4a..56039fb088c 100644 +index b2f3afe5514..09a050491a3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt -@@ -1474,6 +1474,7 @@ k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1 +@@ -1476,6 +1476,7 @@ k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1 k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1 k8s.io/apiserver/pkg/admission/plugin/webhook/errors k8s.io/apiserver/pkg/admission/plugin/webhook/generic diff --git a/projects/kubernetes/kubernetes/1-29/patches/0003-EKS-PATCH-Fix-etcd-storage_events_received_total-met.patch b/projects/kubernetes/kubernetes/1-29/patches/0003-EKS-PATCH-Fix-etcd-storage_events_received_total-met.patch index c8dd43ae3a..9e6a7eb115 100644 --- a/projects/kubernetes/kubernetes/1-29/patches/0003-EKS-PATCH-Fix-etcd-storage_events_received_total-met.patch +++ b/projects/kubernetes/kubernetes/1-29/patches/0003-EKS-PATCH-Fix-etcd-storage_events_received_total-met.patch @@ -14,7 +14,7 @@ https://github.com/kubernetes/kubernetes/commit/ceb7ca93875cd74bea60500812cf7f02 1 file changed, 1 insertion(+) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go -index fadc87d53de..7bf597d3a4b 100644 +index 1c0307bd913..f5948bf0c0e 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go @@ -167,6 +167,7 @@ func Register() { diff --git a/projects/kubernetes/kubernetes/1-30/CHECKSUMS b/projects/kubernetes/kubernetes/1-30/CHECKSUMS index e330ca8136..83659141bd 100644 --- a/projects/kubernetes/kubernetes/1-30/CHECKSUMS +++ b/projects/kubernetes/kubernetes/1-30/CHECKSUMS @@ -1,19 +1,19 @@ -eae42a1a8ae6240f541695dd52619554049e9f2b53d12b8b220413259da38be1 _output/1-30/bin/darwin/amd64/kubectl -bc87e3a851eacea1e24d1680e644760c9f32652018eb6ee0b4ba88c2a8a5a271 _output/1-30/bin/linux/amd64/kube-apiserver -6b1380f6adeb6b6984683c0da7a3104788056251685036753f1d57c1dae73355 _output/1-30/bin/linux/amd64/kube-controller-manager -da7356712ec81cbfae4337ae40068d7cc5acc27e7014b164566095bc9c9d6fb7 _output/1-30/bin/linux/amd64/kube-proxy -0e20991440e7a469fcf568cf33cda381046c9b7a3fd56c37383601776060fa92 _output/1-30/bin/linux/amd64/kube-scheduler -275327a48088ac1f77f56b41bd02a73e5d25b3d5b1b60cde97a8868868fea7ee _output/1-30/bin/linux/amd64/kubeadm -8c6540079bb4d00de0b18d99c4854ec75e6aef90448c634ebf71fb378eda4239 _output/1-30/bin/linux/amd64/kubectl -d3cf5e8e49b138a3c4a13ad426e27b33eb3ef9d74c0d50f77ded3274e145f466 _output/1-30/bin/linux/amd64/kubelet -be759041690b26642ea5a5290bc3fbee56981e4449332b10fef50d75011542c5 _output/1-30/bin/linux/arm64/kube-apiserver -af7cffc8136b459459043cdba902e45038c80c23e4c24b1439a292197b3f07d1 _output/1-30/bin/linux/arm64/kube-controller-manager -6209f986307c0ed428ce4afc78472dfb12d52bd3ec8162510d5269615e78cc03 _output/1-30/bin/linux/arm64/kube-proxy -c438d029065a9566af3c7f3bba3f8ed731d230ecb8165c2136271d1b7606552d _output/1-30/bin/linux/arm64/kube-scheduler -21b7b7b368ddb2e24b2ce70f73df6b47ab8b088a98442ed6d55eacf3bf56c0b5 _output/1-30/bin/linux/arm64/kubeadm -b673be130d3b1930c73a299a3c7fefc3bd379dcd141c0660680d33ffb5bd50ce _output/1-30/bin/linux/arm64/kubectl -b8d0ec8c856312fb96493eb5cfd4765053183e35cd45db191d9b17fd8512a64a _output/1-30/bin/linux/arm64/kubelet -2c34330032cbb066cac418c72619dc22bb9539dfdb7d015aae7072d7b2264241 _output/1-30/bin/windows/amd64/kube-proxy.exe -340ed314d46fddc83cdc53aba8f9c93b3970e21bca1bd7fac18dcda912258a6b _output/1-30/bin/windows/amd64/kubeadm.exe -30eceda0d77854f7747939dbb9eae42d2b8b18f47b8fd7b5154a1c76bbde7e7f _output/1-30/bin/windows/amd64/kubectl.exe -82a7994ea2f3fc9c4e08a44ed8bb270a6e026813a1f49821dedeb7cecd766a75 _output/1-30/bin/windows/amd64/kubelet.exe +ac6c3266311967f9e0b8e54e6119a71976a40cdd642693e40450b2f8528df5e6 _output/1-30/bin/darwin/amd64/kubectl +ae721ea13859cb27acc7072d6b5855e5490a7b6dfa537b05fb7bbda0a2ba422c _output/1-30/bin/linux/amd64/kube-apiserver +1d486a6f528bbaed4431fa4eb24d2fbb1a1d059dc7b60cb28426f1a2a2bfab12 _output/1-30/bin/linux/amd64/kube-controller-manager +20b4d75a18469e57ce91ae178356fb6f051010a4d221f828679e1648fce741e9 _output/1-30/bin/linux/amd64/kube-proxy +79b23b6f4f471c798eaacc88f3a202bff924c7c8356c717e11a8e17af63c53ae _output/1-30/bin/linux/amd64/kube-scheduler +29bdfe4b131025059da73f2fc7f734edc86939196da6e7f80ac23284c62bbebb _output/1-30/bin/linux/amd64/kubeadm +e63e9d22d1f02b16aada762a04847d09dfc8e2bec9e627843951f060f440066c _output/1-30/bin/linux/amd64/kubectl +856ed697f3eee14d394658b299a0d4fab580afd4418fd2f205a72ef0472be056 _output/1-30/bin/linux/amd64/kubelet +85896a7c880dc4d0df67e49d18e38cac729c5ecccb8b63c2ca0d754d4aaea2eb _output/1-30/bin/linux/arm64/kube-apiserver +c0cba6fbdf08cd99411f6c5c8fe1a41a38102fe066b3a34dcb486b483275f547 _output/1-30/bin/linux/arm64/kube-controller-manager +f2d699995ac853f48eabcd8f03796b29a52c07bde5d5e472b221ab77410ecea7 _output/1-30/bin/linux/arm64/kube-proxy +3a6fb7017b87a95b2c68e204b3605c72de4f1205ff4b618fdc6f2daea47214b6 _output/1-30/bin/linux/arm64/kube-scheduler +b27ef039bc86280aff3c7770645922ab933522e3e996ec4ad90f5075087983ba _output/1-30/bin/linux/arm64/kubeadm +a581f362b099ee512a3a0336b82349ef663dc1a1ba869159143f0339ede1e7ec _output/1-30/bin/linux/arm64/kubectl +4a18cdf2d45b21e450f642120f8cdf97895294405d6ae7e1669c4899832b1067 _output/1-30/bin/linux/arm64/kubelet +3887d3cafbc3521e98eee845e5df26e1acb7154fedd0c3197205bf60a6a97f49 _output/1-30/bin/windows/amd64/kube-proxy.exe +f1aa11f13d83894a6db0dc10440d043f32172cc2fba38fce7536ae48d39138b2 _output/1-30/bin/windows/amd64/kubeadm.exe +7a39dbd10f1f8303e305ee26b141a654156577df6838e64ced6563167e3d725b _output/1-30/bin/windows/amd64/kubectl.exe +7a7f17f5d64636bb72cb960e4f5c0fe9c4767b142cb1f3f15e20fc0a48739d67 _output/1-30/bin/windows/amd64/kubelet.exe diff --git a/projects/kubernetes/kubernetes/1-30/GIT_TAG b/projects/kubernetes/kubernetes/1-30/GIT_TAG index 46aa51be07..34d1a6e0cd 100644 --- a/projects/kubernetes/kubernetes/1-30/GIT_TAG +++ b/projects/kubernetes/kubernetes/1-30/GIT_TAG @@ -1 +1 @@ -v1.30.1 +v1.30.2 diff --git a/projects/kubernetes/kubernetes/1-30/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch b/projects/kubernetes/kubernetes/1-30/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch index f5e239177d..dcf02f389c 100644 --- a/projects/kubernetes/kubernetes/1-30/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch +++ b/projects/kubernetes/kubernetes/1-30/patches/0001-EKS-PATCH-admission-webhook-exclusion-from-file.patch @@ -1419,7 +1419,7 @@ index 00000000000..9925764a5b9 + } +} diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/generic/webhook.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/generic/webhook.go -index 6a513f1c11a..dd1b3337583 100644 +index f067b3f723c..4156df0157c 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/generic/webhook.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/generic/webhook.go @@ -20,6 +20,8 @@ import ( @@ -1428,13 +1428,13 @@ index 6a513f1c11a..dd1b3337583 100644 "io" + "k8s.io/apiserver/pkg/admission/plugin/webhook/generic/exclusionrules" + "sync" - - admissionmetrics "k8s.io/apiserver/pkg/admission/metrics" + "k8s.io/klog/v2" -@@ -44,6 +46,20 @@ import ( + +@@ -46,6 +48,20 @@ import ( clientset "k8s.io/client-go/kubernetes" ) - + +var criticalPathExcluder exclusionrules.CriticalPathExcluder +var LoadCriticalPathExcluder *sync.Once + @@ -1452,10 +1452,10 @@ index 6a513f1c11a..dd1b3337583 100644 // Webhook is an abstract admission plugin with all the infrastructure to define Admit or Validate on-top. type Webhook struct { *admission.Handler -@@ -93,6 +109,10 @@ func NewWebhook(handler *admission.Handler, configFile io.Reader, sourceFactory +@@ -95,6 +111,10 @@ func NewWebhook(handler *admission.Handler, configFile io.Reader, sourceFactory cm.SetAuthenticationInfoResolver(authInfoResolver) cm.SetServiceResolver(webhookutil.NewDefaultServiceResolver()) - + + LoadCriticalPathExcluder.Do(func() { + criticalPathExcluder = exclusionrules.NewCriticalPathExcluder() + }) @@ -1463,7 +1463,7 @@ index 6a513f1c11a..dd1b3337583 100644 return &Webhook{ Handler: handler, sourceFactory: sourceFactory, -@@ -166,6 +186,10 @@ func (a *Webhook) ShouldCallHook(ctx context.Context, h webhook.WebhookAccessor, +@@ -168,6 +188,10 @@ func (a *Webhook) ShouldCallHook(ctx context.Context, h webhook.WebhookAccessor, return nil, nil } diff --git a/projects/kubernetes/kubernetes/1-30/patches/0002-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch b/projects/kubernetes/kubernetes/1-30/patches/0002-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch index e5634048fb..3c6a9cd856 100644 --- a/projects/kubernetes/kubernetes/1-30/patches/0002-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch +++ b/projects/kubernetes/kubernetes/1-30/patches/0002-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch @@ -5,6 +5,7 @@ Subject: [PATCH] --EKS-PATCH-- Update log verbosity for node health and taint checks cherrypick of https://github.com/kubernetes/kubernetes/pull/121967 +For more details https://t.corp.amazon.com/V1088905731 Signed-off-by: torredil ---