From 4cccfe28e68bec5269d33f453c6f7e6e299ac844 Mon Sep 17 00:00:00 2001 From: Lukasz Szaszkiewicz Date: Fri, 9 Jan 2026 10:23:25 +0100 Subject: [PATCH] kcm: remove WatchListClient feature gate override WatchListClient is enabled by default since 1.35, so the kcm specific override in flags is no longer needed. --- cmd/kube-controller-manager/app/options/options.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go index bcc55899dbb..65236d98b5a 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -26,12 +26,10 @@ import ( v1 "k8s.io/api/core/v1" utilerrors "k8s.io/apimachinery/pkg/util/errors" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/apimachinery/pkg/util/version" "k8s.io/apiserver/pkg/server/flagz" apiserveroptions "k8s.io/apiserver/pkg/server/options" "k8s.io/apiserver/pkg/util/compatibility" utilfeature "k8s.io/apiserver/pkg/util/feature" - clientgofeaturegate "k8s.io/client-go/features" clientset "k8s.io/client-go/kubernetes" clientgokubescheme "k8s.io/client-go/kubernetes/scheme" restclient "k8s.io/client-go/rest" @@ -42,7 +40,6 @@ import ( cpoptions "k8s.io/cloud-provider/options" cliflag "k8s.io/component-base/cli/flag" basecompatibility "k8s.io/component-base/compatibility" - "k8s.io/component-base/featuregate" "k8s.io/component-base/logs" logsapi "k8s.io/component-base/logs/api/v1" "k8s.io/component-base/metrics" @@ -316,13 +313,6 @@ func (s *KubeControllerManagerOptions) Flags(allControllers []string, disabledBy fss.FlagSet("generic").DurationVar(&s.ControllerShutdownTimeout, "controller-shutdown-timeout", s.ControllerShutdownTimeout, "Time to wait for the controllers to shut down before terminating the executable") - if !utilfeature.DefaultFeatureGate.Enabled(featuregate.Feature(clientgofeaturegate.WatchListClient)) { - ver := version.MustParse("1.34") - if err := utilfeature.DefaultMutableFeatureGate.OverrideDefaultAtVersion(featuregate.Feature(clientgofeaturegate.WatchListClient), true, ver); err != nil { - panic(fmt.Sprintf("unable to set %s feature gate, err: %v", clientgofeaturegate.WatchListClient, err)) - } - } - s.ComponentGlobalsRegistry.AddFlags(fss.FlagSet("generic")) return fss