diff --git a/projects/kubernetes/kubernetes/1-27/CHECKSUMS b/projects/kubernetes/kubernetes/1-27/CHECKSUMS index 0a4c79041e..4a579e99b9 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 +21c96bd82aa91b21650b257bee2cde4f4ec3f4bd5f00c227ab83142e59c2ce1b _output/1-27/bin/darwin/amd64/kubectl +5c8a5046a35e063fa982a47c27fcb5424f32a683d661fd948d81c15cad25271b _output/1-27/bin/linux/amd64/kube-apiserver +2e8c5d51551a70cb3dbf6665e06291530f65f15d55cf09cfe3244e913b57053d _output/1-27/bin/linux/amd64/kube-controller-manager +e9e72e968fde423ff91afcd7d233cb5d993e9c07b790671ca6223ab5e479b0d1 _output/1-27/bin/linux/amd64/kube-proxy +6e05198b615a6ecc7102ec8c7a66cda61fbd86998c735945443ec3adc77efe04 _output/1-27/bin/linux/amd64/kube-scheduler +daa6257b2821264f3a8ec288fb21b11ba81a1d6e4d089ad404ee08e8e04bc94e _output/1-27/bin/linux/amd64/kubeadm +187e6f995b7d22455cefda2e530c2459c141b8f8eda27f482efc2de2f3422565 _output/1-27/bin/linux/amd64/kubectl +8e596615120696c3f4b1eceaaee5f2619aeb35235dcc67702d0e02bd3eb0ff0d _output/1-27/bin/linux/amd64/kubelet +d081b6348d3cea2fe6ac3512865f5e83d6c1ef5e689245aaf1be7922b444dfb1 _output/1-27/bin/linux/arm64/kube-apiserver +d9d7deee1bd631deb5e4949e93341dba9f3198f6e819b0f3f5656e2f84e20dd1 _output/1-27/bin/linux/arm64/kube-controller-manager +14ee89784bee8d89e8d6d490840fa70f2056e41ffbbba2e948ec8479ae3b9776 _output/1-27/bin/linux/arm64/kube-proxy +9f3499a4a9356596e8b311990b22f9d0805e7af7c93c8184ae0c7c34a17bb4e8 _output/1-27/bin/linux/arm64/kube-scheduler +72dc3cfbe08c4a0e8052465fe7381d03c253d51c1f0a87fbb723e3ad453e4bea _output/1-27/bin/linux/arm64/kubeadm +266d7c770d000d9015b20d6471552366f9f988237d53186b3360be881c12f273 _output/1-27/bin/linux/arm64/kubectl +75d30857eeea33b54d8da568b91785ce36f6f5f2c7a941c9152882a04d8fffc3 _output/1-27/bin/linux/arm64/kubelet +af88a7ff0d31fb01af92dbecc8b5703d73ac384c932c9e5e2110b3b6cf3495ba _output/1-27/bin/windows/amd64/kube-proxy.exe +d9229121e5c1ccd93fc5e9ab6c79b0d58dab2e1c30090c771e8f5ed45a4e1b39 _output/1-27/bin/windows/amd64/kubeadm.exe +0531f1909ba40dcadf97cf1b24f7245a8ba1baa08e45ab51cf1c460a8d6b5d32 _output/1-27/bin/windows/amd64/kubectl.exe +8534058e4d41e81609d6dcaf6eec8144f44f82cd7b3974ac5393bf738d5dd6d4 _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-27/patches/0010-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch b/projects/kubernetes/kubernetes/1-27/patches/0010-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch index a0a1f230ab..db00a38dd2 100644 --- a/projects/kubernetes/kubernetes/1-27/patches/0010-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch +++ b/projects/kubernetes/kubernetes/1-27/patches/0010-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch @@ -5,7 +5,6 @@ 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 --- diff --git a/projects/kubernetes/kubernetes/1-28/CHECKSUMS b/projects/kubernetes/kubernetes/1-28/CHECKSUMS index 17a42ae011..7f74e26e3f 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 +a1c3c9e2fd483594bcf4c560e92faa0870a8906924dec466ba754dfb26affb20 _output/1-28/bin/darwin/amd64/kubectl +7abf5b8fbd2a32da517c7c819f1db9b6e5209fb69f4483143f4baaacae822399 _output/1-28/bin/linux/amd64/kube-apiserver +a4935207fcb4b0f7741c611eb8d675fcc75a752ac4e5df64b4df22283bafa521 _output/1-28/bin/linux/amd64/kube-controller-manager +4dc2156d7026f1e66ad88441058c9a172971775025be7ef4c247d2e4982e1e59 _output/1-28/bin/linux/amd64/kube-proxy +a7a95c28f69732b825ba1c7eaae7131c8f44d71786c8680a01b179d2f527a372 _output/1-28/bin/linux/amd64/kube-scheduler +ac29a67f1698904fc44f322b22bd9fa3a2f221d28abe64452955b1027ef13f1a _output/1-28/bin/linux/amd64/kubeadm +fa4983dda656cf9e64601d33da0d43f3a468b361cadda1c97ee3eb68773032b6 _output/1-28/bin/linux/amd64/kubectl +7ff9d3baf2d229ea2742a8a44ff72094e060f0b45613e3cb958a5a7fda7abbca _output/1-28/bin/linux/amd64/kubelet +e580760d313f5b918fc101a69ee5551bd7db398a2a0e1c2f98c5594df12cf029 _output/1-28/bin/linux/arm64/kube-apiserver +98a566838955e01d402953a91e5771d68817056948733b57f0922aea0db9ffa2 _output/1-28/bin/linux/arm64/kube-controller-manager +81a047f04d4e431fe0aff868f3269bb8158d4655e4afecb1153383274c15394c _output/1-28/bin/linux/arm64/kube-proxy +7acf131ceeb2a63fc3b4485dbf9430ea8259b8b812ac8f8e98bf41e389b9b9aa _output/1-28/bin/linux/arm64/kube-scheduler +94237f813884e503c217e41005b8a2d4ab44dd314319d7b0f8c1e9e4cb6dc725 _output/1-28/bin/linux/arm64/kubeadm +77ecceaf9a8ba9103cc499ce567c4d12f6aeccc009acb479fcfdd615be4ecbc0 _output/1-28/bin/linux/arm64/kubectl +7af8e6755502da09af3beca675d0d8c30a78ab6365c5344e81795ca949940835 _output/1-28/bin/linux/arm64/kubelet +df12fc6e5819a11d4a1e44506c964aea19fcdd8f4a73a163492526f2a04b2cfb _output/1-28/bin/windows/amd64/kube-proxy.exe +0ad118a641fd5385dea71b7224cfb8d12211e0db254172cddefd8f6a577d8ad3 _output/1-28/bin/windows/amd64/kubeadm.exe +6a17b0b2f937327362345d2111064c67fb566a3a607289c98dec8e23aad64ba1 _output/1-28/bin/windows/amd64/kubectl.exe +3dae2c104d6f5346e8d2922f3314e9907118b1d378214e437c348b5c87bd4626 _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-28/patches/0006-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch b/projects/kubernetes/kubernetes/1-28/patches/0006-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch index 7dcf723d31..fea814c5d6 100644 --- a/projects/kubernetes/kubernetes/1-28/patches/0006-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch +++ b/projects/kubernetes/kubernetes/1-28/patches/0006-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch @@ -5,7 +5,6 @@ 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 --- diff --git a/projects/kubernetes/kubernetes/1-29/CHECKSUMS b/projects/kubernetes/kubernetes/1-29/CHECKSUMS index f2a9feedc9..9ec3af710a 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 +15d3cafcb43818fbc4c4e03982dc2e13534a07915d8b98f2ab06edf7498beaf7 _output/1-29/bin/darwin/amd64/kubectl +dbef4186a4282922ad3688b9b398682f8190451a0742b42d63e1faa289a17692 _output/1-29/bin/linux/amd64/kube-apiserver +4210adffe7f071fa9fd84245f5be9b5a922199ab20ba87c9ff6b9015ecf2bda7 _output/1-29/bin/linux/amd64/kube-controller-manager +e4c4737d9094884604eacb5e787099d06f46695532f4f3b4cb71218e1d9cea81 _output/1-29/bin/linux/amd64/kube-proxy +606c46a0a0bf0c132d2149bd28fcc3478b96783e7d882907a765b6b83d6305b7 _output/1-29/bin/linux/amd64/kube-scheduler +0575f65ad30e99ede163681dfc3d8a546085a8ea1a74c56589ae1de74738e629 _output/1-29/bin/linux/amd64/kubeadm +ba0a893c1835c22f3dbb74b8d65eec9d2f827709e2cf74ff9552d1ae6417ec73 _output/1-29/bin/linux/amd64/kubectl +38acddd97c2dbe2d75741c40e0f79a2701098f058c4bdcdb5607db9e4730775e _output/1-29/bin/linux/amd64/kubelet +84ef504f4356b8d146bc8e11fc32caaf5c8f870abb0947c9986b993a2761cc22 _output/1-29/bin/linux/arm64/kube-apiserver +0ad67af2b4695aa6d0be0536639d3f92b8f03c206186bd7640180e83f510e3d5 _output/1-29/bin/linux/arm64/kube-controller-manager +3032a067ecad15e01b670abd2541a4105be0b6e60bfb95bb59fd07bac70ef7db _output/1-29/bin/linux/arm64/kube-proxy +9f3df253daa8c1543457eb0e7ddb569c1d07c0f8439cbff595119102e86f02f5 _output/1-29/bin/linux/arm64/kube-scheduler +1df12496011afe2486541053cf2de044c1cfdaf9cc349a64ea84d1633bb5cfd6 _output/1-29/bin/linux/arm64/kubeadm +a713314f491d800a42ac7b0aba51b7ae34d393036358643d5e37a97bb1343e19 _output/1-29/bin/linux/arm64/kubectl +c8dc95d5d70e1127a849ce81d8e4138ce25bc40dedfe7df8431ed788b32ed2ea _output/1-29/bin/linux/arm64/kubelet +a76f4686b5441923f2ed1ce8522c2c9c1f6dd75379ce37abf35fd2a9d14e5316 _output/1-29/bin/windows/amd64/kube-proxy.exe +2a7dda15f40df0a4da2338c72acc053b9a2619411690d49486b79b1f00c7f64a _output/1-29/bin/windows/amd64/kubeadm.exe +ae30ffa5ef260cb4bd0db5898ef4aacfa8591dd7ab9bd1af7a57c59d3e6adb56 _output/1-29/bin/windows/amd64/kubectl.exe +06614cedcefbee403dc6baa85afa1da95d84dbe3bc1bdcd689aecfe15c950952 _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-29/patches/0005-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch b/projects/kubernetes/kubernetes/1-29/patches/0005-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch index 7dcf723d31..fea814c5d6 100644 --- a/projects/kubernetes/kubernetes/1-29/patches/0005-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch +++ b/projects/kubernetes/kubernetes/1-29/patches/0005-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch @@ -5,7 +5,6 @@ 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 --- diff --git a/projects/kubernetes/kubernetes/1-30/CHECKSUMS b/projects/kubernetes/kubernetes/1-30/CHECKSUMS index e330ca8136..970965c1e1 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 +a470136c328679aa8bc2cbc3c684df10db26aeb41666eb6e8ee935c8c8021adb _output/1-30/bin/darwin/amd64/kubectl +88cf0107b216afc6bd4d546e266fd7c29751baaf95b32591999df428a5837bb0 _output/1-30/bin/linux/amd64/kube-apiserver +3d8b4ef945f63e1fb97058bce2f7b7ca52057f04cb3e331c03ff42a0a7e7e29a _output/1-30/bin/linux/amd64/kube-controller-manager +042a37d06b2d137edf9417a94cf8ade5385d697bb5bcf84851f84d49c24f677e _output/1-30/bin/linux/amd64/kube-proxy +7f415127af23c73dba2a1a2d71139e38bd97b14838075f0f7cf35961c7ac93c9 _output/1-30/bin/linux/amd64/kube-scheduler +7645ddaee549e950947f453abf366e37be7899a4fa027e8b7344640234b10128 _output/1-30/bin/linux/amd64/kubeadm +96599c916c468e0ceab5dcb190ae234aba996357fa3bd0a0c9c4898fa56ecdaf _output/1-30/bin/linux/amd64/kubectl +70f141afb6af6d6a765e18916fab32b6829a0b06af5d9bdd95023ecd916e6208 _output/1-30/bin/linux/amd64/kubelet +a900be156f237923d4790d11d5cb9bec7cb17c5b0c3b05a30ba7c76a5e1e2f07 _output/1-30/bin/linux/arm64/kube-apiserver +c19712cd014c5aa8e8977bbbff82aad2faec12090f6e1082bb48975451150380 _output/1-30/bin/linux/arm64/kube-controller-manager +099fc914c2fbb80efb8d22b659d0ed830ba771148188618f937a037aa0e429e0 _output/1-30/bin/linux/arm64/kube-proxy +05bc7c0377e50ca8d41479e974a4ab9e67de195dcaea98be358155dcfa11ff28 _output/1-30/bin/linux/arm64/kube-scheduler +d0009c3e70b31b22d54775a19e5c96dca3ef418fbc7a18668b3399d21748bb6f _output/1-30/bin/linux/arm64/kubeadm +78c1ac03959146eca2ec8b001864d7aa38a616683667c19be4b32d9379b50680 _output/1-30/bin/linux/arm64/kubectl +ae7895430601d48461133301eceee16651673c37b92fda75bf339587f5796063 _output/1-30/bin/linux/arm64/kubelet +b5f147a86cfbcfed6514cbbc5ded5970d65ddb6a9d236a93073b147a0c2565d2 _output/1-30/bin/windows/amd64/kube-proxy.exe +7db1cfccc2e5b64819f3c65836c4addaefee740cda9f81fb08844cd5aa4f221c _output/1-30/bin/windows/amd64/kubeadm.exe +c9b32639737e5c722cd38077f4249fd73c27a21c75ed4c1abe643c59b2b98ff7 _output/1-30/bin/windows/amd64/kubectl.exe +49b4387f6af95144861cab59965ac4dddc56382431079e61298882aa3c80fa78 _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 }