Skip to content

Automated cherry pick of #17482: Fix cloud-provider flag for K8s 1.31+ #17488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2025
Merged

Automated cherry pick of #17482: Fix cloud-provider flag for K8s 1.31+ #17488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 26 additions & 22 deletions pkg/model/components/apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,28 +98,32 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(cluster *kops.Cluster) error
c.Image = image

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 {
if b.controlPlaneKubernetesVersion.IsLT("1.31") {
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"
}
} else {
c.CloudProvider = "external"
}
}
Expand Down
55 changes: 27 additions & 28 deletions pkg/model/components/kubelet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,21 +120,40 @@ func (b *KubeletOptionsBuilder) configureKubelet(cluster *kops.Cluster, kubelet
const kubeconfigPath = "/var/lib/kubelet/kubeconfig"
kubelet.KubeconfigPath = kubeconfigPath

cloudProvider := cluster.GetCloudProvider()

kubelet.CgroupRoot = "/"

cloudProvider := cluster.GetCloudProvider()
klog.V(1).Infof("Cloud Provider: %s", cloudProvider)
if cloudProvider == kops.CloudProviderAWS {
kubelet.CloudProvider = "aws"
}
if cloudProvider != kops.CloudProviderMetal {
if b.controlPlaneKubernetesVersion.IsLT("1.31") {
switch cloudProvider {
case kops.CloudProviderAWS:
kubelet.CloudProvider = "aws"
case kops.CloudProviderGCE:
kubelet.CloudProvider = "gce"
case kops.CloudProviderDO:
kubelet.CloudProvider = "external"
case kops.CloudProviderHetzner:
kubelet.CloudProvider = "external"
case kops.CloudProviderOpenstack:
kubelet.CloudProvider = "openstack"
case kops.CloudProviderAzure:
kubelet.CloudProvider = "azure"
case kops.CloudProviderScaleway:
kubelet.CloudProvider = "external"
default:
kubelet.CloudProvider = "external"
}

if cloudProvider == kops.CloudProviderDO {
kubelet.CloudProvider = "external"
if cluster.Spec.ExternalCloudControllerManager != nil {
kubelet.CloudProvider = "external"
}
} else {
kubelet.CloudProvider = "external"
}
}

if cloudProvider == kops.CloudProviderGCE {
kubelet.CloudProvider = "gce"
kubelet.HairpinMode = "promiscuous-bridge"

if cluster.Spec.CloudConfig == nil {
Expand All @@ -144,26 +163,6 @@ func (b *KubeletOptionsBuilder) configureKubelet(cluster *kops.Cluster, kubelet
cluster.Spec.CloudProvider.GCE.NodeTags = fi.PtrTo(gce.TagForRole(b.ClusterName, kops.InstanceGroupRoleNode))
}

if cloudProvider == kops.CloudProviderHetzner {
kubelet.CloudProvider = "external"
}

if cloudProvider == kops.CloudProviderOpenstack {
kubelet.CloudProvider = "openstack"
}

if cloudProvider == kops.CloudProviderAzure {
kubelet.CloudProvider = "azure"
}

if cloudProvider == kops.CloudProviderScaleway {
kubelet.CloudProvider = "external"
}

if cluster.Spec.ExternalCloudControllerManager != nil {
kubelet.CloudProvider = "external"
}

// Prevent image GC from pruning the pause image
// https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/2040-kubelet-cri#pinned-images
image := "registry.k8s.io/pause:3.9"
Expand Down
Loading