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

Remove cloud-config and cloud-provider from 1.33 apiserver

This commit is contained in:
Peter Rifel 2025-02-19 18:47:01 -06:00
parent 59365eb688
commit 1f6ea4fc75
No known key found for this signature in database
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nodeup/pkg/model/kube_apiserver.go
View File

@ -573,7 +573,9 @@ func (b *KubeAPIServerBuilder) buildPod(ctx context.Context, kubeAPIServer *kops
return nil, fmt.Errorf("error building kube-apiserver flags: %v", err)
}
flags = append(flags, fmt.Sprintf("--cloud-config=%s", InTreeCloudConfigFilePath))
if b.IsKubernetesLT("1.33") {
flags = append(flags, fmt.Sprintf("--cloud-config=%s", InTreeCloudConfigFilePath))
}
pod := &v1.Pod{
TypeMeta: metav1.TypeMeta{

46
pkg/model/components/apiserver.go
View File

@ -97,29 +97,31 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(cluster *kops.Cluster) error
}
c.Image = image
switch cluster.GetCloudProvider() {
case kops.CloudProviderAWS:
c.CloudProvider = "aws"
case kops.CloudProviderGCE:
c.CloudProvider = "gce"
case kops.CloudProviderDO:
c.CloudProvider = "external"
case kops.CloudProviderHetzner:
c.CloudProvider = "external"
case kops.CloudProviderOpenstack:
c.CloudProvider = "openstack"
case kops.CloudProviderAzure:
c.CloudProvider = "azure"
case kops.CloudProviderScaleway:
c.CloudProvider = "external"
case kops.CloudProviderMetal:
c.CloudProvider = "external"
default:
return fmt.Errorf("unknown cloudprovider %q", cluster.GetCloudProvider())
}
if b.controlPlaneKubernetesVersion.IsLT("1.33") {
switch cluster.GetCloudProvider() {
case kops.CloudProviderAWS:
c.CloudProvider = "aws"
case kops.CloudProviderGCE:
c.CloudProvider = "gce"
case kops.CloudProviderDO:
c.CloudProvider = "external"
case kops.CloudProviderHetzner:
c.CloudProvider = "external"
case kops.CloudProviderOpenstack:
c.CloudProvider = "openstack"
case kops.CloudProviderAzure:
c.CloudProvider = "azure"
case kops.CloudProviderScaleway:
c.CloudProvider = "external"
case kops.CloudProviderMetal:
c.CloudProvider = "external"
default:
return fmt.Errorf("unknown cloudprovider %q", cluster.GetCloudProvider())
}
if clusterSpec.ExternalCloudControllerManager != nil {
c.CloudProvider = "external"
if clusterSpec.ExternalCloudControllerManager != nil {
c.CloudProvider = "external"
}
}
c.LogLevel = 2