From 5759d700391367fa1a46c68651d2e745f2277e23 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Fri, 10 Jun 2022 15:15:05 +0300 Subject: [PATCH] Disable removal or CCM leader migration --- .../k8s-1.25.yaml | 0 .../bootstrapchannelbuilder.go | 14 +------------- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 upup/models/cloudup/resources/addons/leader-migration.rbac.addons.k8s.io/k8s-1.25.yaml diff --git a/upup/models/cloudup/resources/addons/leader-migration.rbac.addons.k8s.io/k8s-1.25.yaml b/upup/models/cloudup/resources/addons/leader-migration.rbac.addons.k8s.io/k8s-1.25.yaml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go index 6af14d26f0..6bb41f89a8 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go @@ -440,7 +440,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*Addon // AWS and GCE KCM-to-CCM leader migration key := "leader-migration.rbac.addons.k8s.io" - if b.IsKubernetesLT("1.25") { + { location := key + "/k8s-1.23.yaml" id := "k8s-1.23" @@ -451,18 +451,6 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*Addon Id: id, }) } - - if b.IsKubernetesGTE("1.25") { - location := key + "/k8s-1.25.yaml" - id := "k8s-1.25" - - addons.Add(&channelsapi.AddonSpec{ - Name: fi.String(key), - Selector: map[string]string{"k8s-addon": key}, - Manifest: fi.String(location), - Id: id, - }) - } } {