From e1049e78b46458054ad50ee6fca8baf5bbd2950a Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Fri, 6 Mar 2020 13:50:27 -0800 Subject: [PATCH 1/5] Revert controlPlaneEndpoint to localhost --- .../bootstrapper/bsutil/ktmpl/v1alpha1.go | 2 +- .../bootstrapper/bsutil/ktmpl/v1alpha3.go | 2 +- .../bootstrapper/bsutil/ktmpl/v1beta1.go | 2 +- .../bootstrapper/bsutil/ktmpl/v1beta2.go | 2 +- pkg/minikube/bootstrapper/bsutil/kubeadm.go | 38 ++++++++++--------- .../testdata/v1.11/containerd-api-port.yaml | 2 +- .../v1.11/containerd-pod-network-cidr.yaml | 2 +- .../bsutil/testdata/v1.11/containerd.yaml | 2 +- .../testdata/v1.11/crio-options-gates.yaml | 2 +- .../bsutil/testdata/v1.11/crio.yaml | 2 +- .../bsutil/testdata/v1.11/default.yaml | 2 +- .../testdata/v1.11/image-repository.yaml | 2 +- .../bsutil/testdata/v1.11/options.yaml | 2 +- .../testdata/v1.12/containerd-api-port.yaml | 2 +- .../v1.12/containerd-pod-network-cidr.yaml | 2 +- .../bsutil/testdata/v1.12/containerd.yaml | 2 +- .../testdata/v1.12/crio-options-gates.yaml | 2 +- .../bsutil/testdata/v1.12/crio.yaml | 2 +- .../bsutil/testdata/v1.12/default.yaml | 2 +- .../bsutil/testdata/v1.12/dns.yaml | 2 +- .../testdata/v1.12/image-repository.yaml | 2 +- .../bsutil/testdata/v1.12/options.yaml | 2 +- .../testdata/v1.13/containerd-api-port.yaml | 2 +- .../v1.13/containerd-pod-network-cidr.yaml | 2 +- .../bsutil/testdata/v1.13/containerd.yaml | 2 +- .../testdata/v1.13/crio-options-gates.yaml | 2 +- .../bsutil/testdata/v1.13/crio.yaml | 2 +- .../bsutil/testdata/v1.13/default.yaml | 2 +- .../bsutil/testdata/v1.13/dns.yaml | 2 +- .../testdata/v1.13/image-repository.yaml | 2 +- .../bsutil/testdata/v1.13/options.yaml | 2 +- .../testdata/v1.14/containerd-api-port.yaml | 2 +- .../v1.14/containerd-pod-network-cidr.yaml | 2 +- .../bsutil/testdata/v1.14/containerd.yaml | 2 +- .../testdata/v1.14/crio-options-gates.yaml | 2 +- .../bsutil/testdata/v1.14/crio.yaml | 2 +- .../bsutil/testdata/v1.14/default.yaml | 2 +- .../bsutil/testdata/v1.14/dns.yaml | 2 +- .../testdata/v1.14/image-repository.yaml | 2 +- .../bsutil/testdata/v1.14/options.yaml | 2 +- .../testdata/v1.15/containerd-api-port.yaml | 2 +- .../v1.15/containerd-pod-network-cidr.yaml | 2 +- .../bsutil/testdata/v1.15/containerd.yaml | 2 +- .../testdata/v1.15/crio-options-gates.yaml | 2 +- .../bsutil/testdata/v1.15/crio.yaml | 2 +- .../bsutil/testdata/v1.15/default.yaml | 2 +- .../bsutil/testdata/v1.15/dns.yaml | 2 +- .../testdata/v1.15/image-repository.yaml | 2 +- .../bsutil/testdata/v1.15/options.yaml | 2 +- .../testdata/v1.16/containerd-api-port.yaml | 2 +- .../v1.16/containerd-pod-network-cidr.yaml | 2 +- .../bsutil/testdata/v1.16/containerd.yaml | 2 +- .../testdata/v1.16/crio-options-gates.yaml | 2 +- .../bsutil/testdata/v1.16/crio.yaml | 2 +- .../bsutil/testdata/v1.16/default.yaml | 2 +- .../bsutil/testdata/v1.16/dns.yaml | 2 +- .../testdata/v1.16/image-repository.yaml | 2 +- .../bsutil/testdata/v1.16/options.yaml | 2 +- .../testdata/v1.17/containerd-api-port.yaml | 2 +- .../v1.17/containerd-pod-network-cidr.yaml | 2 +- .../bsutil/testdata/v1.17/containerd.yaml | 2 +- .../testdata/v1.17/crio-options-gates.yaml | 2 +- .../bsutil/testdata/v1.17/crio.yaml | 2 +- .../bsutil/testdata/v1.17/default.yaml | 2 +- .../bsutil/testdata/v1.17/dns.yaml | 2 +- .../testdata/v1.17/image-repository.yaml | 2 +- .../bsutil/testdata/v1.17/options.yaml | 2 +- .../testdata/v1.18/containerd-api-port.yaml | 2 +- .../v1.18/containerd-pod-network-cidr.yaml | 2 +- .../bsutil/testdata/v1.18/containerd.yaml | 2 +- .../testdata/v1.18/crio-options-gates.yaml | 2 +- .../bsutil/testdata/v1.18/crio.yaml | 2 +- .../bsutil/testdata/v1.18/default.yaml | 2 +- .../bsutil/testdata/v1.18/dns.yaml | 2 +- .../testdata/v1.18/image-repository.yaml | 2 +- .../bsutil/testdata/v1.18/options.yaml | 2 +- .../testdata/v1.19/containerd-api-port.yaml | 2 +- .../v1.19/containerd-pod-network-cidr.yaml | 2 +- .../bsutil/testdata/v1.19/containerd.yaml | 2 +- .../testdata/v1.19/crio-options-gates.yaml | 2 +- .../bsutil/testdata/v1.19/crio.yaml | 2 +- .../bsutil/testdata/v1.19/default.yaml | 2 +- .../bsutil/testdata/v1.19/dns.yaml | 2 +- .../testdata/v1.19/image-repository.yaml | 2 +- .../bsutil/testdata/v1.19/options.yaml | 2 +- 85 files changed, 104 insertions(+), 102 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha1.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha1.go index 1bbe8c8921..a06d6cfb90 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha1.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha1.go @@ -27,7 +27,7 @@ kind: MasterConfiguration api: advertiseAddress: {{.AdvertiseAddress}} bindPort: {{.APIServerPort}} - controlPlaneEndpoint: {{.ControlPlaneIP}} + controlPlaneEndpoint: {{.ControlPlaneAddress}} kubernetesVersion: {{.KubernetesVersion}} certificatesDir: {{.CertDir}} networking: diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go index 6f9fbc3709..4c534c161e 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go @@ -52,7 +52,7 @@ kind: ClusterConfiguration certificatesDir: {{.CertDir}} clusterName: {{.ClusterName}} apiServerCertSANs: ["127.0.0.1", "localhost", "{{.AdvertiseAddress}}"] -controlPlaneEndpoint: {{.ControlPlaneIP}}:{{.APIServerPort}} +controlPlaneEndpoint: {{.ControlPlaneAddress}}:{{.APIServerPort}} etcd: local: dataDir: {{.EtcdDataDir}} diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go index 76608e85f6..1aca76201a 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go @@ -57,7 +57,7 @@ kind: ClusterConfiguration {{end -}}{{end -}} certificatesDir: {{.CertDir}} clusterName: {{.ClusterName}} -controlPlaneEndpoint: {{.ControlPlaneIP}}:{{.APIServerPort}} +controlPlaneEndpoint: {{.ControlPlaneAddress}}:{{.APIServerPort}} dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go index 095a5d3c75..c4718f9c98 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go @@ -57,7 +57,7 @@ kind: ClusterConfiguration {{end -}}{{end -}} certificatesDir: {{.CertDir}} clusterName: kubernetes -controlPlaneEndpoint: {{.ControlPlaneIP}}:{{.APIServerPort}} +controlPlaneEndpoint: {{.ControlPlaneAddress}}:{{.APIServerPort}} controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go index 483ee06428..eb67f9173c 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go @@ -65,23 +65,23 @@ func GenerateKubeadmYAML(mc config.ClusterConfig, r cruntime.Manager, n config.N } opts := struct { - CertDir string - ServiceCIDR string - PodSubnet string - AdvertiseAddress string - APIServerPort int - KubernetesVersion string - EtcdDataDir string - ClusterName string - NodeName string - DNSDomain string - CRISocket string - ImageRepository string - ComponentOptions []componentOptions - FeatureArgs map[string]bool - NoTaintMaster bool - NodeIP string - ControlPlaneIP string + CertDir string + ServiceCIDR string + PodSubnet string + AdvertiseAddress string + APIServerPort int + KubernetesVersion string + EtcdDataDir string + ClusterName string + NodeName string + DNSDomain string + CRISocket string + ImageRepository string + ComponentOptions []componentOptions + FeatureArgs map[string]bool + NoTaintMaster bool + NodeIP string + ControlPlaneAddress string }{ CertDir: vmpath.GuestKubernetesCertsDir, ServiceCIDR: constants.DefaultServiceCIDR, @@ -99,7 +99,9 @@ func GenerateKubeadmYAML(mc config.ClusterConfig, r cruntime.Manager, n config.N NoTaintMaster: false, // That does not work with k8s 1.12+ DNSDomain: k8s.DNSDomain, NodeIP: n.IP, - ControlPlaneIP: cp.IP, + // NOTE: If set to an specific VM IP, things may break if the IP changes on host restart + // For multi-node, we may need to figure out an alternate strategy, like DNS or hosts files + ControlPlaneAddress: "localhost", } if k8s.ServiceCIDR != "" { diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-api-port.yaml index ae79c8aa7a..7d94020c6f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-api-port.yaml +++ b/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: 1.1.1.1 + controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 certificatesDir: /var/lib/minikube/certs networking: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-pod-network-cidr.yaml index a8ce3c8dc7..f66eec734e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd-pod-network-cidr.yaml +++ b/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: 1.1.1.1 + controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 certificatesDir: /var/lib/minikube/certs networking: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml index a8ce3c8dc7..f66eec734e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml @@ -4,7 +4,7 @@ noTaintMaster: true api: advertiseAddress: 1.1.1.1 bindPort: 8443 - controlPlaneEndpoint: 1.1.1.1 + controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 certificatesDir: /var/lib/minikube/certs networking: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio-options-gates.yaml index 1a4d370e84..30b1986325 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio-options-gates.yaml +++ b/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: 1.1.1.1 + controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 certificatesDir: /var/lib/minikube/certs networking: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml index e179fbf4e3..4693643125 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml @@ -4,7 +4,7 @@ noTaintMaster: true api: advertiseAddress: 1.1.1.1 bindPort: 8443 - controlPlaneEndpoint: 1.1.1.1 + controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 certificatesDir: /var/lib/minikube/certs networking: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml index 68429da7bc..5c2861101e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml @@ -4,7 +4,7 @@ noTaintMaster: true api: advertiseAddress: 1.1.1.1 bindPort: 8443 - controlPlaneEndpoint: 1.1.1.1 + controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 certificatesDir: /var/lib/minikube/certs networking: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/image-repository.yaml index 651706493c..7d383865f8 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/image-repository.yaml +++ b/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: 1.1.1.1 + controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 certificatesDir: /var/lib/minikube/certs networking: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml index 5b192e1cfd..26fbfead4b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml @@ -4,7 +4,7 @@ noTaintMaster: true api: advertiseAddress: 1.1.1.1 bindPort: 8443 - controlPlaneEndpoint: 1.1.1.1 + controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 certificatesDir: /var/lib/minikube/certs networking: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml index d238dc006d..ba34af30df 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml @@ -24,7 +24,7 @@ apiServerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: localhost:12345 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml index 43d8cb9db9..0d821692e5 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml @@ -24,7 +24,7 @@ apiServerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml index 906417cd75..8ac889649f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml @@ -24,7 +24,7 @@ apiServerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml index 4e330111d5..5fb536a9f5 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml @@ -32,7 +32,7 @@ schedulerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml index 9f3474f006..a2e258468b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml @@ -24,7 +24,7 @@ apiServerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml index 9a644b6374..6db4345453 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml @@ -24,7 +24,7 @@ apiServerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml index 677a00d976..e0b60901ab 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml @@ -24,7 +24,7 @@ apiServerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml index 43c62451b3..595bd0c94c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml @@ -25,7 +25,7 @@ apiServerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml index ec651847c0..04237f4db1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml @@ -29,7 +29,7 @@ schedulerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml index 46152bcd1b..e4e9c885b2 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml @@ -24,7 +24,7 @@ apiServerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: localhost:12345 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml index 051bfe5159..ee58cf2201 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml @@ -24,7 +24,7 @@ apiServerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml index b4243328b5..a719307679 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml @@ -24,7 +24,7 @@ apiServerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml index 15f8991cfa..be69a16ec7 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml @@ -32,7 +32,7 @@ schedulerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml index 3cd23d6f41..c195ffc2ba 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml @@ -24,7 +24,7 @@ apiServerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml index 62f4e963ab..f7fc9b5199 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml @@ -24,7 +24,7 @@ apiServerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml index 62249bb72f..d9bb198b8f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml @@ -24,7 +24,7 @@ apiServerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml index 8e9fdeb1e1..0a1e7bab7b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml @@ -25,7 +25,7 @@ apiServerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml index 9118b977d1..3aa0b74754 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml @@ -29,7 +29,7 @@ schedulerExtraArgs: certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 etcd: local: dataDir: /var/lib/minikube/etcd diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml index f03b5f0b88..741ad12afb 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: localhost:12345 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml index c504a96382..54abf05793 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml index 8417e40c1b..df4740aaeb 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml index dd593a96bd..513e1f803a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml @@ -35,7 +35,7 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml index ca657effd6..1053c5c42f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml index 8769682a45..117c9070bf 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml index ce9e37938f..67c0df83a3 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml index 0add900fc0..c720ebac42 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml @@ -26,7 +26,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml index 17ac1d0e64..35aa4982b2 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml @@ -32,7 +32,7 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml index d02503d0e7..3048061426 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: localhost:12345 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml index 34d4392793..3a180ccafe 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml index 0ec436fd00..75a083a4ce 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml index d91af51d32..587faaf4de 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml @@ -35,7 +35,7 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml index 5c7f611bd0..680b24fe8d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml index 9995b54370..4ac5254431 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml index 754ab75a16..2403f96063 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml index df89922396..9e3d3e5088 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml @@ -26,7 +26,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml index 86194aeaaf..cf7d8c2964 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml @@ -32,7 +32,7 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml index a9e22c1c8a..2f1d050a40 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: localhost:12345 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml index 3c9baca9bd..ad749f03cc 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml index 4519b95243..ddc2d7cf74 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml index d4c3d30097..adbc88e1d7 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml @@ -35,7 +35,7 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml index 4a878c8c01..d401b50e81 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml index 5acb50187b..bf4ee2a96a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml index 70c8d26af1..9b464ae194 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml index 4e60387025..140db5ca32 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml @@ -26,7 +26,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml index 3d0c50bf1a..c7623c0e0f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml @@ -32,7 +32,7 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml index 73a38ea525..f10bad3678 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: localhost:12345 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml index 7b86081bb5..a8b4286a19 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml index 66a084c88e..4eb28ddba9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml index e35515bc01..78f465b4ab 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml @@ -35,7 +35,7 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml index 79af5ae1c0..179f18da35 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml index 8996b681e3..b223f2a7c5 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml index 2cc2321a34..5e8102e6ed 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml index 946496ddcb..676e6de52b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml @@ -26,7 +26,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml index bc3916095b..608569fb84 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml @@ -32,7 +32,7 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml index 5c09fb0015..af5af1f022 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: localhost:12345 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml index a5c0fb1a85..b1f3d8214f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml index a04a638ffb..317e578be8 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml index b237ccfe35..402ef57a02 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml @@ -35,7 +35,7 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml index 3c2dcbb0f2..74a7bd1536 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml index f34ef28895..7caa19fa2b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml index a67ca95f86..80a20ba800 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml index 1b6f95f659..7c1b7989db 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml @@ -26,7 +26,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml index 37516d5d8f..6205c948bc 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml @@ -32,7 +32,7 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml index ac0f734339..ba8872e7ce 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: localhost:12345 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml index 5d59c75a26..6b1a12c922 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml index 4d70349c96..c92bd1a314 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml index 4f1852e6b7..405c3354d2 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml @@ -35,7 +35,7 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml index ea7f329cce..c1dd4916df 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml index b3e2ca68f0..9f76b719a7 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml index 9c42c3fb96..bc0db1cb07 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml @@ -25,7 +25,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml index 01483b38e6..14cc7bb8b6 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml @@ -26,7 +26,7 @@ apiServer: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml index 6f175cf7d9..7b60865e15 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml @@ -32,7 +32,7 @@ scheduler: scheduler-name: "mini-scheduler" certificatesDir: /var/lib/minikube/certs clusterName: kubernetes -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: localhost:8443 controllerManager: {} dns: type: CoreDNS From cdb8f9c3f6f6b2dc805c182df98c2e9193cfd014 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 6 Mar 2020 15:08:39 -0800 Subject: [PATCH 2/5] make sure container is running after create --- pkg/drivers/kic/oci/oci.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 32835d7056..d6b0a6cef4 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -29,6 +29,7 @@ import ( "github.com/pkg/errors" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/localpath" + "k8s.io/minikube/pkg/util/retry" "fmt" "os/exec" @@ -164,6 +165,23 @@ func CreateContainerNode(p CreateParams) error { if err != nil { return errors.Wrap(err, "create a kic node") } + + checkRunning := func() error { + s, err := ContainerStatus(p.OCIBinary, p.Name) + if err != nil { + return fmt.Errorf("temporary error checking status for %q : %v", p.Name, err) + } + if s != "running" { + return fmt.Errorf("temporary error created container %q is not running yet", p.Name) + } + return nil + } + + // retry up to up 5 seconds to make sure the created container status is running. + if err = retry.Expo(checkRunning, 1*time.Microsecond, time.Second*5); err != nil { + glog.Warningf("The created container %q failed to be report be running in 5 seconds.", p.Name) + } + return nil } From cb14468b4465dde4dc471012d5e26fc1a0dfc118 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 6 Mar 2020 15:11:42 -0800 Subject: [PATCH 3/5] english --- pkg/drivers/kic/oci/oci.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index d6b0a6cef4..45f1a3a7aa 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -179,7 +179,7 @@ func CreateContainerNode(p CreateParams) error { // retry up to up 5 seconds to make sure the created container status is running. if err = retry.Expo(checkRunning, 1*time.Microsecond, time.Second*5); err != nil { - glog.Warningf("The created container %q failed to be report be running in 5 seconds.", p.Name) + glog.Warningf("The created container %q failed to report to be running in 5 seconds.", p.Name) } return nil From a58a9f0176536a172eb9f3ec97481a79d15f66c8 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 6 Mar 2020 15:13:56 -0800 Subject: [PATCH 4/5] tweak --- pkg/drivers/kic/oci/oci.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 45f1a3a7aa..836d62e9b1 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -178,7 +178,7 @@ func CreateContainerNode(p CreateParams) error { } // retry up to up 5 seconds to make sure the created container status is running. - if err = retry.Expo(checkRunning, 1*time.Microsecond, time.Second*5); err != nil { + if err = retry.Expo(checkRunning, 13*time.Millisecond, time.Second*5); err != nil { glog.Warningf("The created container %q failed to report to be running in 5 seconds.", p.Name) } From 4f28debc794067868b5e22426f799d454ae83b54 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 6 Mar 2020 16:00:02 -0800 Subject: [PATCH 5/5] update changelog --- CHANGELOG.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20b2a22343..1a0c49492a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,32 +5,32 @@ Exciting new improvements: * Promote docker driver priority from "experimental" to "fallback" [#6791](https://github.com/kubernetes/minikube/pull/6791) +* Preload tarball images for kic drivers (docker,podman) [#6720](https://github.com/kubernetes/minikube/pull/6720) +* Preload tarball images for VMs drivers as well [#6898](https://github.com/kubernetes/minikube/pull/6898) * Add tunnel for docker driver on darwin [#6460](https://github.com/kubernetes/minikube/pull/6460) -* kic on mac: add service cmd support [#6811](https://github.com/kubernetes/minikube/pull/6811) -* Add cri-o runtime to kic drivers and improve kic image [#6756](https://github.com/kubernetes/minikube/pull/6756) -* add mount feature to kic drivers [#6630](https://github.com/kubernetes/minikube/pull/6630) +* Add service feature to docker driver on darwin [#6811](https://github.com/kubernetes/minikube/pull/6811) +* Add cri-o runtime to kic drivers (podman,docker) [#6756](https://github.com/kubernetes/minikube/pull/6756) +* Add mount feature to kic drivers (podman,docker) [#6630](https://github.com/kubernetes/minikube/pull/6630) +* Rename --vm-driver flag to --driver for start command [#6888](https://github.com/kubernetes/minikube/pull/6888) * Add Korean translation [#6910](https://github.com/kubernetes/minikube/pull/6910) * Add k8s binaries to preloaded tarball [#6870](https://github.com/kubernetes/minikube/pull/6870) * Add lz4 and tar to iso [#6897](https://github.com/kubernetes/minikube/pull/6897) * Add packaging of the falco_probe kernel module [#6560](https://github.com/kubernetes/minikube/pull/6560) * Automatically scale the default memory allocation [#6900](https://github.com/kubernetes/minikube/pull/6900) * Change cgroup driver from cgroupfs to systemd [#6651](https://github.com/kubernetes/minikube/pull/6651) -* Preload images into docker volume [#6720](https://github.com/kubernetes/minikube/pull/6720) -* Switch --vm-driver parameter to --driver [#6888](https://github.com/kubernetes/minikube/pull/6888) * Unify downloaders, add GitHub and Alibaba ISO fallbacks [#6892](https://github.com/kubernetes/minikube/pull/6892) * Upgrade cni and cni-plugins to spec 0.4.0 [#6784](https://github.com/kubernetes/minikube/pull/6784) -* Use preloaded tarball for VMs as well [#6898](https://github.com/kubernetes/minikube/pull/6898) - -* label minikube nodes [#6717](https://github.com/kubernetes/minikube/pull/6717) -* Add some Chinese translations [#6813](https://github.com/kubernetes/minikube/pull/6813) -* update registry 2.6.1 → 2.7.1 [#6707](https://github.com/kubernetes/minikube/pull/6707) +* Label minikube nodes [#6717](https://github.com/kubernetes/minikube/pull/6717) +* Add more Chinese translations [#6813](https://github.com/kubernetes/minikube/pull/6813) +* Update addon registry 2.6.1 → 2.7.1 [#6707](https://github.com/kubernetes/minikube/pull/6707) +* Use 'k8s.gcr.io' instead of 'gcr.io/google-containers' [#6908](https://github.com/kubernetes/minikube/pull/6908) Important bug fixes: +* Fix inverted certificate symlink creation logic [#6889](https://github.com/kubernetes/minikube/pull/6889) * Add systemd patch for handling DHCP router [#6659](https://github.com/kubernetes/minikube/pull/6659) * Docker: handle already in use container name [#6906](https://github.com/kubernetes/minikube/pull/6906) * Fix delete --all if using non default profile [#6875](https://github.com/kubernetes/minikube/pull/6875) -* Fix inverted certificate symlink creation logic [#6889](https://github.com/kubernetes/minikube/pull/6889) * Fix native-ssh flag for the ssh command [#6858](https://github.com/kubernetes/minikube/pull/6858) * Fix start for existing profile with different vm-driver [#6828](https://github.com/kubernetes/minikube/pull/6828) * Fix: disabling a disabled addon should not error [#6817](https://github.com/kubernetes/minikube/pull/6817) @@ -38,10 +38,11 @@ Important bug fixes: * Generate fish compatible docker-env hint [#6744](https://github.com/kubernetes/minikube/pull/6744) * Specifying control plane IP in kubeadm config template [#6745](https://github.com/kubernetes/minikube/pull/6745) * hyperv detection: increase timeout from 2s to 8s [#6701](https://github.com/kubernetes/minikube/pull/6701) -* kic: fix service list for docker on osx [#6830](https://github.com/kubernetes/minikube/pull/6830) -* kic: fix unprivileged port bind tunnel docker for mac [#6833](https://github.com/kubernetes/minikube/pull/6833) +* kic: fix service list for docker on darwin [#6830](https://github.com/kubernetes/minikube/pull/6830) +* kic: fix unprivileged port bind tunnel docker for darwin [#6833](https://github.com/kubernetes/minikube/pull/6833) * profile list: exit zero even if one profile is not ready [#6882](https://github.com/kubernetes/minikube/pull/6882) * tunnel on docker driver on mac: fix known_hosts issue [#6810](https://github.com/kubernetes/minikube/pull/6810) +* docker-env: fix semicolons required for fish 2.x users [#6915](https://github.com/kubernetes/minikube/pull/6915) Thank you to everyone who helped with this extraordinary release. We now invite everyone to give the `--driver=docker` option a try!