From e10364a185fe3d9917d2b398bb3ebf907fac1fa2 Mon Sep 17 00:00:00 2001 From: Daniel Lipovetsky Date: Mon, 23 Sep 2024 10:28:08 -0700 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Suppress=20finalizer=20name=20API?= =?UTF-8?q?=20warnings=20in=20CAPI,=20CABPK,=20and=20KCP=20controller=20lo?= =?UTF-8?q?gs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bootstrap/kubeadm/main.go | 2 ++ controlplane/kubeadm/main.go | 2 ++ main.go | 2 ++ 3 files changed, 6 insertions(+) diff --git a/bootstrap/kubeadm/main.go b/bootstrap/kubeadm/main.go index e6a210478b31..dea7668506a3 100644 --- a/bootstrap/kubeadm/main.go +++ b/bootstrap/kubeadm/main.go @@ -52,6 +52,7 @@ import ( "sigs.k8s.io/cluster-api/feature" bootstrapv1alpha3 "sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha3" bootstrapv1alpha4 "sigs.k8s.io/cluster-api/internal/apis/bootstrap/kubeadm/v1alpha4" + "sigs.k8s.io/cluster-api/util/apiwarnings" "sigs.k8s.io/cluster-api/util/flags" "sigs.k8s.io/cluster-api/version" ) @@ -201,6 +202,7 @@ func main() { restConfig.QPS = restConfigQPS restConfig.Burst = restConfigBurst restConfig.UserAgent = remote.DefaultClusterAPIUserAgent(controllerName) + restConfig.WarningHandler = apiwarnings.DefaultHandler(klog.Background().WithName("API Server Warning")) tlsOptions, metricsOptions, err := flags.GetManagerOptions(managerOptions) if err != nil { diff --git a/controlplane/kubeadm/main.go b/controlplane/kubeadm/main.go index ea023f91a50a..aa46c743d8e2 100644 --- a/controlplane/kubeadm/main.go +++ b/controlplane/kubeadm/main.go @@ -56,6 +56,7 @@ import ( "sigs.k8s.io/cluster-api/feature" controlplanev1alpha3 "sigs.k8s.io/cluster-api/internal/apis/controlplane/kubeadm/v1alpha3" controlplanev1alpha4 "sigs.k8s.io/cluster-api/internal/apis/controlplane/kubeadm/v1alpha4" + "sigs.k8s.io/cluster-api/util/apiwarnings" "sigs.k8s.io/cluster-api/util/flags" "sigs.k8s.io/cluster-api/version" ) @@ -211,6 +212,7 @@ func main() { restConfig.QPS = restConfigQPS restConfig.Burst = restConfigBurst restConfig.UserAgent = remote.DefaultClusterAPIUserAgent(controllerName) + restConfig.WarningHandler = apiwarnings.DefaultHandler(klog.Background().WithName("API Server Warning")) tlsOptions, metricsOptions, err := flags.GetManagerOptions(managerOptions) if err != nil { diff --git a/main.go b/main.go index cc0c7a2bb428..bf90217daedf 100644 --- a/main.go +++ b/main.go @@ -72,6 +72,7 @@ import ( runtimeclient "sigs.k8s.io/cluster-api/internal/runtime/client" runtimeregistry "sigs.k8s.io/cluster-api/internal/runtime/registry" runtimewebhooks "sigs.k8s.io/cluster-api/internal/webhooks/runtime" + "sigs.k8s.io/cluster-api/util/apiwarnings" "sigs.k8s.io/cluster-api/util/flags" "sigs.k8s.io/cluster-api/version" "sigs.k8s.io/cluster-api/webhooks" @@ -270,6 +271,7 @@ func main() { restConfig.QPS = restConfigQPS restConfig.Burst = restConfigBurst restConfig.UserAgent = remote.DefaultClusterAPIUserAgent(controllerName) + restConfig.WarningHandler = apiwarnings.DefaultHandler(klog.Background().WithName("API Server Warning")) minVer := version.MinimumKubernetesVersion if feature.Gates.Enabled(feature.ClusterTopology) {