Skip to content

K
k3s
Unverified Commit 231cb6ed authored by Brad Davidson's avatar Brad Davidson Committed by GitHub
Browse files
Options

Remove GA feature-gates (#8970)

Remove KubeletCredentialProviders and JobTrackingWithFinalizers feature-gates, both of which are GA and cannot be disabled. Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 71a3c35f
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 6 deletions
pkg/daemons/agent/agent_linux.go
View file @ 231cb6ed
...@@ -165,7 +165,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string { ...@@ -165,7 +165,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
if ImageCredProvAvailable(cfg) { if ImageCredProvAvailable(cfg) {
logrus.Infof("Kubelet image credential provider bin dir and configuration file found.") 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-bin-dir"] = cfg.ImageCredProvBinDir
argsMap["image-credential-provider-config"] = cfg.ImageCredProvConfig argsMap["image-credential-provider-config"] = cfg.ImageCredProvConfig
} }
......
pkg/daemons/agent/agent_windows.go
View file @ 231cb6ed
...@@ -114,7 +114,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string { ...@@ -114,7 +114,6 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
if ImageCredProvAvailable(cfg) { if ImageCredProvAvailable(cfg) {
logrus.Infof("Kubelet image credential provider bin dir and configuration file found.") 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-bin-dir"] = cfg.ImageCredProvBinDir
argsMap["image-credential-provider-config"] = cfg.ImageCredProvConfig argsMap["image-credential-provider-config"] = cfg.ImageCredProvConfig
} }
......
pkg/daemons/control/server.go
View file @ 231cb6ed
...@@ -92,7 +92,6 @@ func controllerManager(ctx context.Context, cfg *config.Control) error { ...@@ -92,7 +92,6 @@ func controllerManager(ctx context.Context, cfg *config.Control) error {
runtime := cfg.Runtime runtime := cfg.Runtime
argsMap := map[string]string{ argsMap := map[string]string{
"controllers": "*,tokencleaner", "controllers": "*,tokencleaner",
"feature-gates": "JobTrackingWithFinalizers=true",
"kubeconfig": runtime.KubeConfigController, "kubeconfig": runtime.KubeConfigController,
"authorization-kubeconfig": runtime.KubeConfigController, "authorization-kubeconfig": runtime.KubeConfigController,
"authentication-kubeconfig": runtime.KubeConfigController, "authentication-kubeconfig": runtime.KubeConfigController,
...@@ -153,9 +152,7 @@ func scheduler(ctx context.Context, cfg *config.Control) error { ...@@ -153,9 +152,7 @@ func scheduler(ctx context.Context, cfg *config.Control) error {
func apiServer(ctx context.Context, cfg *config.Control) error { func apiServer(ctx context.Context, cfg *config.Control) error {
runtime := cfg.Runtime runtime := cfg.Runtime
argsMap := map[string]string{ argsMap := map[string]string{}
"feature-gates": "JobTrackingWithFinalizers=true",
}
setupStorageBackend(argsMap, cfg) setupStorageBackend(argsMap, cfg)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment