From 338eb6c0df14b5c1f2972a3e19098cb00bb2ac3f Mon Sep 17 00:00:00 2001 From: Vineeth Bandi Date: Wed, 12 Jun 2024 15:50:52 -0500 Subject: [PATCH] update GIT_TAGS for 1.27-1.30 --- projects/kubernetes/kubernetes/1-27/GIT_TAG | 2 +- projects/kubernetes/kubernetes/1-28/GIT_TAG | 2 +- projects/kubernetes/kubernetes/1-29/GIT_TAG | 2 +- projects/kubernetes/kubernetes/1-30/GIT_TAG | 2 +- ...dmission-webhook-exclusion-from-file.patch | 16 ++++---- ...-log-verbosity-for-node-health-and-t.patch | 39 ------------------- 6 files changed, 12 insertions(+), 51 deletions(-) delete mode 100644 projects/kubernetes/kubernetes/1-30/patches/0002-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch 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-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-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-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 deleted file mode 100644 index e5634048fb..0000000000 --- a/projects/kubernetes/kubernetes/1-30/patches/0002-EKS-PATCH-Update-log-verbosity-for-node-health-and-t.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: torredil -Date: Mon, 20 Nov 2023 17:54:16 +0000 -Subject: [PATCH] --EKS-PATCH-- Update log verbosity for node health and taint - checks - -cherrypick of https://github.com/kubernetes/kubernetes/pull/121967 - -Signed-off-by: torredil ---- - .../volume/attachdetach/reconciler/reconciler.go | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/pkg/controller/volume/attachdetach/reconciler/reconciler.go b/pkg/controller/volume/attachdetach/reconciler/reconciler.go -index bbf33986ebb..c5090957f36 100644 ---- a/pkg/controller/volume/attachdetach/reconciler/reconciler.go -+++ b/pkg/controller/volume/attachdetach/reconciler/reconciler.go -@@ -215,7 +215,9 @@ func (rc *reconciler) reconcile(ctx context.Context) { - - isHealthy, err := rc.nodeIsHealthy(attachedVolume.NodeName) - if err != nil { -- logger.Error(err, "Failed to get health of node", "node", klog.KRef("", string(attachedVolume.NodeName))) -+ logger.V(5).Info("Failed to get health of node", -+ "node", klog.KRef("", string(attachedVolume.NodeName)), -+ "err", err) - } - - // Force detach volumes from unhealthy nodes after maxWaitForUnmountDuration if force detach is enabled -@@ -228,7 +230,9 @@ func (rc *reconciler) reconcile(ctx context.Context) { - - hasOutOfServiceTaint, err := rc.hasOutOfServiceTaint(attachedVolume.NodeName) - if err != nil { -- logger.Error(err, "Failed to get taint specs for node", "node", klog.KRef("", string(attachedVolume.NodeName))) -+ logger.V(5).Info("Failed to get taint specs for node", -+ "node", klog.KRef("", string(attachedVolume.NodeName)), -+ "err", err) - } - - // Check whether volume is still mounted. Skip detach if it is still mounted unless we have