Merge pull request #17215 from aojea/kindnet_ipam

Kindnet requires cluster to provide ipam via the node.spec.podcidr
kubernetes · Jan 16, 2025 · 8b292cb · 8b292cb
2 parents e9921c9 + 46b440a
commit 8b292cb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/pkg/model/components/kubecontrollermanager.go b/pkg/model/components/kubecontrollermanager.go
@@ -111,7 +111,7 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o *kops.Cluster) erro
 	networking := &clusterSpec.Networking
 	if networking.Kubenet != nil {
 		kcm.ConfigureCloudRoutes = fi.PtrTo(true)
-	} else if gce.UsesIPAliases(o) {
+	} else if networking.GCP != nil {
 		kcm.ConfigureCloudRoutes = fi.PtrTo(false)
 		if kcm.CloudProvider == "external" {
 			// kcm should not allocate node cidrs with the CloudAllocator if we're using the external CCM

diff --git a/...t/data/aws_launch_template_master-us-test-1a.masters.privatekindnet.example.com_user_data b/...t/data/aws_launch_template_master-us-test-1a.masters.privatekindnet.example.com_user_data
@@ -130,7 +130,7 @@ ClusterName: privatekindnet.example.com
 ConfigBase: memfs://clusters.example.com/privatekindnet.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: lgPxiqJbDn1WQqD2BR2dzZRFvgBtedQIcphqjfGgam0=
+NodeupConfigHash: jTF3I7at/1p0jwCMDz9kTq2uKvqMG+UEhKlJd1X96+8=
 
 __EOF_KUBE_ENV
 

diff --git a/...tegration/update_cluster/privatekindnet/data/aws_s3_object_cluster-completed.spec_content b/...tegration/update_cluster/privatekindnet/data/aws_s3_object_cluster-completed.spec_content
@@ -101,7 +101,7 @@ spec:
     serviceClusterIPRange: 100.64.0.0/13
     storageBackend: etcd3
   kubeControllerManager:
-    allocateNodeCIDRs: false
+    allocateNodeCIDRs: true
     attachDetachReconcileSyncPeriod: 1m0s
     cloudProvider: external
     clusterCIDR: 100.96.0.0/11

diff --git a/...n/update_cluster/privatekindnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...n/update_cluster/privatekindnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -233,7 +233,7 @@ CAs:
 ClusterName: privatekindnet.example.com
 ControlPlaneConfig:
   KubeControllerManager:
-    allocateNodeCIDRs: false
+    allocateNodeCIDRs: true
     attachDetachReconcileSyncPeriod: 1m0s
     cloudProvider: external
     clusterCIDR: 100.96.0.0/11