From 396be0bbfb1f174d78038da7407352dfca551360 Mon Sep 17 00:00:00 2001 From: Ismail Alidzhikov Date: Fri, 11 Mar 2022 11:28:13 +0200 Subject: [PATCH] Keep kubelet's `--cloud-provider` flag even for 1.23+ (#520) Co-authored-by: Rafael Franzke --- pkg/webhook/controlplane/ensurer.go | 2 +- pkg/webhook/controlplane/ensurer_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/webhook/controlplane/ensurer.go b/pkg/webhook/controlplane/ensurer.go index 5282efd27..be6216770 100644 --- a/pkg/webhook/controlplane/ensurer.go +++ b/pkg/webhook/controlplane/ensurer.go @@ -417,8 +417,8 @@ func (e *ensurer) EnsureKubeletServiceUnitOptions(ctx context.Context, gctx gcon func ensureKubeletCommandLineArgs(command []string, csiEnabled bool, kubeletVersion *semver.Version) []string { if csiEnabled { + command = extensionswebhook.EnsureStringWithPrefix(command, "--cloud-provider=", "external") if !version.ConstraintK8sGreaterEqual123.Check(kubeletVersion) { - command = extensionswebhook.EnsureStringWithPrefix(command, "--cloud-provider=", "external") command = extensionswebhook.EnsureStringWithPrefix(command, "--enable-controller-attach-detach=", "true") } } else { diff --git a/pkg/webhook/controlplane/ensurer_test.go b/pkg/webhook/controlplane/ensurer_test.go index 782e69023..430886feb 100644 --- a/pkg/webhook/controlplane/ensurer_test.go +++ b/pkg/webhook/controlplane/ensurer_test.go @@ -649,7 +649,7 @@ done Entry("kubelet version < 1.17", eContextK8s116, semver.MustParse("1.16.0"), "aws", false), Entry("1.17 <= kubelet version < 1.18", eContextK8s117, semver.MustParse("1.17.0"), "aws", false), Entry("1.18 <= kubelet version < 1.23", eContextK8s118, semver.MustParse("1.18.0"), "external", true), - Entry("kubelet version >= 1.23", eContextK8s118, semver.MustParse("1.23.0"), "", false), + Entry("kubelet version >= 1.23", eContextK8s118, semver.MustParse("1.23.0"), "external", false), ) })