github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <brad.davidson@rancher.com>
pull/9064/head
Brad Davidson 2023-12-14 12:57:24 -08:00 committed by GitHub
parent 71a3c35fb7
commit 231cb6ed20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/daemons/agent/agent_linux.go
View File

@ -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
} }

1
pkg/daemons/agent/agent_windows.go
View File

@ -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
} }

5
pkg/daemons/control/server.go
View File

@ -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 {
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)