fix unit tests

pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go

@@ -56,7 +56,7 @@ kind: ClusterConfiguration
 {{range $i, $val := .FeatureArgs}}{{$i}}: {{$val}}
 {{end -}}{{end -}}
 certificatesDir: {{.CertDir}}
-clusterName: kubernetes
+clusterName: mk
 controlPlaneEndpoint: {{.ControlPlaneAddress}}:{{.APIServerPort}}
 controllerManager: {}
 dns:

pkg/minikube/bootstrapper/bsutil/kubeadm.go

@@ -129,7 +129,6 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana
 	if err := configTmpl.Execute(&b, opts); err != nil {
 		return nil, err
 	}
-	fmt.Printf("%s OPTS=%+v\n", n.Name, opts)
 	glog.Infof("kubeadm config:\n%s\n", b.String())
 	return b.Bytes(), nil
 }

pkg/minikube/bootstrapper/bsutil/kubeadm_test.go

@@ -108,7 +108,7 @@ func TestGenerateKubeadmYAMLDNS(t *testing.T) {
 		shouldErr bool
 		cfg       config.ClusterConfig
 	}{
-		{"dns", "docker", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{DNSDomain: "1.1.1.1"}}},
+		{"dns", "docker", false, config.ClusterConfig{Name: "mk", KubernetesConfig: config.KubernetesConfig{DNSDomain: "1.1.1.1"}}},
 	}
 	for _, version := range versions {
 		for _, tc := range tests {
@@ -174,15 +174,15 @@ func TestGenerateKubeadmYAML(t *testing.T) {
 		shouldErr bool
 		cfg       config.ClusterConfig
 	}{
-		{"default", "docker", false, config.ClusterConfig{}},
+		{"default", "docker", false, config.ClusterConfig{Name: "mk"}},
-		{"containerd", "containerd", false, config.ClusterConfig{}},
+		{"containerd", "containerd", false, config.ClusterConfig{Name: "mk"}},
-		{"crio", "crio", false, config.ClusterConfig{}},
+		{"crio", "crio", false, config.ClusterConfig{Name: "mk"}},
-		{"options", "docker", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOpts}}},
+		{"options", "docker", false, config.ClusterConfig{Name: "mk", KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOpts}}},
-		{"crio-options-gates", "crio", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOpts, FeatureGates: "a=b"}}},
+		{"crio-options-gates", "crio", false, config.ClusterConfig{Name: "mk", KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOpts, FeatureGates: "a=b"}}},
-		{"unknown-component", "docker", true, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: config.ExtraOptionSlice{config.ExtraOption{Component: "not-a-real-component", Key: "killswitch", Value: "true"}}}}},
+		{"unknown-component", "docker", true, config.ClusterConfig{Name: "mk", KubernetesConfig: config.KubernetesConfig{ExtraOptions: config.ExtraOptionSlice{config.ExtraOption{Component: "not-a-real-component", Key: "killswitch", Value: "true"}}}}},
-		{"containerd-api-port", "containerd", false, config.ClusterConfig{Nodes: []config.Node{{Port: 12345}}}},
+		{"containerd-api-port", "containerd", false, config.ClusterConfig{Name: "mk", Nodes: []config.Node{{Port: 12345}}}},
-		{"containerd-pod-network-cidr", "containerd", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOptsPodCidr}}},
+		{"containerd-pod-network-cidr", "containerd", false, config.ClusterConfig{Name: "mk", KubernetesConfig: config.KubernetesConfig{ExtraOptions: extraOptsPodCidr}}},
-		{"image-repository", "docker", false, config.ClusterConfig{KubernetesConfig: config.KubernetesConfig{ImageRepository: "test/repo"}}},
+		{"image-repository", "docker", false, config.ClusterConfig{Name: "mk", KubernetesConfig: config.KubernetesConfig{ImageRepository: "test/repo"}}},
 	}
 	for _, version := range versions {
 		for _, tc := range tests {

pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-api-port.yaml

@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 12345
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:

pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-pod-network-cidr.yaml

@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 8443
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:

pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml

@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 8443
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:

pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio-options-gates.yaml

@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 8443
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:

pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml

@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 8443
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:

pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml

@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 8443
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:

pkg/minikube/bootstrapper/bsutil/testdata/v1.11/image-repository.yaml

@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 8443
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:

pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml

@@ -4,7 +4,7 @@ noTaintMaster: true
 api:
   advertiseAddress: 1.1.1.1
   bindPort: 8443
-  controlPlaneEndpoint: localhost
+  controlPlaneEndpoint: 1.1.1.1
 kubernetesVersion: v1.11.0
 certificatesDir: /var/lib/minikube/certs
 networking:

pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml

@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:12345
+controlPlaneEndpoint: 1.1.1.1:12345
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml

@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml

@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml

@@ -30,9 +30,9 @@ schedulerExtraArgs:
   feature-gates: "a=b"
   scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml

@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml

@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml

@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml

@@ -23,9 +23,9 @@ imageRepository: test/repo
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml

@@ -27,9 +27,9 @@ controllerManagerExtraArgs:
 schedulerExtraArgs:
   scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml

@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:12345
+controlPlaneEndpoint: 1.1.1.1:12345
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml

@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml

@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml

@@ -30,9 +30,9 @@ schedulerExtraArgs:
   feature-gates: "a=b"
   scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml

@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml

@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml

@@ -22,9 +22,9 @@ kind: ClusterConfiguration
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml

@@ -23,9 +23,9 @@ imageRepository: test/repo
 apiServerExtraArgs:
   enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml

@@ -27,9 +27,9 @@ controllerManagerExtraArgs:
 schedulerExtraArgs:
   scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
 apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"]
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 etcd:
   local:
     dataDir: /var/lib/minikube/etcd

pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:12345
+controlPlaneEndpoint: 1.1.1.1:12345
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml

@@ -34,8 +34,8 @@ scheduler:
     feature-gates: "a=b"
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml

@@ -25,8 +25,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml

@@ -31,8 +31,8 @@ scheduler:
   extraArgs:
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:12345
+controlPlaneEndpoint: 1.1.1.1:12345
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml

@@ -34,8 +34,8 @@ scheduler:
     feature-gates: "a=b"
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml

@@ -25,8 +25,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml

@@ -31,8 +31,8 @@ scheduler:
   extraArgs:
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:12345
+controlPlaneEndpoint: 1.1.1.1:12345
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml

@@ -34,8 +34,8 @@ scheduler:
     feature-gates: "a=b"
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml

@@ -25,8 +25,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml

@@ -31,8 +31,8 @@ scheduler:
   extraArgs:
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 dns:
   type: CoreDNS
 etcd:

pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:12345
+controlPlaneEndpoint: 1.1.1.1:12345
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml

@@ -34,8 +34,8 @@ scheduler:
     feature-gates: "a=b"
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml

@@ -25,8 +25,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml

@@ -31,8 +31,8 @@ scheduler:
   extraArgs:
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:12345
+controlPlaneEndpoint: 1.1.1.1:12345
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml

@@ -34,8 +34,8 @@ scheduler:
     feature-gates: "a=b"
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml

@@ -25,8 +25,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml

@@ -31,8 +31,8 @@ scheduler:
   extraArgs:
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:12345
+controlPlaneEndpoint: 1.1.1.1:12345
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml

@@ -34,8 +34,8 @@ scheduler:
     feature-gates: "a=b"
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml

@@ -24,8 +24,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml

@@ -25,8 +25,8 @@ apiServer:
   extraArgs:
     enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml

@@ -31,8 +31,8 @@ scheduler:
   extraArgs:
     scheduler-name: "mini-scheduler"
 certificatesDir: /var/lib/minikube/certs
-clusterName: kubernetes
+clusterName: mk
-controlPlaneEndpoint: localhost:8443
+controlPlaneEndpoint: 1.1.1.1:8443
 controllerManager: {}
 dns:
   type: CoreDNS

pkg/minikube/node/node.go

@@ -27,9 +27,8 @@ import (
 
 // TODO: Share these between cluster and node packages
 const (
-	containerRuntime = "container-runtime"
+	mountString = "mount-string"
-	mountString      = "mount-string"
+	createMount = "mount"
-	createMount      = "mount"
 )
 
 // Add adds a new node config to an existing cluster.