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

Merge pull request #13273 from johngmyers/rbn-22-22 

Cherry-pick of #13268: Enable RBN with AWS CCM 1.22.0-alpha.1
This commit is contained in:
Kubernetes Prow Robot 2022-02-17 01:01:36 -08:00 committed by GitHub
parent 34f79ccc4f a4e41d47f3
commit d498834b14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodeup/pkg/model/kubelet.go
View File

@ -674,6 +674,6 @@ func (b *KubeletBuilder) kubeletNames() ([]string, error) {
return nil, fmt.Errorf("error describing instances: %v", err) 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) return awsup.GetInstanceCertificateNames(result, useInstanceIDForNodeName)
} }

2
pkg/apis/nodeup/config.go
View File

@ -208,7 +208,7 @@ func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) (*Confi
config.DefaultMachineType = fi.String(strings.Split(instanceGroup.Spec.MachineType, ",")[0]) 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 config.UseInstanceIDForNodeName = true
} }

2
upup/pkg/fi/cloudup/template_functions.go
View File

@ -573,7 +573,7 @@ func (tf *TemplateFunctions) KopsControllerConfig() (string, error) {
Region: tf.Region, 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 config.Server.UseInstanceIDForNodeName = true
} }