kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12837 from johngmyers/external-ccm 

Fix enabling of AWS CCM
This commit is contained in:
Kubernetes Prow Robot 2021-11-25 23:52:52 -08:00 committed by GitHub
parent 92b78f3e03 80a03c6aad
commit 75d87981f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/model/components/awscloudcontrollermanager.go
View File

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

8
pkg/model/components/kubecontrollermanager.go
View File

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