From a4e41d47f36a9f617f33e67a0836dc66dbc2a608 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Fri, 21 Jan 2022 08:47:02 -0800 Subject: [PATCH] Enable RBN with AWS CCM 1.22.0-alpha.1 --- nodeup/pkg/model/kubelet.go | 2 +- pkg/apis/nodeup/config.go | 2 +- upup/pkg/fi/cloudup/template_functions.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go index 81e744141d..afa6d75103 100644 --- a/nodeup/pkg/model/kubelet.go +++ b/nodeup/pkg/model/kubelet.go @@ -674,6 +674,6 @@ func (b *KubeletBuilder) kubeletNames() ([]string, error) { return nil, fmt.Errorf("error describing instances: %v", err) } - useInstanceIDForNodeName := b.Cluster.Spec.ExternalCloudControllerManager != nil && b.IsKubernetesGTE("1.23") + useInstanceIDForNodeName := b.Cluster.Spec.ExternalCloudControllerManager != nil && b.IsKubernetesGTE("1.22") return awsup.GetInstanceCertificateNames(result, useInstanceIDForNodeName) } diff --git a/pkg/apis/nodeup/config.go b/pkg/apis/nodeup/config.go index 466491c0bb..dc06417f10 100644 --- a/pkg/apis/nodeup/config.go +++ b/pkg/apis/nodeup/config.go @@ -208,7 +208,7 @@ func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) (*Confi config.DefaultMachineType = fi.String(strings.Split(instanceGroup.Spec.MachineType, ",")[0]) } - if cluster.Spec.ExternalCloudControllerManager != nil && cluster.IsKubernetesGTE("1.23") && cluster.Spec.CloudProvider == string(kops.CloudProviderAWS) { + if cluster.Spec.ExternalCloudControllerManager != nil && cluster.IsKubernetesGTE("1.22") && cluster.Spec.CloudProvider == string(kops.CloudProviderAWS) { config.UseInstanceIDForNodeName = true } diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go index f48f829b45..e4d43aa467 100644 --- a/upup/pkg/fi/cloudup/template_functions.go +++ b/upup/pkg/fi/cloudup/template_functions.go @@ -573,7 +573,7 @@ func (tf *TemplateFunctions) KopsControllerConfig() (string, error) { Region: tf.Region, } - if cluster.Spec.ExternalCloudControllerManager != nil && cluster.IsKubernetesGTE("1.23") { + if cluster.Spec.ExternalCloudControllerManager != nil && cluster.IsKubernetesGTE("1.22") { config.Server.UseInstanceIDForNodeName = true }