m

aws · Feb 21, 2024 · 90ef45c · 90ef45c
1 parent c6656bc
commit 90ef45c
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 1 deletion.
diff --git a/pkg/executables/kind.go b/pkg/executables/kind.go
@@ -241,7 +241,6 @@ func (k *Kind) buildConfigFile() error {
 	if err != nil {
 		return fmt.Errorf("creating file for kind config: %v", err)
 	}
-	fmt.Printf("\nkind exec config %v\n", k.execConfig.ConfigFile)
 
 	k.execConfig.ConfigFile = writtenFileName
 

diff --git a/pkg/executables/kind_test.go b/pkg/executables/kind_test.go
@@ -32,6 +32,14 @@ func TestKindCreateBootstrapClusterSuccess(t *testing.T) {
 	clusterSpec := test.NewClusterSpec(func(s *cluster.Spec) {
 		s.Cluster.Name = clusterName
 		s.VersionsBundles["1.19"] = versionBundle
+		s.Cluster.Spec.ClusterNetwork = v1alpha1.ClusterNetwork{
+			Pods: v1alpha1.Pods{
+				CidrBlocks: []string{"1.1.1.1"},
+			},
+			Services: v1alpha1.Services{
+				CidrBlocks: []string{"2.2.2.2"},
+			},
+		}	
 	})
 	eksClusterName := "test_cluster-eks-a-cluster"
 	kubeConfigFile := "test_cluster.kind.kubeconfig"
@@ -176,6 +184,14 @@ func TestKindCreateBootstrapClusterSuccessWithRegistryMirror(t *testing.T) {
 						},
 					},
 				}
+				s.Cluster.Spec.ClusterNetwork = v1alpha1.ClusterNetwork{
+					Pods: v1alpha1.Pods{
+						CidrBlocks: []string{"1.1.1.1"},
+					},
+					Services: v1alpha1.Services{
+						CidrBlocks: []string{"2.2.2.2"},
+					},
+				}
 			}),
 			env:            map[string]string{},
 			wantKindConfig: "testdata/kind_config_registry_mirror_insecure.yaml",
@@ -191,6 +207,14 @@ func TestKindCreateBootstrapClusterSuccessWithRegistryMirror(t *testing.T) {
 					Port:          constants.DefaultHttpsPort,
 					CACertContent: "test",
 				}
+				s.Cluster.Spec.ClusterNetwork = v1alpha1.ClusterNetwork{
+					Pods: v1alpha1.Pods{
+						CidrBlocks: []string{"1.1.1.1"},
+					},
+					Services: v1alpha1.Services{
+						CidrBlocks: []string{"2.2.2.2"},
+					},
+				}
 			}),
 			env:            map[string]string{},
 			wantKindConfig: "testdata/kind_config_registry_mirror_with_ca.yaml",
@@ -216,6 +240,14 @@ func TestKindCreateBootstrapClusterSuccessWithRegistryMirror(t *testing.T) {
 					},
 					Authenticate: true,
 				}
+				s.Cluster.Spec.ClusterNetwork = v1alpha1.ClusterNetwork{
+					Pods: v1alpha1.Pods{
+						CidrBlocks: []string{"1.1.1.1"},
+					},
+					Services: v1alpha1.Services{
+						CidrBlocks: []string{"2.2.2.2"},
+					},
+				}
 			}),
 			env:            map[string]string{},
 			wantKindConfig: "testdata/kind_config_registry_mirror_with_auth.yaml",

diff --git a/pkg/executables/testdata/kind_config.yaml b/pkg/executables/testdata/kind_config.yaml
@@ -1,5 +1,8 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
+networking:
+  podSubnet: 1.1.1.1
+  serviceSubnet: 2.2.2.2
 kubeadmConfigPatches:
   - |
     kind: ClusterConfiguration

diff --git a/pkg/executables/testdata/kind_config_docker_mount_networking.yaml b/pkg/executables/testdata/kind_config_docker_mount_networking.yaml
@@ -1,5 +1,8 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
+networking:
+  podSubnet: 1.1.1.1
+  serviceSubnet: 2.2.2.2
 kubeadmConfigPatches:
   - |
     kind: ClusterConfiguration

diff --git a/pkg/executables/testdata/kind_config_extra_port_mappings.yaml b/pkg/executables/testdata/kind_config_extra_port_mappings.yaml
@@ -1,5 +1,8 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
+networking:
+  podSubnet: 1.1.1.1
+  serviceSubnet: 2.2.2.2
 kubeadmConfigPatches:
   - |
     kind: ClusterConfiguration

diff --git a/pkg/executables/testdata/kind_config_registry_mirror_insecure.yaml b/pkg/executables/testdata/kind_config_registry_mirror_insecure.yaml
@@ -1,5 +1,8 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
+networking:
+  podSubnet: 1.1.1.1
+  serviceSubnet: 2.2.2.2
 kubeadmConfigPatches:
   - |
     kind: ClusterConfiguration

diff --git a/pkg/executables/testdata/kind_config_registry_mirror_with_auth.yaml b/pkg/executables/testdata/kind_config_registry_mirror_with_auth.yaml
@@ -1,5 +1,8 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
+networking:
+  podSubnet: 1.1.1.1
+  serviceSubnet: 2.2.2.2
 kubeadmConfigPatches:
   - |
     kind: ClusterConfiguration

diff --git a/pkg/executables/testdata/kind_config_registry_mirror_with_ca.yaml b/pkg/executables/testdata/kind_config_registry_mirror_with_ca.yaml
@@ -1,5 +1,8 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
+networking:
+  podSubnet: 1.1.1.1
+  serviceSubnet: 2.2.2.2
 kubeadmConfigPatches:
   - |
     kind: ClusterConfiguration