From b70115d00e1b61ae2449d4c5fe2592732f73b148 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Wed, 25 Mar 2020 21:47:33 -0700 Subject: [PATCH 1/6] Add hosts aliases for control-plane and VM host --- pkg/minikube/bootstrapper/bootstrapper.go | 2 +- pkg/minikube/bootstrapper/bsutil/kubeadm.go | 2 +- pkg/minikube/bootstrapper/certs.go | 3 ++- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 16 ++++++++++++++-- pkg/minikube/constants/constants.go | 4 ++++ pkg/minikube/machine/start.go | 16 ++++++++++++++++ pkg/minikube/node/start.go | 16 +++++++++++++++- 7 files changed, 53 insertions(+), 6 deletions(-) diff --git a/pkg/minikube/bootstrapper/bootstrapper.go b/pkg/minikube/bootstrapper/bootstrapper.go index 598397b17153..1b940390c406 100644 --- a/pkg/minikube/bootstrapper/bootstrapper.go +++ b/pkg/minikube/bootstrapper/bootstrapper.go @@ -41,7 +41,7 @@ type Bootstrapper interface { DeleteCluster(config.KubernetesConfig) error WaitForNode(config.ClusterConfig, config.Node, time.Duration) error JoinCluster(config.ClusterConfig, config.Node, string) error - UpdateNode(config.ClusterConfig, config.Node, cruntime.Manager) error + UpdateNode(config.ClusterConfig, config.Node, cruntime.Manager, config.Node) error GenerateToken(config.ClusterConfig) (string, error) // LogCommands returns a map of log type to a command which will display that log. LogCommands(config.ClusterConfig, LogOptions) map[string]string diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go index 46104c1d446e..5dd5908f2a76 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go @@ -101,7 +101,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana NoTaintMaster: false, // That does not work with k8s 1.12+ DNSDomain: k8s.DNSDomain, NodeIP: n.IP, - ControlPlaneAddress: cp.IP, + ControlPlaneAddress: constants.ControlPlaneAlias, } if k8s.ServiceCIDR != "" { diff --git a/pkg/minikube/bootstrapper/certs.go b/pkg/minikube/bootstrapper/certs.go index de938082ccd6..77fad2434e73 100644 --- a/pkg/minikube/bootstrapper/certs.go +++ b/pkg/minikube/bootstrapper/certs.go @@ -39,6 +39,7 @@ import ( "k8s.io/minikube/pkg/minikube/assets" "k8s.io/minikube/pkg/minikube/command" "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/kubeconfig" "k8s.io/minikube/pkg/minikube/localpath" "k8s.io/minikube/pkg/minikube/vmpath" @@ -189,7 +190,7 @@ func generateProfileCerts(k8s config.KubernetesConfig, n config.Node, ccs CACert apiServerIPs := append( k8s.APIServerIPs, []net.IP{net.ParseIP(n.IP), serviceIP, net.ParseIP(oci.DefaultBindIPV4), net.ParseIP("10.0.0.1")}...) - apiServerNames := append(k8s.APIServerNames, k8s.APIServerName) + apiServerNames := append(k8s.APIServerNames, k8s.APIServerName, constants.ControlPlaneAlias) apiServerAlternateNames := append( apiServerNames, util.GetAlternateDNS(k8s.DNSDomain)...) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 4ccc40269849..1447cb78d9b0 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -586,8 +586,14 @@ func (k *Bootstrapper) UpdateCluster(cfg config.ClusterConfig) error { } } + // In case of no port assigned, use default + cp, err := config.PrimaryControlPlane(&cfg) + if err != nil { + return errors.Wrap(err, "getting control plane") + } + for _, n := range cfg.Nodes { - err := k.UpdateNode(cfg, n, r) + err := k.UpdateNode(cfg, n, r, cp) if err != nil { return errors.Wrap(err, "updating node") } @@ -597,7 +603,9 @@ func (k *Bootstrapper) UpdateCluster(cfg config.ClusterConfig) error { } // UpdateNode updates a node. -func (k *Bootstrapper) UpdateNode(cfg config.ClusterConfig, n config.Node, r cruntime.Manager) error { +func (k *Bootstrapper) UpdateNode(cfg config.ClusterConfig, n config.Node, r cruntime.Manager, cp config.Node) error { + glog.Infof("UPDATING NODE: %v", n.Name) + kubeadmCfg, err := bsutil.GenerateKubeadmYAML(cfg, n, r) if err != nil { return errors.Wrap(err, "generating kubeadm cfg") @@ -630,6 +638,10 @@ func (k *Bootstrapper) UpdateNode(cfg config.ClusterConfig, n config.Node, r cru return err } + if err := machine.AddHostAlias(k.c, constants.ControlPlaneAlias, net.ParseIP(cp.IP)); err != nil { + return errors.Wrap(err, "host alias") + } + if err := reloadKubelet(k.c); err != nil { return err } diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index af053eee32cd..e2dda5671db3 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -47,6 +47,10 @@ const ( ClusterDNSDomain = "cluster.local" // DefaultServiceCIDR is The CIDR to be used for service cluster IPs DefaultServiceCIDR = "10.96.0.0/12" + // HostAlias is a DNS alias to the the container/VM host IP + HostAlias = "host.minikube.internal" + // ControlPaneAlias is a DNS alias pointing to the apiserver frontend + ControlPlaneAlias = "apiserver.minikube.internal" // DockerHostEnv is used for docker daemon settings DockerHostEnv = "DOCKER_HOST" diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go index c41b285a2f32..d848f0724e77 100644 --- a/pkg/minikube/machine/start.go +++ b/pkg/minikube/machine/start.go @@ -19,6 +19,7 @@ package machine import ( "encoding/json" "fmt" + "net" "os/exec" "path" "path/filepath" @@ -288,3 +289,18 @@ func showHostInfo(cfg config.ClusterConfig) { } out.T(out.StartingVM, "Creating {{.driver_name}} {{.machine_type}} (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...", out.V{"driver_name": cfg.Driver, "number_of_cpus": cfg.CPUs, "memory_size": cfg.Memory, "disk_size": cfg.DiskSize, "machine_type": machineType}) } + +// AddHostAlias makes fine adjustments to pod resources that aren't possible via kubeadm config. +func AddHostAlias(c command.Runner, name string, ip net.IP) error { + glog.Infof("checking") + record := fmt.Sprintf("%s\t%s", ip, name) + if _, err := c.RunCmd(exec.Command("grep", record+"$", "/etc/hosts")); err == nil { + return nil + } + + script := fmt.Sprintf(`{ grep -v '\t%s$' /etc/hosts; echo "%s"; } > /tmp/h.$$; sudo mv /tmp/h.$$ /etc/hosts`, name, record) + if _, err := c.RunCmd(exec.Command("/bin/bash", "-c", script)); err != nil { + return errors.Wrap(err, "hosts update") + } + return nil +} diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 5f7b131a6ebc..9ee2317e866a 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -100,6 +100,14 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo cr := configureRuntimes(mRunner, cc.Driver, cc.KubernetesConfig, sv) showVersionInfo(n.KubernetesVersion, cr) + hostIP, err := cluster.GetVMHostIP(host) + if err != nil { + exit.WithError("Unable to get VM IP", err) + } + if err := machine.AddHostAlias(mRunner, constants.HostAlias, hostIP); err != nil { + exit.WithError("Unable to add host alias", err) + } + var bs bootstrapper.Bootstrapper var kubeconfig *kubeconfig.Settings if apiServer { @@ -138,6 +146,12 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo addons.Start(viper.GetString(config.ProfileName), existingAddons, config.AddonList) } + // In case of no port assigned, use default + cp, err := config.PrimaryControlPlane(&cc) + if err != nil { + exit.WithError("Unable to get control plane", err) + } + if apiServer { // special ops for none , like change minikube directory. // multinode super doesn't work on the none driver @@ -152,7 +166,7 @@ func Start(cc config.ClusterConfig, n config.Node, existingAddons map[string]boo } } } else { - if err := bs.UpdateNode(cc, n, cr); err != nil { + if err := bs.UpdateNode(cc, n, cr, cp); err != nil { exit.WithError("Updating node", err) } From f75616304457fa4cb87a161e5bb8d832a2b4aa06 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Wed, 25 Mar 2020 21:53:17 -0700 Subject: [PATCH 2/6] apiserver -> control-plane --- pkg/minikube/constants/constants.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index e2dda5671db3..e777cdd3da0e 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -50,7 +50,7 @@ const ( // HostAlias is a DNS alias to the the container/VM host IP HostAlias = "host.minikube.internal" // ControlPaneAlias is a DNS alias pointing to the apiserver frontend - ControlPlaneAlias = "apiserver.minikube.internal" + ControlPlaneAlias = "control-plane.minikube.internal" // DockerHostEnv is used for docker daemon settings DockerHostEnv = "DOCKER_HOST" From b50e816d1078c86ef6ff5ea17e307bb15c73e0a5 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Tue, 21 Apr 2020 11:14:50 -0700 Subject: [PATCH 3/6] Make inability to add host IP non-fatal --- pkg/minikube/node/start.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index fb4324026dff..39233950dda5 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -88,12 +88,14 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { cr := configureRuntimes(starter.Runner, *starter.Cfg, sv) showVersionInfo(starter.Node.KubernetesVersion, cr) - hostIP, err := cluster.GetVMHostIP(starter.Host) + // Add "host.minikube.internal" DNS alias (intentionally non-fatal) + hostIP, err := cluster.HostIP(starter.Host) if err != nil { - exit.WithError("Unable to get VM IP", err) - } - if err := machine.AddHostAlias(starter.Runner, constants.HostAlias, hostIP); err != nil { - exit.WithError("Unable to add host alias", err) + glog.Errorf("Unable to get VM IP", err) + } else { + if err := machine.AddHostAlias(starter.Runner, constants.HostAlias, hostIP); err != nil { + glog.Errorf("Unable to add host alias", err) + } } var bs bootstrapper.Bootstrapper From 23fa28f739d7e89043759784fa0f97b92b0788c4 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Tue, 21 Apr 2020 11:15:04 -0700 Subject: [PATCH 4/6] Add HostIP support for none, reduce tech debt --- cmd/minikube/cmd/mount.go | 2 +- cmd/minikube/cmd/status.go | 2 +- pkg/minikube/cluster/ip.go | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cmd/minikube/cmd/mount.go b/cmd/minikube/cmd/mount.go index fa0db9f75d34..ec64cd6638ed 100644 --- a/cmd/minikube/cmd/mount.go +++ b/cmd/minikube/cmd/mount.go @@ -106,7 +106,7 @@ var mountCmd = &cobra.Command{ var ip net.IP var err error if mountIP == "" { - ip, err = cluster.GetVMHostIP(co.CP.Host) + ip, err = cluster.HostIP(co.CP.Host) if err != nil { exit.WithError("Error getting the host IP address to use from within the VM", err) } diff --git a/cmd/minikube/cmd/status.go b/cmd/minikube/cmd/status.go index 5f4ca77767b9..da21d748c20f 100644 --- a/cmd/minikube/cmd/status.go +++ b/cmd/minikube/cmd/status.go @@ -188,7 +188,7 @@ func status(api libmachine.API, cc config.ClusterConfig, n config.Node) (*Status } // We have a fully operational host, now we can check for details - if _, err := cluster.GetHostDriverIP(api, name); err != nil { + if _, err := cluster.DriverIP(api, name); err != nil { glog.Errorf("failed to get driver ip: %v", err) st.Host = state.Error.String() return st, err diff --git a/pkg/minikube/cluster/ip.go b/pkg/minikube/cluster/ip.go index 7ec11064c2a2..2addca2bf676 100644 --- a/pkg/minikube/cluster/ip.go +++ b/pkg/minikube/cluster/ip.go @@ -30,8 +30,8 @@ import ( "k8s.io/minikube/pkg/minikube/machine" ) -// GetVMHostIP gets the ip address to be used for mapping host -> VM and VM -> host -func GetVMHostIP(host *host.Host) (net.IP, error) { +// HostIP gets the ip address to be used for mapping host -> VM and VM -> host +func HostIP(host *host.Host) (net.IP, error) { switch host.DriverName { case driver.Docker: return oci.RoutableHostIPFromInside(oci.Docker, host.Name) @@ -72,13 +72,15 @@ func GetVMHostIP(host *host.Host) (net.IP, error) { return []byte{}, errors.Wrap(err, "Error converting VM IP address to IPv4 address") } return net.IPv4(vmIP[0], vmIP[1], vmIP[2], byte(1)), nil + case driver.None: + return net.ParseIP("127.0.0.1"), nil default: - return []byte{}, errors.New("Error, attempted to get host ip address for unsupported driver") + return []byte{}, fmt.Errorf("HostIP not yet implemented for %q driver", host.DriverName) } } -// GetHostDriverIP gets the ip address of the current minikube cluster -func GetHostDriverIP(api libmachine.API, machineName string) (net.IP, error) { +// DriverIP gets the ip address of the current minikube cluster +func DriverIP(api libmachine.API, machineName string) (net.IP, error) { host, err := machine.LoadHost(api, machineName) if err != nil { return nil, err From 6e2d0867212ec39452928d2593aebf6700dd89c3 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Tue, 21 Apr 2020 11:18:44 -0700 Subject: [PATCH 5/6] Address lint errors --- pkg/minikube/node/start.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 39233950dda5..cb3931dbff02 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -91,11 +91,9 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { // Add "host.minikube.internal" DNS alias (intentionally non-fatal) hostIP, err := cluster.HostIP(starter.Host) if err != nil { - glog.Errorf("Unable to get VM IP", err) - } else { - if err := machine.AddHostAlias(starter.Runner, constants.HostAlias, hostIP); err != nil { - glog.Errorf("Unable to add host alias", err) - } + glog.Errorf("Unable to get host IP: %v", err) + } else if err := machine.AddHostAlias(starter.Runner, constants.HostAlias, hostIP); err != nil { + glog.Errorf("Unable to add host alias: %v", err) } var bs bootstrapper.Bootstrapper From bb6200516c8d98756126af55f3ceaea0858800cc Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Tue, 21 Apr 2020 11:21:19 -0700 Subject: [PATCH 6/6] Update examples --- .../bootstrapper/bsutil/testdata/v1.11/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.11/containerd-pod-network-cidr.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.11/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.11/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.12/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.12/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.12/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.13/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.13/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.13/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.14/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.15/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.16/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.17/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.18/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml | 2 +- .../bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml | 2 +- .../bootstrapper/bsutil/testdata/v1.19/image-repository.yaml | 2 +- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml | 2 +- 80 files changed, 80 insertions(+), 80 deletions(-) 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 ae79c8aa7a47..be58f504e954 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: control-plane.minikube.internal 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 a8ce3c8dc760..043abb863216 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: control-plane.minikube.internal 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 a8ce3c8dc760..043abb863216 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: control-plane.minikube.internal 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 1a4d370e84bf..1256ec38b5ee 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: control-plane.minikube.internal 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 e179fbf4e38f..6481d10b9018 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: control-plane.minikube.internal 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 68429da7bc8e..ee015643cfad 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: control-plane.minikube.internal 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 651706493cb8..9ce35121be1f 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: control-plane.minikube.internal 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 5b192e1cfd43..2512d833de1d 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: control-plane.minikube.internal 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 e7ae37e44a5f..b46a0f3d4c9e 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: control-plane.minikube.internal: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 d49b9ec30658..f9fee2ad6c94 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 e8bc0ce7da65..ca4888795907 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 71c60951ac85..cb5090b8e03e 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 1f79aeb4d648..f3fa3252ccaa 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 5588fe6c755b..ce8452e0d969 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 7092fb6277ac..4608706132ca 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 a22a4d75cc48..62ab4b080f2e 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 1303e6b6acaf..9e2e66869d48 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 4389e10b5aee..12512a305a34 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: control-plane.minikube.internal: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 71d7a676bea6..8eeed433f9c0 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 485394334fdc..bf3700c47421 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 4fa17efa5e73..929e4d12308d 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 f5daeef55d03..659215754afb 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 d99a3fbfaf86..b9bf43eb4179 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 23bac82149d0..a5caf8deffc0 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 924f4fc5a9d0..eea514431c16 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 3d9770bed65d..c6e5c52122c8 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: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 fc26257b5548..c64e862d1516 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: mk -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: control-plane.minikube.internal: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 9608b9286087..5025da9446eb 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 c3a54825dd42..ef62f65b5ad0 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 7b43973e7d2d..677b4220df76 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 fa5b62cb0255..966784ad94eb 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 84f68f98fcb5..068fbc1553ba 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 8791cf879f1d..87fcf83e2c8a 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 b1c12c218e11..d714f61e4313 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 72302c565422..abab48e16dcb 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 307f517ace2a..03d394574b14 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: mk -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: control-plane.minikube.internal: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 9a0077f387d3..93d158074fc4 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 3fee964be411..998960e6a021 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 b07e909cc27e..8fc07ef58f46 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 c30eed071bde..23483d115a4f 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 99c6275ebd3c..0555cfec6a77 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 7a41b4cd55af..045e9baa2418 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 053a5977f950..749ed067a2ee 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 bac9bdd0c100..d71ad0963599 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 1ac14c682af6..94576d3a8d33 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: mk -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: control-plane.minikube.internal: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 0a43dd453b77..b5ef52316a62 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 13ebbb05a2b6..2f4932f1d72f 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 56388066f7ec..58520fcc1004 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 70d0f5219b08..6867c3819757 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 fd99dfc61610..5ea28708d48a 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 8c880bada832..a82d51453d4d 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 919063dda812..e86a63b95dc0 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 bf5753a22496..90053250f320 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal: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 43b450f5c01a..598edbdc78e7 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: mk -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: control-plane.minikube.internal:12345 dns: type: CoreDNS etcd: 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 9cc48c0109d8..7b720b1febe9 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml index fd4f8c324d2b..9974058e1cbc 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: 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 658763f28fc4..35728b48d29d 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml index f4c255c0c18a..19344925c939 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml index 03b1632e5033..2ed68ad9fecb 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml index bf54c687964a..b037f034e7a6 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: 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 607c43532c58..837c3115f51e 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml index 2dfa4b76fd73..6c41f706bf21 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: 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 376b6dd2fa4b..b58afd15279c 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: mk -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: control-plane.minikube.internal:12345 dns: type: CoreDNS etcd: 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 910e9e9596ff..14fae0f92b82 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml index 30b062ee5844..699175017fd2 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: 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 2f787eb95f73..a5e764ab3471 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml index ab798b8bf70c..6c27fb067794 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml index 12ae87fcd30e..fbe19f0bb989 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml index abb27ec9fbbd..c513fd7fa43a 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: 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 c22581b268a0..2aa15c494bfd 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml index 65e991dbce62..97167238f98f 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: 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 5c7c731951c7..5515f204a5fa 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: mk -controlPlaneEndpoint: 1.1.1.1:12345 +controlPlaneEndpoint: control-plane.minikube.internal:12345 dns: type: CoreDNS etcd: 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 833a7ce60498..fa98955de84d 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml index 6e2bca9c650c..32cd70beb63b 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: 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 9183325cffdd..c2327fc5344f 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml index 7c8a91362faa..6108566892b8 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml index efe78f9ea480..3522b8ae6538 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml index c771a624eeb8..24e7e299e849 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: 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 0d9e4b7b4a67..facd3abe0816 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml index c288ba36c46b..1b8da1d8c97b 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: mk -controlPlaneEndpoint: 1.1.1.1:8443 +controlPlaneEndpoint: control-plane.minikube.internal:8443 dns: type: CoreDNS etcd: