From 231cb6ed20914ba1542aaa684cde7a51e855e1db Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 14 Dec 2023 12:57:24 -0800 Subject: [PATCH] Remove GA feature-gates (#8970) Remove KubeletCredentialProviders and JobTrackingWithFinalizers feature-gates, both of which are GA and cannot be disabled. Signed-off-by: Brad Davidson --- pkg/daemons/agent/agent_linux.go | 1 - pkg/daemons/agent/agent_windows.go | 1 - pkg/daemons/control/server.go | 5 +---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/daemons/agent/agent_linux.go b/pkg/daemons/agent/agent_linux.go index c72d2c188d9c..c374edf352d0 100644 --- a/pkg/daemons/agent/agent_linux.go +++ b/pkg/daemons/agent/agent_linux.go @@ -165,7 +165,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string { if ImageCredProvAvailable(cfg) { logrus.Infof("Kubelet image credential provider bin dir and configuration file found.") - argsMap["feature-gates"] = util.AddFeatureGate(argsMap["feature-gates"], "KubeletCredentialProviders=true") argsMap["image-credential-provider-bin-dir"] = cfg.ImageCredProvBinDir argsMap["image-credential-provider-config"] = cfg.ImageCredProvConfig } diff --git a/pkg/daemons/agent/agent_windows.go b/pkg/daemons/agent/agent_windows.go index 3154d94e1bd3..eb020afdb8e5 100644 --- a/pkg/daemons/agent/agent_windows.go +++ b/pkg/daemons/agent/agent_windows.go @@ -114,7 +114,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string { if ImageCredProvAvailable(cfg) { logrus.Infof("Kubelet image credential provider bin dir and configuration file found.") - argsMap["feature-gates"] = util.AddFeatureGate(argsMap["feature-gates"], "KubeletCredentialProviders=true") argsMap["image-credential-provider-bin-dir"] = cfg.ImageCredProvBinDir argsMap["image-credential-provider-config"] = cfg.ImageCredProvConfig } diff --git a/pkg/daemons/control/server.go b/pkg/daemons/control/server.go index abd7a37ddc4f..9452ff420d86 100644 --- a/pkg/daemons/control/server.go +++ b/pkg/daemons/control/server.go @@ -92,7 +92,6 @@ func controllerManager(ctx context.Context, cfg *config.Control) error { runtime := cfg.Runtime argsMap := map[string]string{ "controllers": "*,tokencleaner", - "feature-gates": "JobTrackingWithFinalizers=true", "kubeconfig": runtime.KubeConfigController, "authorization-kubeconfig": runtime.KubeConfigController, "authentication-kubeconfig": runtime.KubeConfigController, @@ -153,9 +152,7 @@ func scheduler(ctx context.Context, cfg *config.Control) error { func apiServer(ctx context.Context, cfg *config.Control) error { runtime := cfg.Runtime - argsMap := map[string]string{ - "feature-gates": "JobTrackingWithFinalizers=true", - } + argsMap := map[string]string{} setupStorageBackend(argsMap, cfg)