Merge pull request #12012 from yiannistri/kind-fix

🐛  Stop overwriting ExtraPortMappings if WithDockerSockMount option is used

Author: k8s-ci-robot

test/framework/bootstrap/kind_provider.go

@@ -149,6 +149,7 @@ func (k *KindClusterProvider) createKindCluster() {
 		},
 		Nodes: []kindv1.Node{
 			{
+				Role:              kindv1.ControlPlaneRole,
 				ExtraPortMappings: k.extraPortMappings,
 			},
 		},
@@ -163,7 +164,10 @@ func (k *KindClusterProvider) createKindCluster() {
 	kindv1.SetDefaultsCluster(cfg)
 
 	if k.withDockerSock {
-		setDockerSockConfig(cfg)
+		cfg.Nodes[0].ExtraMounts = append(cfg.Nodes[0].ExtraMounts, kindv1.Mount{
+			HostPath:      "/var/run/docker.sock",
+			ContainerPath: "/var/run/docker.sock",
+		})
 	}
 
 	kindCreateOptions = append(kindCreateOptions, kind.CreateWithV1Alpha4Config(cfg))
@@ -197,21 +201,6 @@ func (k *KindClusterProvider) createKindCluster() {
 	}
 }
 
-// setDockerSockConfig returns a kind config for mounting /var/run/docker.sock into the kind node.
-func setDockerSockConfig(cfg *kindv1.Cluster) {
-	cfg.Nodes = []kindv1.Node{
-		{
-			Role: kindv1.ControlPlaneRole,
-			ExtraMounts: []kindv1.Mount{
-				{
-					HostPath:      "/var/run/docker.sock",
-					ContainerPath: "/var/run/docker.sock",
-				},
-			},
-		},
-	}
-}
-
 // GetKubeconfigPath returns the path to the kubeconfig file for the cluster.
 func (k *KindClusterProvider) GetKubeconfigPath() string {
 	return k.kubeconfigPath