From 80a03c6aad9ac801ee8293522dd066b1441f30bf Mon Sep 17 00:00:00 2001
From: John Gardiner Myers <jgmyers@proofpoint.com>
Date: Thu, 25 Nov 2021 19:31:29 -0800
Subject: [PATCH] Fix enabling of AWS CCM

---
 pkg/model/components/awscloudcontrollermanager.go | 8 ++++----
 pkg/model/components/kubecontrollermanager.go     | 8 ++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkg/model/components/awscloudcontrollermanager.go b/pkg/model/components/awscloudcontrollermanager.go
index 3995a2b355..ffdfec2211 100644
--- a/pkg/model/components/awscloudcontrollermanager.go
+++ b/pkg/model/components/awscloudcontrollermanager.go
@@ -36,16 +36,16 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}) er
 
 	clusterSpec := o.(*kops.ClusterSpec)
 
-	eccm := clusterSpec.ExternalCloudControllerManager
-
 	if kops.CloudProviderID(clusterSpec.CloudProvider) != kops.CloudProviderAWS {
 		return nil
 	}
 
-	if eccm == nil && b.IsKubernetesGTE("1.24") {
-		eccm = &kops.CloudControllerManagerConfig{}
+	if clusterSpec.ExternalCloudControllerManager == nil && b.IsKubernetesGTE("1.24") {
+		clusterSpec.ExternalCloudControllerManager = &kops.CloudControllerManagerConfig{}
 	}
 
+	eccm := clusterSpec.ExternalCloudControllerManager
+
 	if eccm == nil {
 		return nil
 	}
diff --git a/pkg/model/components/kubecontrollermanager.go b/pkg/model/components/kubecontrollermanager.go
index 267cead01c..5798e2e1e2 100644
--- a/pkg/model/components/kubecontrollermanager.go
+++ b/pkg/model/components/kubecontrollermanager.go
@@ -79,11 +79,7 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o interface{}) error
 	kcm.ClusterName = b.ClusterName
 	switch kops.CloudProviderID(clusterSpec.CloudProvider) {
 	case kops.CloudProviderAWS:
-		if b.IsKubernetesGTE("1.24") {
-			kcm.CloudProvider = "external"
-		} else {
-			kcm.CloudProvider = "aws"
-		}
+		kcm.CloudProvider = "aws"
 
 	case kops.CloudProviderGCE:
 		kcm.CloudProvider = "gce"
@@ -106,7 +102,7 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o interface{}) error
 	}
 
 	if clusterSpec.ExternalCloudControllerManager == nil {
-		if kcm.CloudProvider == "aws" && b.IsKubernetesGTE("1.23") && b.IsKubernetesLT("1.24") {
+		if kcm.CloudProvider == "aws" && b.IsKubernetesGTE("1.23") {
 			kcm.EnableLeaderMigration = fi.Bool(true)
 		}
 	} else {