From 24b1b99c34e676d88c6f07182b5a94587c77a27c Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 5 Feb 2020 17:22:34 -0800 Subject: [PATCH 01/63] Add initial podman --- pkg/drivers/kic/types.go | 2 +- pkg/minikube/driver/driver.go | 2 + pkg/minikube/driver/driver_darwin.go | 1 + pkg/minikube/registry/drvs/init.go | 1 + pkg/minikube/registry/drvs/podman/podman.go | 74 +++++++++++++++++++++ 5 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 pkg/minikube/registry/drvs/podman/podman.go diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 317ee956f0a1..250e674fd929 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -26,7 +26,7 @@ const ( // DefaultBindIPV4 is The default IP the container will bind to. DefaultBindIPV4 = "127.0.0.1" // BaseImage is the base image is used to spin up kic containers. it uses same base-image as kind. - BaseImage = "gcr.io/k8s-minikube/kicbase:v0.0.5@sha256:3ddd8461dfb5c3e452ccc44d87750b87a574ec23fc425da67dccc1f0c57d428a" + BaseImage = "gcr.io/k8s-minikube/kicbase:v0.0.5" // OverlayImage is the cni plugin used for overlay image, created by kind. // CNI plugin image used for kic drivers created by kind. OverlayImage = "kindest/kindnetd:0.5.3" diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go index c00e7adb31e5..ecd38fbe01ca 100644 --- a/pkg/minikube/driver/driver.go +++ b/pkg/minikube/driver/driver.go @@ -28,6 +28,8 @@ import ( ) const ( + // Podman is Kubernetes in container using podman driver + Podman = "podman" // Docker is Kubernetes in container using docker driver Docker = "docker" // Mock driver diff --git a/pkg/minikube/driver/driver_darwin.go b/pkg/minikube/driver/driver_darwin.go index 4310aab74202..f951177677c2 100644 --- a/pkg/minikube/driver/driver_darwin.go +++ b/pkg/minikube/driver/driver_darwin.go @@ -26,6 +26,7 @@ var supportedDrivers = []string{ HyperKit, VMware, Docker, + Podman, } func VBoxManagePath() string { diff --git a/pkg/minikube/registry/drvs/init.go b/pkg/minikube/registry/drvs/init.go index e585c4b5d522..45f2d53b2b3a 100644 --- a/pkg/minikube/registry/drvs/init.go +++ b/pkg/minikube/registry/drvs/init.go @@ -18,6 +18,7 @@ package drvs import ( // Register all of the drvs we know of + _ "k8s.io/minikube/pkg/minikube/registry/drvs/podman" _ "k8s.io/minikube/pkg/minikube/registry/drvs/docker" _ "k8s.io/minikube/pkg/minikube/registry/drvs/hyperkit" _ "k8s.io/minikube/pkg/minikube/registry/drvs/hyperv" diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go new file mode 100644 index 000000000000..9859c22580ce --- /dev/null +++ b/pkg/minikube/registry/drvs/podman/podman.go @@ -0,0 +1,74 @@ +/* +Copyright 2019 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package podman + +import ( + "context" + "fmt" + "os/exec" + "time" + + "github.com/docker/machine/libmachine/drivers" + "k8s.io/minikube/pkg/drivers/kic" + "k8s.io/minikube/pkg/drivers/kic/oci" + "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/driver" + "k8s.io/minikube/pkg/minikube/localpath" + "k8s.io/minikube/pkg/minikube/registry" +) + +func init() { + if err := registry.Register(registry.DriverDef{ + Name: driver.Podman, + Config: configure, + Init: func() drivers.Driver { return kic.NewDriver(kic.Config{OCIBinary: oci.Podman}) }, + Status: status, + Priority: registry.Experimental, + }); err != nil { + panic(fmt.Sprintf("register failed: %v", err)) + } +} + +func configure(mc config.MachineConfig) interface{} { + return kic.NewDriver(kic.Config{ + MachineName: mc.Name, + StorePath: localpath.MiniPath(), + ImageDigest: kic.BaseImage, + CPU: mc.CPUs, + Memory: mc.Memory, + OCIBinary: oci.Podman, + APIServerPort: mc.Nodes[0].Port, + }) + +} + +func status() registry.State { + _, err := exec.LookPath(oci.Podman) + if err != nil { + return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Podman is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/kic/"} + } + // Allow no more than 2 seconds for querying state + ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) + defer cancel() + + err = exec.CommandContext(ctx, oci.Podman, "info").Run() + if err != nil { + return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Podman is not running. Try: restarting podman."} + } + + return registry.State{Installed: true, Healthy: true} +} From e8a71377539cf4d1f84fd6d84b4f89c91e6c86ce Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 5 Feb 2020 18:04:08 -0800 Subject: [PATCH 02/63] Add cgroup option for podman and remove resource limit for podman --- cmd/minikube/cmd/config/configure.go | 18 ++++++++-------- pkg/drivers/kic/oci/oci.go | 11 ++++++++-- pkg/drivers/kic/types.go | 2 +- pkg/minikube/config/config_test.go | 8 +++---- pkg/minikube/registry/drvs/init.go | 2 +- pkg/minikube/registry/drvs/podman/podman.go | 3 ++- pkg/minikube/service/service_test.go | 24 ++++++++++----------- pkg/util/crypto.go | 2 +- 8 files changed, 39 insertions(+), 31 deletions(-) diff --git a/cmd/minikube/cmd/config/configure.go b/cmd/minikube/cmd/config/configure.go index 412fa1204d1f..80c61d1c994c 100644 --- a/cmd/minikube/cmd/config/configure.go +++ b/cmd/minikube/cmd/config/configure.go @@ -113,8 +113,8 @@ var addonsConfigureCmd = &cobra.Command{ "aws-assume-role": awsRole, }, map[string]string{ - "app": "registry-creds", - "cloud": "ecr", + "app": "registry-creds", + "cloud": "ecr", "kubernetes.io/minikube-addons": "registry-creds", }) @@ -128,11 +128,11 @@ var addonsConfigureCmd = &cobra.Command{ "registry-creds-gcr", map[string]string{ "application_default_credentials.json": gcrApplicationDefaultCredentials, - "gcrurl": gcrURL, + "gcrurl": gcrURL, }, map[string]string{ - "app": "registry-creds", - "cloud": "gcr", + "app": "registry-creds", + "cloud": "gcr", "kubernetes.io/minikube-addons": "registry-creds", }) @@ -150,8 +150,8 @@ var addonsConfigureCmd = &cobra.Command{ "DOCKER_PRIVATE_REGISTRY_PASSWORD": dockerPass, }, map[string]string{ - "app": "registry-creds", - "cloud": "dpr", + "app": "registry-creds", + "cloud": "dpr", "kubernetes.io/minikube-addons": "registry-creds", }) @@ -169,8 +169,8 @@ var addonsConfigureCmd = &cobra.Command{ "ACR_PASSWORD": acrPassword, }, map[string]string{ - "app": "registry-creds", - "cloud": "acr", + "app": "registry-creds", + "cloud": "acr", "kubernetes.io/minikube-addons": "registry-creds", }) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 9f8ddd6048f8..5ea9b6771dfb 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -39,8 +39,6 @@ func CreateContainerNode(p CreateParams) error { } runArgs := []string{ - fmt.Sprintf("--cpus=%s", p.CPUs), - fmt.Sprintf("--memory=%s", p.Memory), "-d", // run the container detached "-t", // allocate a tty for entrypoint logs // running containers in a container requires privileged @@ -63,6 +61,11 @@ func CreateContainerNode(p CreateParams) error { // label the node with the role ID "--label", fmt.Sprintf("%s=%s", nodeRoleKey, p.Role), } + // Podman does not allow setting resources when cgroup is specified + // exact podman error: "Error: invalid configuration, cannot set resources with rootless containers not using cgroups v2 unified mode" + if o.ociBinary != Podman { + runArgs = append(runArgs, fmt.Sprintf("--cpus=%s", p.CPUs), fmt.Sprintf("--memory=%s", p.Memory)) + } for key, val := range p.Envs { runArgs = append(runArgs, "-e", fmt.Sprintf("%s=%s", key, val)) @@ -113,6 +116,10 @@ func createContainer(ociBinary string, image string, opts ...createOpt) ([]strin } // construct the actual docker run argv args := []string{"run"} + // to run nested container from privileged container in podman https://bugzilla.redhat.com/show_bug.cgi?id=1687713 + if ociBinary == Podman { + args = append(args, "--cgroup-manager", "cgroupfs") + } args = append(args, runArgs...) args = append(args, image) args = append(args, o.ContainerArgs...) diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 250e674fd929..317ee956f0a1 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -26,7 +26,7 @@ const ( // DefaultBindIPV4 is The default IP the container will bind to. DefaultBindIPV4 = "127.0.0.1" // BaseImage is the base image is used to spin up kic containers. it uses same base-image as kind. - BaseImage = "gcr.io/k8s-minikube/kicbase:v0.0.5" + BaseImage = "gcr.io/k8s-minikube/kicbase:v0.0.5@sha256:3ddd8461dfb5c3e452ccc44d87750b87a574ec23fc425da67dccc1f0c57d428a" // OverlayImage is the cni plugin used for overlay image, created by kind. // CNI plugin image used for kic drivers created by kind. OverlayImage = "kindest/kindnetd:0.5.3" diff --git a/pkg/minikube/config/config_test.go b/pkg/minikube/config/config_test.go index 19671ef61788..aa6f29b0af0b 100644 --- a/pkg/minikube/config/config_test.go +++ b/pkg/minikube/config/config_test.go @@ -49,10 +49,10 @@ var configTestCases = []configTestCase{ "vm-driver": "test-driver" }`, config: map[string]interface{}{ - "vm-driver": "test-driver", - "cpus": 4, - "disk-size": "20g", - "v": 5, + "vm-driver": "test-driver", + "cpus": 4, + "disk-size": "20g", + "v": 5, "show-libmachine-logs": true, "log_dir": "/etc/hosts", "ReminderWaitPeriodInHours": 99, diff --git a/pkg/minikube/registry/drvs/init.go b/pkg/minikube/registry/drvs/init.go index 45f2d53b2b3a..bca12775c3ff 100644 --- a/pkg/minikube/registry/drvs/init.go +++ b/pkg/minikube/registry/drvs/init.go @@ -18,13 +18,13 @@ package drvs import ( // Register all of the drvs we know of - _ "k8s.io/minikube/pkg/minikube/registry/drvs/podman" _ "k8s.io/minikube/pkg/minikube/registry/drvs/docker" _ "k8s.io/minikube/pkg/minikube/registry/drvs/hyperkit" _ "k8s.io/minikube/pkg/minikube/registry/drvs/hyperv" _ "k8s.io/minikube/pkg/minikube/registry/drvs/kvm2" _ "k8s.io/minikube/pkg/minikube/registry/drvs/none" _ "k8s.io/minikube/pkg/minikube/registry/drvs/parallels" + _ "k8s.io/minikube/pkg/minikube/registry/drvs/podman" _ "k8s.io/minikube/pkg/minikube/registry/drvs/virtualbox" _ "k8s.io/minikube/pkg/minikube/registry/drvs/vmware" _ "k8s.io/minikube/pkg/minikube/registry/drvs/vmwarefusion" diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go index 9859c22580ce..9e4433f42838 100644 --- a/pkg/minikube/registry/drvs/podman/podman.go +++ b/pkg/minikube/registry/drvs/podman/podman.go @@ -20,6 +20,7 @@ import ( "context" "fmt" "os/exec" + "strings" "time" "github.com/docker/machine/libmachine/drivers" @@ -47,7 +48,7 @@ func configure(mc config.MachineConfig) interface{} { return kic.NewDriver(kic.Config{ MachineName: mc.Name, StorePath: localpath.MiniPath(), - ImageDigest: kic.BaseImage, + ImageDigest: strings.Split(kic.BaseImage, "@")[0], // for podman does not support docker images references with both a tag and digest. CPU: mc.CPUs, Memory: mc.Memory, OCIBinary: oci.Podman, diff --git a/pkg/minikube/service/service_test.go b/pkg/minikube/service/service_test.go index 47fd341f42e9..9d9b33911352 100644 --- a/pkg/minikube/service/service_test.go +++ b/pkg/minikube/service/service_test.go @@ -366,30 +366,30 @@ func TestOptionallyHttpsFormattedUrlString(t *testing.T) { expectedIsHTTPSchemedURL bool }{ { - description: "no https for http schemed with no https option", - bareURLString: "http://192.168.99.100:30563", - https: false, + description: "no https for http schemed with no https option", + bareURLString: "http://192.168.99.100:30563", + https: false, expectedHTTPSFormattedURLString: "http://192.168.99.100:30563", expectedIsHTTPSchemedURL: true, }, { - description: "no https for non-http schemed with no https option", - bareURLString: "xyz.http.myservice:30563", - https: false, + description: "no https for non-http schemed with no https option", + bareURLString: "xyz.http.myservice:30563", + https: false, expectedHTTPSFormattedURLString: "xyz.http.myservice:30563", expectedIsHTTPSchemedURL: false, }, { - description: "https for http schemed with https option", - bareURLString: "http://192.168.99.100:30563", - https: true, + description: "https for http schemed with https option", + bareURLString: "http://192.168.99.100:30563", + https: true, expectedHTTPSFormattedURLString: "https://192.168.99.100:30563", expectedIsHTTPSchemedURL: true, }, { - description: "no https for non-http schemed with https option and http substring", - bareURLString: "xyz.http.myservice:30563", - https: true, + description: "no https for non-http schemed with https option and http substring", + bareURLString: "xyz.http.myservice:30563", + https: true, expectedHTTPSFormattedURLString: "xyz.http.myservice:30563", expectedIsHTTPSchemedURL: false, }, diff --git a/pkg/util/crypto.go b/pkg/util/crypto.go index 417417e21551..500b9813e0dd 100644 --- a/pkg/util/crypto.go +++ b/pkg/util/crypto.go @@ -53,7 +53,7 @@ func GenerateCACert(certPath, keyPath string, name string) error { KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign, ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth}, BasicConstraintsValid: true, - IsCA: true, + IsCA: true, } return writeCertsAndKeys(&template, certPath, priv, keyPath, &template, priv) From f896450095d90b722ab29181c4d298c6a5ad8840 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 5 Feb 2020 18:17:59 -0800 Subject: [PATCH 03/63] typo --- 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 5ea9b6771dfb..39604f9d2362 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -63,7 +63,7 @@ func CreateContainerNode(p CreateParams) error { } // Podman does not allow setting resources when cgroup is specified // exact podman error: "Error: invalid configuration, cannot set resources with rootless containers not using cgroups v2 unified mode" - if o.ociBinary != Podman { + if p.OCIBinary != Podman { runArgs = append(runArgs, fmt.Sprintf("--cpus=%s", p.CPUs), fmt.Sprintf("--memory=%s", p.Memory)) } From ac55bf74fdb2cd0a3873558f8cd5c7edba1a0013 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 5 Feb 2020 18:19:55 -0800 Subject: [PATCH 04/63] add podman to linux supported too --- pkg/minikube/driver/driver_linux.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/minikube/driver/driver_linux.go b/pkg/minikube/driver/driver_linux.go index 7eb79539bf05..dea2a80e18a8 100644 --- a/pkg/minikube/driver/driver_linux.go +++ b/pkg/minikube/driver/driver_linux.go @@ -29,6 +29,7 @@ var supportedDrivers = []string{ VMware, None, Docker, + Podman, } // VBoxManagePath returns the path to the VBoxManage command From ef19064ffad7ac13b387b9cf47fd58686220dfd4 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 5 Feb 2020 18:22:06 -0800 Subject: [PATCH 05/63] Add podman to IsKic --- pkg/minikube/driver/driver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go index ecd38fbe01ca..de640bc4e33c 100644 --- a/pkg/minikube/driver/driver.go +++ b/pkg/minikube/driver/driver.go @@ -87,7 +87,7 @@ func Supported(name string) bool { // IsKIC checks if the driver is a kubernetes in continer func IsKIC(name string) bool { - return name == Docker + return name == Docker || name == Podman } // IsMock checks if the driver is a mock From ca6f91a499becaa68501447b813f1777b1c7bc5d Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 5 Feb 2020 18:36:59 -0800 Subject: [PATCH 06/63] remove cp -a for podman --- pkg/minikube/command/kic_runner.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go index 3fe57bb17d08..b9e0696aabf3 100644 --- a/pkg/minikube/command/kic_runner.go +++ b/pkg/minikube/command/kic_runner.go @@ -30,6 +30,7 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" "golang.org/x/crypto/ssh/terminal" + "k8s.io/minikube/pkg/drivers/kic/oci" "k8s.io/minikube/pkg/minikube/assets" ) @@ -162,10 +163,15 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error { if err := os.Chmod(assetName, os.FileMode(perms)); err != nil { return errors.Wrapf(err, "chmod") } + if k.ociBin == oci.Podman { // Podman does not support -a + if out, err := exec.Command(oci.Podman, "cp", assetName, destination).CombinedOutput(); err != nil { + return errors.Wrapf(err, "error copying %s into node, output: %s", f.GetAssetName(), string(out)) + } + return nil + } if out, err := exec.Command(k.ociBin, "cp", "-a", assetName, destination).CombinedOutput(); err != nil { return errors.Wrapf(err, "error copying %s into node, output: %s", f.GetAssetName(), string(out)) } - return nil } From 843fec9297716d300e2fecaf7f08b46da1569844 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 5 Feb 2020 20:10:24 -0800 Subject: [PATCH 07/63] add network inspect for podman --- pkg/drivers/kic/oci/oci.go | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 39604f9d2362..f57613f261a0 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -166,11 +166,23 @@ func HostPortBinding(ociBinary string, ociID string, contPort int) (int, error) if err := PointToHostDockerDaemon(); err != nil { return 0, errors.Wrap(err, "point host docker-daemon") } - cmd := exec.Command(ociBinary, "inspect", "-f", fmt.Sprintf("'{{(index (index .NetworkSettings.Ports \"%d/tcp\") 0).HostPort}}'", contPort), ociID) - out, err := cmd.CombinedOutput() - if err != nil { - return 0, errors.Wrapf(err, "getting host-bind port %d for container ID %q, output %s", contPort, ociID, out) + var out []byte + var err error + if ociBinary == Podman { + //podman inspect -f "{{range .NetworkSettings.Ports}}{{if eq .ContainerPort "80"}}{{.HostPort}}{{end}}{{end}}" + cmd := exec.Command(ociBinary, "inspect", "-f", fmt.Sprintf("{{range .NetworkSettings.Ports}}{{if eq .ContainerPort \"%d\"}}{{.HostPort}}{{end}}{{end}}", contPort), ociID) + out, err = cmd.CombinedOutput() + if err != nil { + return 0, errors.Wrapf(err, "get host-bind port %d for %q, output %s", contPort, ociID, out) + } + } else { + cmd := exec.Command(ociBinary, "inspect", "-f", fmt.Sprintf("'{{(index (index .NetworkSettings.Ports \"%d/tcp\") 0).HostPort}}'", contPort), ociID) + out, err = cmd.CombinedOutput() + if err != nil { + return 0, errors.Wrapf(err, "get host-bind port %d for %q, output %s", contPort, ociID, out) + } } + o := strings.Trim(string(out), "\n") o = strings.Trim(o, "'") p, err := strconv.Atoi(o) From 2093545afbb91266de50d23114269a56798e39fb Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 5 Feb 2020 20:16:14 -0800 Subject: [PATCH 08/63] string --- 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 f57613f261a0..940760017a57 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -170,7 +170,7 @@ func HostPortBinding(ociBinary string, ociID string, contPort int) (int, error) var err error if ociBinary == Podman { //podman inspect -f "{{range .NetworkSettings.Ports}}{{if eq .ContainerPort "80"}}{{.HostPort}}{{end}}{{end}}" - cmd := exec.Command(ociBinary, "inspect", "-f", fmt.Sprintf("{{range .NetworkSettings.Ports}}{{if eq .ContainerPort \"%d\"}}{{.HostPort}}{{end}}{{end}}", contPort), ociID) + cmd := exec.Command(ociBinary, "inspect", "-f", fmt.Sprintf("{{range .NetworkSettings.Ports}}{{if eq .ContainerPort %s}}{{.HostPort}}{{end}}{{end}}", fmt.Sprintf(contPort)), ociID) out, err = cmd.CombinedOutput() if err != nil { return 0, errors.Wrapf(err, "get host-bind port %d for %q, output %s", contPort, ociID, out) From 780a3956231cde2ce8b11a8be759871c62d6bbb0 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 5 Feb 2020 21:07:15 -0800 Subject: [PATCH 09/63] podman cp fix --- pkg/drivers/kic/oci/oci.go | 2 +- pkg/minikube/command/kic_runner.go | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 940760017a57..c207a96b99b0 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -170,7 +170,7 @@ func HostPortBinding(ociBinary string, ociID string, contPort int) (int, error) var err error if ociBinary == Podman { //podman inspect -f "{{range .NetworkSettings.Ports}}{{if eq .ContainerPort "80"}}{{.HostPort}}{{end}}{{end}}" - cmd := exec.Command(ociBinary, "inspect", "-f", fmt.Sprintf("{{range .NetworkSettings.Ports}}{{if eq .ContainerPort %s}}{{.HostPort}}{{end}}{{end}}", fmt.Sprintf(contPort)), ociID) + cmd := exec.Command(ociBinary, "inspect", "-f", fmt.Sprintf("{{range .NetworkSettings.Ports}}{{if eq .ContainerPort %s}}{{.HostPort}}{{end}}{{end}}", fmt.Sprint(contPort)), ociID) out, err = cmd.CombinedOutput() if err != nil { return 0, errors.Wrapf(err, "get host-bind port %d for %q, output %s", contPort, ociID, out) diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go index b9e0696aabf3..2326b8376bf9 100644 --- a/pkg/minikube/command/kic_runner.go +++ b/pkg/minikube/command/kic_runner.go @@ -151,26 +151,33 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error { assetName = tmpFile.Name() } - // based of format of "docker cp containerName:destination" - destination := fmt.Sprintf("%s:%s/%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) - perms, err := strconv.ParseInt(f.GetPermissions(), 8, 0) if err != nil { - return errors.Wrapf(err, "error converting permissions %s to integer", f.GetPermissions()) + return errors.Wrapf(err, "converting permissions %s to integer", f.GetPermissions()) } // Rely on cp -a to propagate permissions if err := os.Chmod(assetName, os.FileMode(perms)); err != nil { return errors.Wrapf(err, "chmod") } - if k.ociBin == oci.Podman { // Podman does not support -a + if k.ociBin == oci.Podman { // Podman cp command doesn't match docker and doesn't have -a + //example: podman cp file.txt minikube:/home/docker/file.txt + destination := fmt.Sprintf("%s:%s/%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) + fmt.Printf("medya dbg: about to run:\n podman cp %s %s\n", assetName, destination) if out, err := exec.Command(oci.Podman, "cp", assetName, destination).CombinedOutput(); err != nil { - return errors.Wrapf(err, "error copying %s into node, output: %s", f.GetAssetName(), string(out)) + return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) + } + if out, err := exec.Command(oci.Podman, "chmod", fmt.Sprintf("%s/%s", f.GetTargetDir(), assetName)).CombinedOutput(); err != nil { + return errors.Wrapf(err, "chmod-ing copied file: %s", f.GetAssetName(), string(out)) } + return nil } + // example "docker cp containerName:destination src" + destination := fmt.Sprintf("%s:%s/%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) if out, err := exec.Command(k.ociBin, "cp", "-a", assetName, destination).CombinedOutput(); err != nil { - return errors.Wrapf(err, "error copying %s into node, output: %s", f.GetAssetName(), string(out)) + + return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) } return nil } From f88e96d3e9654df6cb8dba045f2e6da982a760f7 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 5 Feb 2020 21:17:56 -0800 Subject: [PATCH 10/63] chmod podman fix --- pkg/minikube/command/kic_runner.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go index 2326b8376bf9..d41a9354ee8a 100644 --- a/pkg/minikube/command/kic_runner.go +++ b/pkg/minikube/command/kic_runner.go @@ -162,12 +162,12 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error { } if k.ociBin == oci.Podman { // Podman cp command doesn't match docker and doesn't have -a //example: podman cp file.txt minikube:/home/docker/file.txt - destination := fmt.Sprintf("%s:%s/%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) + destination := fmt.Sprintf("%s:%s%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) fmt.Printf("medya dbg: about to run:\n podman cp %s %s\n", assetName, destination) if out, err := exec.Command(oci.Podman, "cp", assetName, destination).CombinedOutput(); err != nil { return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) } - if out, err := exec.Command(oci.Podman, "chmod", fmt.Sprintf("%s/%s", f.GetTargetDir(), assetName)).CombinedOutput(); err != nil { + if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", perms, fmt.Sprintf("%s/%s", f.GetTargetDir(), assetName)).CombinedOutput(); err != nil { return errors.Wrapf(err, "chmod-ing copied file: %s", f.GetAssetName(), string(out)) } From c946018ea771c133a73b042cd9613f33d74b7fc8 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 5 Feb 2020 22:18:14 -0800 Subject: [PATCH 11/63] more comments --- pkg/minikube/command/kic_runner.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go index d41a9354ee8a..61f33d7c1bea 100644 --- a/pkg/minikube/command/kic_runner.go +++ b/pkg/minikube/command/kic_runner.go @@ -162,12 +162,14 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error { } if k.ociBin == oci.Podman { // Podman cp command doesn't match docker and doesn't have -a //example: podman cp file.txt minikube:/home/docker/file.txt + // older versions of podman (for example 1.4) has a bug that creates a directory for the file ! + // TODO:medyagh add a check to not allow using old podmans destination := fmt.Sprintf("%s:%s%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) fmt.Printf("medya dbg: about to run:\n podman cp %s %s\n", assetName, destination) if out, err := exec.Command(oci.Podman, "cp", assetName, destination).CombinedOutput(); err != nil { return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) } - if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", perms, fmt.Sprintf("%s/%s", f.GetTargetDir(), assetName)).CombinedOutput(); err != nil { + if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", fmt.Sprint(perms), fmt.Sprintf("%s/%s", f.GetTargetDir(), assetName)).CombinedOutput(); err != nil { return errors.Wrapf(err, "chmod-ing copied file: %s", f.GetAssetName(), string(out)) } From f57b924d407d8b0bbf6003c11e2639aef1df69c2 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 5 Feb 2020 22:26:51 -0800 Subject: [PATCH 12/63] struggling podman cp --- pkg/minikube/command/kic_runner.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go index 61f33d7c1bea..b6814ba53a04 100644 --- a/pkg/minikube/command/kic_runner.go +++ b/pkg/minikube/command/kic_runner.go @@ -127,7 +127,7 @@ func (k *kicRunner) RunCmd(cmd *exec.Cmd) (*RunResult, error) { // Copy copies a file and its permissions func (k *kicRunner) Copy(f assets.CopyableFile) error { - assetName := f.GetAssetName() + assetFullPath := f.GetAssetName() if _, err := os.Stat(f.GetAssetName()); os.IsNotExist(err) { fc := make([]byte, f.GetLength()) // Read asset file into a []byte if _, err := f.Read(fc); err != nil { @@ -148,7 +148,7 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error { if err := tmpFile.Close(); err != nil { return errors.Wrap(err, "close temporary file") } - assetName = tmpFile.Name() + assetFullPath = tmpFile.Name() } perms, err := strconv.ParseInt(f.GetPermissions(), 8, 0) @@ -157,7 +157,7 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error { } // Rely on cp -a to propagate permissions - if err := os.Chmod(assetName, os.FileMode(perms)); err != nil { + if err := os.Chmod(assetFullPath, os.FileMode(perms)); err != nil { return errors.Wrapf(err, "chmod") } if k.ociBin == oci.Podman { // Podman cp command doesn't match docker and doesn't have -a @@ -165,11 +165,11 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error { // older versions of podman (for example 1.4) has a bug that creates a directory for the file ! // TODO:medyagh add a check to not allow using old podmans destination := fmt.Sprintf("%s:%s%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) - fmt.Printf("medya dbg: about to run:\n podman cp %s %s\n", assetName, destination) - if out, err := exec.Command(oci.Podman, "cp", assetName, destination).CombinedOutput(); err != nil { + fmt.Printf("medya dbg: about to run:\n podman cp %s %s\n", assetFullPath, destination) + if out, err := exec.Command(oci.Podman, "cp", assetFullPath, destination).CombinedOutput(); err != nil { return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) } - if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", fmt.Sprint(perms), fmt.Sprintf("%s/%s", f.GetTargetDir(), assetName)).CombinedOutput(); err != nil { + if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", fmt.Sprint(perms), fmt.Sprintf("%s/%s", f.GetTargetDir(), f.GetAssetName())).CombinedOutput(); err != nil { return errors.Wrapf(err, "chmod-ing copied file: %s", f.GetAssetName(), string(out)) } @@ -177,7 +177,7 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error { } // example "docker cp containerName:destination src" destination := fmt.Sprintf("%s:%s/%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) - if out, err := exec.Command(k.ociBin, "cp", "-a", assetName, destination).CombinedOutput(); err != nil { + if out, err := exec.Command(k.ociBin, "cp", "-a", assetFullPath, destination).CombinedOutput(); err != nil { return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) } From a77e173d591e991b3d2c038e2d9fb512827b060e Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 5 Feb 2020 23:07:52 -0800 Subject: [PATCH 13/63] fix inspect ip for podman --- pkg/drivers/kic/oci/oci.go | 15 +++++++++++++++ pkg/minikube/command/kic_runner.go | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index c207a96b99b0..ec25cf45dd52 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -194,6 +194,21 @@ func HostPortBinding(ociBinary string, ociID string, contPort int) (int, error) // ContainerIPs returns ipv4,ipv6, error of a container by their name func ContainerIPs(ociBinary string, name string) (string, string, error) { + if ociBinary == Podman { + cmd := exec.Command(ociBinary, "inspect", + "-f", "{{.NetworkSettings.IPAddress}}", + name) + out, err := cmd.CombinedOutput() + output := string(out) + if err != nil { + return "", "", errors.Wrapf(err, "podman inspect ip %s", name) + } + if err == nil && output == "" { // podman returns empty for 127.0.0.1 + return "127.0.0.1", "", nil // TODO:medaygh move DefaultBindIP from kic package to here + } + return output, "", nil + } + if err := PointToHostDockerDaemon(); err != nil { return "", "", errors.Wrap(err, "point host docker-daemon") } diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go index b6814ba53a04..f073e7506c1d 100644 --- a/pkg/minikube/command/kic_runner.go +++ b/pkg/minikube/command/kic_runner.go @@ -163,14 +163,14 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error { if k.ociBin == oci.Podman { // Podman cp command doesn't match docker and doesn't have -a //example: podman cp file.txt minikube:/home/docker/file.txt // older versions of podman (for example 1.4) has a bug that creates a directory for the file ! - // TODO:medyagh add a check to not allow using old podmans + // TODO:medyagh add a check to not allow using old podmans (works on 1.7) destination := fmt.Sprintf("%s:%s%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) - fmt.Printf("medya dbg: about to run:\n podman cp %s %s\n", assetFullPath, destination) if out, err := exec.Command(oci.Podman, "cp", assetFullPath, destination).CombinedOutput(); err != nil { return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) } - if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", fmt.Sprint(perms), fmt.Sprintf("%s/%s", f.GetTargetDir(), f.GetAssetName())).CombinedOutput(); err != nil { + if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", fmt.Sprint(perms), fmt.Sprintf("%s/%s", f.GetTargetDir(), f.GetTargetName())).CombinedOutput(); err != nil { return errors.Wrapf(err, "chmod-ing copied file: %s", f.GetAssetName(), string(out)) + } return nil From 6c3d07c2a96d8acd3ee9f7635c3367d2837266a0 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 5 Feb 2020 23:14:13 -0800 Subject: [PATCH 14/63] fix hard coded docker --- pkg/minikube/cluster/start.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/cluster/start.go b/pkg/minikube/cluster/start.go index 6742e030f9ee..c7669e99661b 100644 --- a/pkg/minikube/cluster/start.go +++ b/pkg/minikube/cluster/start.go @@ -198,7 +198,7 @@ func commandRunner(h *host.Host) (command.Runner, error) { } if driver.IsKIC(d) { glog.Infof("Returning KICRunner for %q driver", d) - return command.NewKICRunner(h.Name, "docker"), nil + return command.NewKICRunner(h.Name, d), nil } glog.Infof("Creating SSH client and returning SSHRunner for %q driver", d) From 293585ba556449273f943c582aaca107774a2102 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 6 Feb 2020 21:41:00 -0800 Subject: [PATCH 15/63] refactor all hard-coded var lib path --- pkg/addons/kubectl.go | 6 ++-- pkg/addons/kubectl_test.go | 8 +++-- .../bootstrapper/bsutil/kubelet_test.go | 33 ++++++++++--------- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +- pkg/minikube/vmpath/constants.go | 10 ++++++ test/integration/guest_env_test.go | 4 ++- 6 files changed, 42 insertions(+), 21 deletions(-) diff --git a/pkg/addons/kubectl.go b/pkg/addons/kubectl.go index 1e3fbe2a978e..97abf8023d61 100644 --- a/pkg/addons/kubectl.go +++ b/pkg/addons/kubectl.go @@ -17,11 +17,13 @@ limitations under the License. package addons import ( + "fmt" "os/exec" "path" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/constants" + "k8s.io/minikube/pkg/minikube/vmpath" ) var ( @@ -41,7 +43,7 @@ func kubectlCommand(profile string, files []string, enable bool) (*exec.Cmd, err kubectlAction = "delete" } - args := []string{"KUBECONFIG=/var/lib/minikube/kubeconfig", kubectlBinary, kubectlAction} + args := []string{fmt.Sprintf("KUBECONFIG=%s", path.Join(vmpath.GuestPersistentDir, "kubeconfig")), kubectlBinary, kubectlAction} for _, f := range files { args = append(args, []string{"-f", f}...) } @@ -63,5 +65,5 @@ func kubernetesVersion(profile string) (string, error) { } func kubectlBinaryPath(version string) string { - return path.Join("/var/lib/minikube/binaries", version, "kubectl") + return path.Join(vmpath.GuestPersistentDir, "binaries", version, "kubectl") } diff --git a/pkg/addons/kubectl_test.go b/pkg/addons/kubectl_test.go index 493ff3541241..42af78d1673d 100644 --- a/pkg/addons/kubectl_test.go +++ b/pkg/addons/kubectl_test.go @@ -17,8 +17,12 @@ limitations under the License. package addons import ( + "fmt" + "path" "strings" "testing" + + "k8s.io/minikube/pkg/minikube/vmpath" ) func TestKubectlCommand(t *testing.T) { @@ -32,12 +36,12 @@ func TestKubectlCommand(t *testing.T) { description: "enable an addon", files: []string{"a", "b"}, enable: true, - expected: "sudo KUBECONFIG=/var/lib/minikube/kubeconfig /var/lib/minikube/binaries/v1.17.0/kubectl apply -f a -f b", + expected: fmt.Sprintf("sudo KUBECONFIG=%s %s apply -f a -f b", path.Join(vmpath.GuestPersistentDir, "kubeconfig"), path.Join(vmpath.GuestPersistentDir, "v1.17.0".kubectl)), }, { description: "disable an addon", files: []string{"a", "b"}, enable: false, - expected: "sudo KUBECONFIG=/var/lib/minikube/kubeconfig /var/lib/minikube/binaries/v1.17.0/kubectl delete -f a -f b", + expected: fmt.Sprintf("sudo KUBECONFIG=%s %s apply -f a -f b", path.Join(vmpath.GuestPersistentDir, "kubeconfig"), path.Join(vmpath.GuestPersistentDir, "v1.17.0".kubectl)), }, } diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet_test.go b/pkg/minikube/bootstrapper/bsutil/kubelet_test.go index 56dc23168bec..5a84483c1526 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubelet_test.go +++ b/pkg/minikube/bootstrapper/bsutil/kubelet_test.go @@ -18,6 +18,8 @@ limitations under the License. package bsutil import ( + "fmt" + "path" "testing" "github.com/pmezard/go-difflib/difflib" @@ -25,6 +27,7 @@ import ( "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/cruntime" + "k8s.io/minikube/pkg/minikube/vmpath" ) func TestGenerateKubeletConfig(t *testing.T) { @@ -49,15 +52,15 @@ func TestGenerateKubeletConfig(t *testing.T) { }, }, }, - expected: `[Unit] + expected: fmt.Sprintf(`[Unit] Wants=docker.socket [Service] ExecStart= -ExecStart=/var/lib/minikube/binaries/v1.11.10/kubelet --allow-privileged=true --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cadvisor-port=0 --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests +ExecStart=%s --allow-privileged=true --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cadvisor-port=0 --cgroup-driver=cgroupfs --client-ca-file=%s --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests [Install] -`, +`, path.Join(vmpath.GuestPersistentDir, "binaries", "v1.11.10", "kubelet"), path.Join(vmpath.GuestPersistentDir, "certs", "ca.crt")), }, { description: "newest cri runtime", @@ -74,15 +77,15 @@ ExecStart=/var/lib/minikube/binaries/v1.11.10/kubelet --allow-privileged=true -- }, }, }, - expected: `[Unit] + expected: fmt.Sprintf(`[Unit] Wants=crio.service [Service] ExecStart= -ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=/var/run/crio/crio.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=/var/run/crio/crio.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m +ExecStart=%s --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=%s --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=/var/run/crio/crio.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=/var/run/crio/crio.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m [Install] -`, +`, path.Join(vmpath.GuestPersistentDir, "binaries", "v1.17.2", "kubelet"), path.Join(vmpath.GuestPersistentDir, "certs", "ca.crt")), }, { description: "default containerd runtime", @@ -99,15 +102,15 @@ ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhoo }, }, }, - expected: `[Unit] + expected: fmt.Sprintf(`[Unit] Wants=containerd.service [Service] ExecStart= -ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m +ExecStart=%s --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=%s --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m [Install] -`, +`, path.Join(vmpath.GuestPersistentDir, "binaries", "v1.17.2", "kubelet"), path.Join(vmpath.GuestPersistentDir, "certs", "ca.crt")), }, { description: "default containerd runtime with IP override", @@ -131,15 +134,15 @@ ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhoo }, }, }, - expected: `[Unit] + expected: fmt.Sprintf(`[Unit] Wants=containerd.service [Service] ExecStart= -ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.200 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m +ExecStart=%s --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=%s --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.200 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m [Install] -`, +`, vmpath.GuestPersistentDir, "binaries", "v1.17.2", "kubelet"), path.Join(vmpath.GuestPersistentDir, "certs", "ca.crt"), }, { description: "docker with custom image repository", @@ -157,15 +160,15 @@ ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhoo }, }, }, - expected: `[Unit] + expected: fmt.Sprintf(`[Unit] Wants=docker.socket [Service] ExecStart= -ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.1 --pod-manifest-path=/etc/kubernetes/manifests +ExecStart=%s --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=%s --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.1 --pod-manifest-path=/etc/kubernetes/manifests [Install] -`, +`, vmpath.GuestPersistentDir, "binaries", "v1.17.2", "kubelet"), path.Join(vmpath.GuestPersistentDir, "certs", "ca.crt"), }, } diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 452287951b31..e869b7c68ee7 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -471,7 +471,7 @@ func (k *Bootstrapper) UpdateCluster(cfg config.MachineConfig) error { // applyKicOverlay applies the CNI plugin needed to make kic work func (k *Bootstrapper) applyKicOverlay(cfg config.MachineConfig) error { cmd := exec.Command("sudo", - path.Join("/var/lib/minikube/binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"), "create", "--kubeconfig=/var/lib/minikube/kubeconfig", + path.Join(vmpath.GuestPersistentDir, "binaries", cfg.KubernetesConfig.KubernetesVersion, "kubectl"), "create", fmt.Sprintf("--kubeconfig=%s", path.Join(vmpath.GuestPersistentDir, "kubeconfig")), "-f", "-") b := bytes.Buffer{} if err := kicCNIConfig.Execute(&b, struct{ ImageName string }{ImageName: kic.OverlayImage}); err != nil { diff --git a/pkg/minikube/vmpath/constants.go b/pkg/minikube/vmpath/constants.go index aa0d66e2eae2..ccc2474c2e53 100644 --- a/pkg/minikube/vmpath/constants.go +++ b/pkg/minikube/vmpath/constants.go @@ -24,6 +24,7 @@ const ( // GuestEphemeralDir is the path where ephemeral data should be stored within the VM GuestEphemeralDir = "/var/tmp/minikube" // GuestPersistentDir is the path where persistent data should be stored within the VM (not tmpfs) +<<<<<<< HEAD GuestPersistentDir = "/var/lib/minikube" // GuestKubernetesCertsDir are where Kubernetes certificates are stored GuestKubernetesCertsDir = GuestPersistentDir + "/certs" @@ -33,4 +34,13 @@ const ( GuestCertStoreDir = "/etc/ssl/certs" // Where gvisor bootstraps from GuestGvisorDir = "/tmp/gvisor" +||||||| constructed merge base + GuestPersistentDir = "/var/lib/minikube" + // GuestCertsDir are where Kubernetes certificates are kept on the guest + GuestCertsDir = GuestPersistentDir + "/certs" +======= + GuestPersistentDir = "/usr/local/minikube" + // GuestCertsDir are where Kubernetes certificates are kept on the guest + GuestCertsDir = GuestPersistentDir + "/certs" +>>>>>>> refactor all hard-coded var lib path ) diff --git a/test/integration/guest_env_test.go b/test/integration/guest_env_test.go index 29bf60ab5fce..8f57ac0ab6f5 100644 --- a/test/integration/guest_env_test.go +++ b/test/integration/guest_env_test.go @@ -24,6 +24,8 @@ import ( "os/exec" "testing" "time" + + "k8s.io/minikube/pkg/minikube/vmpath" ) func TestGuestEnvironment(t *testing.T) { @@ -59,7 +61,7 @@ func TestGuestEnvironment(t *testing.T) { "/var/lib/docker", "/var/lib/cni", "/var/lib/kubelet", - "/var/lib/minikube", + vmpath.GuestPersistentDir, "/var/lib/toolbox", "/var/lib/boot2docker", } { From 2d49e23faf7f717a94d699d1388d2ada48480d69 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 6 Feb 2020 21:51:10 -0800 Subject: [PATCH 16/63] remove white space from ip result --- pkg/drivers/kic/oci/oci.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index ec25cf45dd52..9c0ebad3316a 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -200,6 +200,8 @@ func ContainerIPs(ociBinary string, name string) (string, string, error) { name) out, err := cmd.CombinedOutput() output := string(out) + output = strings.Trim(output, "\n") + output = strings.Trim(output, " ") if err != nil { return "", "", errors.Wrapf(err, "podman inspect ip %s", name) } From f5158a85a00ac7437f5851abc57a2b926d25241d Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 6 Feb 2020 22:16:45 -0800 Subject: [PATCH 17/63] Make podman run with sudo --- cmd/minikube/cmd/start.go | 2 +- pkg/minikube/driver/driver.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 86db89c4d400..303664b1dacd 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -744,7 +744,7 @@ func validateUser(drvName string) { useForce := viper.GetBool(force) - if driver.BareMetal(drvName) && u.Uid != "0" && !useForce { + if driver.NeedsRoot(drvName) )&& u.Uid != "0" && !useForce { exit.WithCodeT(exit.Permissions, `The "{{.driver_name}}" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}'.`, out.V{"driver_name": drvName}) } diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go index de640bc4e33c..cd1466b1c175 100644 --- a/pkg/minikube/driver/driver.go +++ b/pkg/minikube/driver/driver.go @@ -108,6 +108,11 @@ func BareMetal(name string) bool { return name == None || name == Mock } +// NeedsRoot returns true if driver needs to run with root privileges +func NeedsRoot(name string) bool { + return name == None || name == Podman +} + // FlagHints are hints for what default options should be used for this driver type FlagHints struct { ExtraOptions []string From 557840348ce4d5e3122299856a26625de9c7c066 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 6 Feb 2020 22:20:49 -0800 Subject: [PATCH 18/63] typo --- cmd/minikube/cmd/start.go | 2 +- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 303664b1dacd..e0957736e164 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -744,7 +744,7 @@ func validateUser(drvName string) { useForce := viper.GetBool(force) - if driver.NeedsRoot(drvName) )&& u.Uid != "0" && !useForce { + if driver.NeedsRoot(drvName) && u.Uid != "0" && !useForce { exit.WithCodeT(exit.Permissions, `The "{{.driver_name}}" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}'.`, out.V{"driver_name": drvName}) } diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index e869b7c68ee7..f92e1d470d95 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -210,9 +210,9 @@ func (k *Bootstrapper) StartCluster(cfg config.MachineConfig) error { return errors.Wrapf(err, "init failed. output: %q", rr.Output()) } - if driver.IsKIC(cfg.VMDriver) { + if cfg.VMDriver == driver.Docker { if err := k.applyKicOverlay(cfg); err != nil { - return errors.Wrap(err, "applying kic overlay network") + return errors.Wrap(err, "apply kic overlay") } } From 1280ed84cb0e88a9e82a9c5a984f06f7c86efd2d Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 6 Feb 2020 22:33:24 -0800 Subject: [PATCH 19/63] warn that podman doesnt allow cpu memory --- cmd/minikube/cmd/start.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index e0957736e164..649c624f3dfe 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -812,16 +812,18 @@ func validateFlags(cmd *cobra.Command, drvName string) { validateDiskSize() validateMemorySize() - if driver.BareMetal(drvName) { - if viper.GetString(config.MachineProfile) != constants.DefaultMachineName { - exit.WithCodeT(exit.Config, "The 'none' driver does not support multiple profiles: https://minikube.sigs.k8s.io/docs/reference/drivers/none/") - } - + if driver.NeedsRoot() { // both podman and none need root and they both cant specify resources if cmd.Flags().Changed(cpus) { - out.WarningT("The 'none' driver does not respect the --cpus flag") + out.WarningT("The '{{.name}}' driver does not respect the --cpus flag", out.V{"name": drvName}) } if cmd.Flags().Changed(memory) { - out.WarningT("The 'none' driver does not respect the --memory flag") + out.WarningT("The '{{.name}}' driver does not respect the --memory flag", out.V{"name": drvName}) + } + } + + if driver.BareMetal(drvName) { + if viper.GetString(config.MachineProfile) != constants.DefaultMachineName { + exit.WithCodeT(exit.Config, "The 'none' driver does not support multiple profiles: https://minikube.sigs.k8s.io/docs/reference/drivers/none/") } runtime := viper.GetString(containerRuntime) From 4dd5d165be663abf667549a650b9e428204f1827 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 6 Feb 2020 22:39:57 -0800 Subject: [PATCH 20/63] fix link to correct upcoming docs --- pkg/drivers/kic/kic.go | 2 +- pkg/minikube/registry/drvs/docker/docker.go | 2 +- pkg/minikube/registry/drvs/podman/podman.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go index 13d7de7fb6cd..a44db260e467 100644 --- a/pkg/drivers/kic/kic.go +++ b/pkg/drivers/kic/kic.go @@ -36,7 +36,7 @@ import ( "k8s.io/minikube/pkg/minikube/constants" ) -// Driver represents a kic driver https://minikube.sigs.k8s.io/docs/reference/drivers/kic/ +// Driver represents a kic driver https://minikube.sigs.k8s.io/docs/reference/drivers/docker type Driver struct { *drivers.BaseDriver *pkgdrivers.CommonDriver diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index d74947db0ca9..d3a87446bf76 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -58,7 +58,7 @@ func configure(mc config.MachineConfig) (interface{}, error) { func status() registry.State { _, err := exec.LookPath("docker") if err != nil { - return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Docker is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/kic/"} + return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Docker is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/docker/"} } // Allow no more than 2 seconds for querying state ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go index 9e4433f42838..af4c8af2c36d 100644 --- a/pkg/minikube/registry/drvs/podman/podman.go +++ b/pkg/minikube/registry/drvs/podman/podman.go @@ -60,7 +60,7 @@ func configure(mc config.MachineConfig) interface{} { func status() registry.State { _, err := exec.LookPath(oci.Podman) if err != nil { - return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Podman is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/kic/"} + return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Podman is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/podman/"} } // Allow no more than 2 seconds for querying state ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) From 9187219d83fe29d17435c6ae65520ca9ffb7bd6a Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 6 Feb 2020 22:47:21 -0800 Subject: [PATCH 21/63] add helpers for container ips --- pkg/drivers/kic/oci/oci.go | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 9c0ebad3316a..29d75f124869 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -195,27 +195,34 @@ func HostPortBinding(ociBinary string, ociID string, contPort int) (int, error) // ContainerIPs returns ipv4,ipv6, error of a container by their name func ContainerIPs(ociBinary string, name string) (string, string, error) { if ociBinary == Podman { - cmd := exec.Command(ociBinary, "inspect", - "-f", "{{.NetworkSettings.IPAddress}}", - name) - out, err := cmd.CombinedOutput() - output := string(out) - output = strings.Trim(output, "\n") - output = strings.Trim(output, " ") - if err != nil { - return "", "", errors.Wrapf(err, "podman inspect ip %s", name) - } - if err == nil && output == "" { // podman returns empty for 127.0.0.1 - return "127.0.0.1", "", nil // TODO:medaygh move DefaultBindIP from kic package to here - } - return output, "", nil + return podomanContinerIP(name) + } + return docerContainerIP(name) +} + +func podomanContinerIP(name) (string, string, error) { + cmd := exec.Command(Podman, "inspect", + "-f", "{{.NetworkSettings.IPAddress}}", + name) + out, err := cmd.CombinedOutput() + output := string(out) + output = strings.Trim(output, "\n") + output = strings.Trim(output, " ") + if err != nil { + return "", "", errors.Wrapf(err, "podman inspect ip %s", name) + } + if err == nil && output == "" { // podman returns empty for 127.0.0.1 + return "127.0.0.1", "", nil // TODO:medaygh move DefaultBindIP from kic package to here } + return output, "", nil +} +func docerContainerIP(name) (string, string, error) { if err := PointToHostDockerDaemon(); err != nil { return "", "", errors.Wrap(err, "point host docker-daemon") } // retrieve the IP address of the node using docker inspect - lines, err := inspect(ociBinary, name, "{{range .NetworkSettings.Networks}}{{.IPAddress}},{{.GlobalIPv6Address}}{{end}}") + lines, err := inspect(Docker, name, "{{range .NetworkSettings.Networks}}{{.IPAddress}},{{.GlobalIPv6Address}}{{end}}") if err != nil { return "", "", errors.Wrap(err, "inspecting NetworkSettings.Networks") } @@ -227,7 +234,6 @@ func ContainerIPs(ociBinary string, name string) (string, string, error) { return "", "", errors.Errorf("container addresses should have 2 values, got %d values: %+v", len(ips), ips) } return ips[0], ips[1], nil - } // ContainerID returns id of a container name From 745ef7e829aec6862254c972c0af27c6744d40b6 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 6 Feb 2020 22:50:41 -0800 Subject: [PATCH 22/63] More acurate error for too slow podman and docker --- pkg/minikube/registry/drvs/docker/docker.go | 6 +++--- pkg/minikube/registry/drvs/podman/podman.go | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index d3a87446bf76..898bcc598757 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -56,17 +56,17 @@ func configure(mc config.MachineConfig) (interface{}, error) { } func status() registry.State { - _, err := exec.LookPath("docker") + _, err := exec.LookPath(oci.Docker) if err != nil { return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Docker is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/docker/"} } // Allow no more than 2 seconds for querying state - ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() err = exec.CommandContext(ctx, "docker", "info").Run() if err != nil { - return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker is not running. Try: restarting docker desktop."} + return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker is not running or is responding too slow. Try: restarting docker desktop."} } return registry.State{Installed: true, Healthy: true} diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go index af4c8af2c36d..8d7db222d7ed 100644 --- a/pkg/minikube/registry/drvs/podman/podman.go +++ b/pkg/minikube/registry/drvs/podman/podman.go @@ -62,13 +62,19 @@ func status() registry.State { if err != nil { return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Podman is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/podman/"} } + + _, err := exec.Cmd() + // if err != nil { + // return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Podman is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/podman/"} + // } + // Allow no more than 2 seconds for querying state - ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() err = exec.CommandContext(ctx, oci.Podman, "info").Run() if err != nil { - return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Podman is not running. Try: restarting podman."} + return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Podman is not running or taking too long to respond. Try: restarting podman."} } return registry.State{Installed: true, Healthy: true} From 376bbe4bb14b4cbf8f46d6c1996c3fa91c4fb92c Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 15:15:10 -0800 Subject: [PATCH 23/63] Organize constants file --- cmd/minikube/cmd/config/configure.go | 18 +-- cmd/minikube/cmd/start.go | 2 +- pkg/drivers/kic/oci/oci.go | 6 +- pkg/minikube/command/kic_runner.go | 62 ++++++++-- pkg/minikube/config/config_test.go | 8 +- pkg/minikube/constants/constants.go | 121 ++++++++++---------- pkg/minikube/registry/drvs/docker/docker.go | 21 +++- pkg/minikube/registry/drvs/podman/podman.go | 17 ++- pkg/minikube/service/service_test.go | 24 ++-- pkg/minikube/vmpath/constants.go | 10 -- pkg/util/crypto.go | 2 +- 11 files changed, 174 insertions(+), 117 deletions(-) diff --git a/cmd/minikube/cmd/config/configure.go b/cmd/minikube/cmd/config/configure.go index 80c61d1c994c..412fa1204d1f 100644 --- a/cmd/minikube/cmd/config/configure.go +++ b/cmd/minikube/cmd/config/configure.go @@ -113,8 +113,8 @@ var addonsConfigureCmd = &cobra.Command{ "aws-assume-role": awsRole, }, map[string]string{ - "app": "registry-creds", - "cloud": "ecr", + "app": "registry-creds", + "cloud": "ecr", "kubernetes.io/minikube-addons": "registry-creds", }) @@ -128,11 +128,11 @@ var addonsConfigureCmd = &cobra.Command{ "registry-creds-gcr", map[string]string{ "application_default_credentials.json": gcrApplicationDefaultCredentials, - "gcrurl": gcrURL, + "gcrurl": gcrURL, }, map[string]string{ - "app": "registry-creds", - "cloud": "gcr", + "app": "registry-creds", + "cloud": "gcr", "kubernetes.io/minikube-addons": "registry-creds", }) @@ -150,8 +150,8 @@ var addonsConfigureCmd = &cobra.Command{ "DOCKER_PRIVATE_REGISTRY_PASSWORD": dockerPass, }, map[string]string{ - "app": "registry-creds", - "cloud": "dpr", + "app": "registry-creds", + "cloud": "dpr", "kubernetes.io/minikube-addons": "registry-creds", }) @@ -169,8 +169,8 @@ var addonsConfigureCmd = &cobra.Command{ "ACR_PASSWORD": acrPassword, }, map[string]string{ - "app": "registry-creds", - "cloud": "acr", + "app": "registry-creds", + "cloud": "acr", "kubernetes.io/minikube-addons": "registry-creds", }) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 649c624f3dfe..8e4d9cb42532 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -812,7 +812,7 @@ func validateFlags(cmd *cobra.Command, drvName string) { validateDiskSize() validateMemorySize() - if driver.NeedsRoot() { // both podman and none need root and they both cant specify resources + if driver.NeedsRoot(drvName) { // both podman and none need root and they both cant specify resources if cmd.Flags().Changed(cpus) { out.WarningT("The '{{.name}}' driver does not respect the --cpus flag", out.V{"name": drvName}) } diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 29d75f124869..541b899caff3 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -197,10 +197,10 @@ func ContainerIPs(ociBinary string, name string) (string, string, error) { if ociBinary == Podman { return podomanContinerIP(name) } - return docerContainerIP(name) + return dockerContainerIP(name) } -func podomanContinerIP(name) (string, string, error) { +func podomanContinerIP(name string) (string, string, error) { cmd := exec.Command(Podman, "inspect", "-f", "{{.NetworkSettings.IPAddress}}", name) @@ -217,7 +217,7 @@ func podomanContinerIP(name) (string, string, error) { return output, "", nil } -func docerContainerIP(name) (string, string, error) { +func dockerContainerIP(name string) (string, string, error) { if err := PointToHostDockerDaemon(); err != nil { return "", "", errors.Wrap(err, "point host docker-daemon") } diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go index f073e7506c1d..4b970cc3ec39 100644 --- a/pkg/minikube/command/kic_runner.go +++ b/pkg/minikube/command/kic_runner.go @@ -127,6 +127,14 @@ func (k *kicRunner) RunCmd(cmd *exec.Cmd) (*RunResult, error) { // Copy copies a file and its permissions func (k *kicRunner) Copy(f assets.CopyableFile) error { + if k.ociBin == oci.Podman { + return copyToPodman(k, f) + } + return copyToDocker(k, f) +} + +// Podman cp command doesn't match docker and doesn't have -a +func copyToPodman(k *kicRunner, f assets.CopyableFile) error { assetFullPath := f.GetAssetName() if _, err := os.Stat(f.GetAssetName()); os.IsNotExist(err) { fc := make([]byte, f.GetLength()) // Read asset file into a []byte @@ -160,21 +168,55 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error { if err := os.Chmod(assetFullPath, os.FileMode(perms)); err != nil { return errors.Wrapf(err, "chmod") } - if k.ociBin == oci.Podman { // Podman cp command doesn't match docker and doesn't have -a - //example: podman cp file.txt minikube:/home/docker/file.txt - // older versions of podman (for example 1.4) has a bug that creates a directory for the file ! - // TODO:medyagh add a check to not allow using old podmans (works on 1.7) - destination := fmt.Sprintf("%s:%s%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) - if out, err := exec.Command(oci.Podman, "cp", assetFullPath, destination).CombinedOutput(); err != nil { - return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) + //example: podman cp file.txt minikube:/home/docker/file.txt + // older versions of podman (for example 1.4) has a bug that creates a directory for the file ! + // TODO:medyagh add a check to not allow using old podmans (works on 1.7) + destination := fmt.Sprintf("%s:%s%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) + if out, err := exec.Command(oci.Podman, "cp", assetFullPath, destination).CombinedOutput(); err != nil { + return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) + } + if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", fmt.Sprint(perms), fmt.Sprintf("%s/%s", f.GetTargetDir(), f.GetTargetName())).CombinedOutput(); err != nil { + return errors.Wrapf(err, "chmod-ing copied file: %s", f.GetAssetName(), string(out)) + + } + return nil +} + +func copyToDocker(k *kicRunner, f assets.CopyableFile) error { + assetFullPath := f.GetAssetName() + if _, err := os.Stat(f.GetAssetName()); os.IsNotExist(err) { + fc := make([]byte, f.GetLength()) // Read asset file into a []byte + if _, err := f.Read(fc); err != nil { + return errors.Wrap(err, "can't copy non-existing file") + } // we have a MemoryAsset, will write to disk before copying + + tmpFile, err := ioutil.TempFile(os.TempDir(), "tmpf-memory-asset") + if err != nil { + return errors.Wrap(err, "creating temporary file") + } + // clean up the temp file + defer os.Remove(tmpFile.Name()) + if _, err = tmpFile.Write(fc); err != nil { + return errors.Wrap(err, "write to temporary file") } - if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", fmt.Sprint(perms), fmt.Sprintf("%s/%s", f.GetTargetDir(), f.GetTargetName())).CombinedOutput(); err != nil { - return errors.Wrapf(err, "chmod-ing copied file: %s", f.GetAssetName(), string(out)) + // Close the file + if err := tmpFile.Close(); err != nil { + return errors.Wrap(err, "close temporary file") } + assetFullPath = tmpFile.Name() + } - return nil + perms, err := strconv.ParseInt(f.GetPermissions(), 8, 0) + if err != nil { + return errors.Wrapf(err, "converting permissions %s to integer", f.GetPermissions()) } + + // Rely on cp -a to propagate permissions + if err := os.Chmod(assetFullPath, os.FileMode(perms)); err != nil { + return errors.Wrapf(err, "chmod") + } + // example "docker cp containerName:destination src" destination := fmt.Sprintf("%s:%s/%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) if out, err := exec.Command(k.ociBin, "cp", "-a", assetFullPath, destination).CombinedOutput(); err != nil { diff --git a/pkg/minikube/config/config_test.go b/pkg/minikube/config/config_test.go index aa6f29b0af0b..19671ef61788 100644 --- a/pkg/minikube/config/config_test.go +++ b/pkg/minikube/config/config_test.go @@ -49,10 +49,10 @@ var configTestCases = []configTestCase{ "vm-driver": "test-driver" }`, config: map[string]interface{}{ - "vm-driver": "test-driver", - "cpus": 4, - "disk-size": "20g", - "v": 5, + "vm-driver": "test-driver", + "cpus": 4, + "disk-size": "20g", + "v": 5, "show-libmachine-logs": true, "log_dir": "/etc/hosts", "ReminderWaitPeriodInHours": 99, diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 355c9319a06d..bec581ec506d 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -20,6 +20,7 @@ import ( "fmt" "path/filepath" + "github.com/blang/semver" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/util/homedir" "k8s.io/minikube/pkg/minikube/localpath" @@ -27,92 +28,88 @@ import ( ) const ( + // DefaultKubernetesVersion is the default kubernetes version + DefaultKubernetesVersion = "v1.17.2" + // NewestKubernetesVersion is the newest Kubernetes version to test against + NewestKubernetesVersion = "v1.17.2" + // OldestKubernetesVersion is the oldest Kubernetes version to test against + OldestKubernetesVersion = "v1.11.10" + // DefaultMachineName is the default name for the VM + DefaultMachineName = "minikube" + // DefaultNodeName is the default name for the kubeadm node within the VM + DefaultNodeName = "minikube" + // DockerDaemonPort is the port Docker daemon listening inside a minikube node (vm or container). DockerDaemonPort = 2376 - // SSHPort is the SSH serviceport on the node vm and container - SSHPort = 22 // APIServerPort is the default API server port APIServerPort = 8443 + // SSHPort is the SSH serviceport on the node vm and container + SSHPort = 22 + // APIServerName is the default API server name APIServerName = "minikubeCA" // ClusterDNSDomain is the default DNS domain ClusterDNSDomain = "cluster.local" // DefaultServiceCIDR is The CIDR to be used for service cluster IPs DefaultServiceCIDR = "10.96.0.0/12" - // DockerTLSVerifyEnv is used for docker daemon settings - DockerTLSVerifyEnv = "DOCKER_TLS_VERIFY" + // DockerHostEnv is used for docker daemon settings DockerHostEnv = "DOCKER_HOST" // DockerCertPathEnv is used for docker daemon settings DockerCertPathEnv = "DOCKER_CERT_PATH" + // DockerTLSVerifyEnv is used for docker daemon settings + DockerTLSVerifyEnv = "DOCKER_TLS_VERIFY" // MinikubeActiveDockerdEnv holds the docker daemon which user's shell is pointing at // value would be profile or empty if pointing to the user's host daemon. - // DockerDaemonEnvs has list of environment variables to control docker daemon shell is using - MinikubeActiveDockerdEnv = "MINIKUBE_ACTIVE_DOCKERD" // PodmanVarlinkBridgeEnv is used for podman settings PodmanVarlinkBridgeEnv = "PODMAN_VARLINK_BRIDGE" ) -var DockerDaemonEnvs = [3]string{DockerHostEnv, DockerTLSVerifyEnv, DockerCertPathEnv} - -// DefaultMinipath is the default Minikube path (under the home directory) -var DefaultMinipath = filepath.Join(homedir.HomeDir(), ".minikube") - -// KubeconfigPath is the path to the Kubernetes client config -var KubeconfigPath = clientcmd.RecommendedHomeFile - -// KubeconfigEnvVar is the env var to check for the Kubernetes client config -var KubeconfigEnvVar = clientcmd.RecommendedConfigPathEnvVar - -// DefaultMachineName is the default name for the VM -const DefaultMachineName = "minikube" - -// DefaultNodeName is the default name for the kubeadm node within the VM -const DefaultNodeName = "minikube" - -// MountProcessFileName is the filename of the mount process -var MountProcessFileName = ".mount-process" - -const ( - // SHASuffix is the suffix of a SHA-256 checksum file - SHASuffix = ".sha256" -) - -// DefaultISOURL is the default location of the minikube.iso file -var DefaultISOURL = fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", minikubeVersion.GetISOPath(), minikubeVersion.GetISOVersion()) - -// DefaultISOSHAURL is the default location of the minikube.iso.sha256 file -var DefaultISOSHAURL = DefaultISOURL + SHASuffix - -// DefaultKubernetesVersion is the default kubernetes version -var DefaultKubernetesVersion = "v1.17.2" - -// NewestKubernetesVersion is the newest Kubernetes version to test against -var NewestKubernetesVersion = "v1.17.2" - -// OldestKubernetesVersion is the oldest Kubernetes version to test against -var OldestKubernetesVersion = "v1.11.10" - -const ( +var ( // IsMinikubeChildProcess is the name of "is minikube child process" variable IsMinikubeChildProcess = "IS_MINIKUBE_CHILD_PROCESS" -) - -// ImageRepositories contains all known image repositories -var ImageRepositories = map[string][]string{ - "global": {""}, - "cn": {"registry.cn-hangzhou.aliyuncs.com/google_containers"}, -} + // GvisorConfigTomlTargetName is the go-bindata target name for the gvisor config.toml + GvisorConfigTomlTargetName = "gvisor-config.toml" + // MountProcessFileName is the filename of the mount process + MountProcessFileName = ".mount-process" + // SHASuffix is the suffix of a SHA-256 checksum file -// KubernetesReleaseBinaries are Kubernetes release binaries required for -// kubeadm (kubelet, kubeadm) and the addon manager (kubectl) -var KubernetesReleaseBinaries = []string{"kubelet", "kubeadm", "kubectl"} +) -// ImageCacheDir is the path to the image cache directory -var ImageCacheDir = localpath.MakeMiniPath("cache", "images") +var ( + // MinReqPodmanVer is required the mininum version of podman to be installed for podman driver. + MinReqPodmanVer = semver.Version{Major: 1, Minor: 7, Patch: 0} + // MinReqDockerVer is required the mininum version of docker server to be installed for docker driver. + MinReqDockerVer = semver.Version{Major: 16, Minor: 0, Patch: 0} + // MinSuggestDockerVer is the suggsted the mininum version of docker server to be installed for docker driver. + MinSuggestDockerVer = semver.Version{Major: 19, Minor: 0, Patch: 0} -const ( - // GvisorConfigTomlTargetName is the go-bindata target name for the gvisor config.toml - GvisorConfigTomlTargetName = "gvisor-config.toml" + SHASuffix = ".sha256" + // DefaultISOURL is the default location of the minikube.iso file + DefaultISOURL = fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", minikubeVersion.GetISOPath(), minikubeVersion.GetISOVersion()) + // DefaultISOSHAURL is the default location of the minikube.iso.sha256 file + DefaultISOSHAURL = DefaultISOURL + SHASuffix + + // has list of environment variables to control docker daemon shell is using + DockerDaemonEnvs = [3]string{DockerHostEnv, DockerTLSVerifyEnv, DockerCertPathEnv} + + // DefaultMinipath is the default Minikube path (under the home directory) + DefaultMinipath = filepath.Join(homedir.HomeDir(), ".minikube") + // KubeconfigEnvVar is the env var to check for the Kubernetes client config + + KubeconfigEnvVar = clientcmd.RecommendedConfigPathEnvVar + // KubeconfigPath is the path to the Kubernetes client config + KubeconfigPath = clientcmd.RecommendedHomeFile + // ImageRepositories contains all known image repositories + + ImageRepositories = map[string][]string{ + "global": {""}, + "cn": {"registry.cn-hangzhou.aliyuncs.com/google_containers"}, + } + // KubernetesReleaseBinaries are Kubernetes release binaries required for + // kubeadm (kubelet, kubeadm) and the addon manager (kubectl) + KubernetesReleaseBinaries = []string{"kubelet", "kubeadm", "kubectl"} + // ImageCacheDir is the path to the image cache directory + ImageCacheDir = localpath.MakeMiniPath("cache", "images") ) diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index 898bcc598757..d198447678fb 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -22,10 +22,13 @@ import ( "os/exec" "time" + "github.com/blang/semver" "github.com/docker/machine/libmachine/drivers" + "github.com/golang/glog" "k8s.io/minikube/pkg/drivers/kic" "k8s.io/minikube/pkg/drivers/kic/oci" "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/driver" "k8s.io/minikube/pkg/minikube/localpath" "k8s.io/minikube/pkg/minikube/registry" @@ -60,7 +63,23 @@ func status() registry.State { if err != nil { return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Docker is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/docker/"} } - // Allow no more than 2 seconds for querying state + + cmd := exec.Command(oci.Docker, "version", "-f", "'{{.Server.Version}}'") + o, err := cmd.CombinedOutput() + output := string(o) + if err != nil { + return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Cant verify mininim required version for podman . See podman website for installation guide.", Doc: "https://docs.docker.com/"} + } + + v, err := semver.Make(output) + if v.LT(constants.MinSuggestDockerVer) { + glog.Warningf("Warning ! mininim suggested version for docker is %s. your version is %q. minikube might not work. use at your own risk. To install a more recent version please see https://docs.docker.com/", constants.MinSuggestDockerVer.String(), v.String()) + } + if v.LT(constants.MinReqDockerVer) { + return registry.State{Error: err, Installed: true, Healthy: false, Fix: fmt.Sprint("Your docker version is too old (%s) please the mininim required docker version is %s.", v.String(), constants.MinReqDockerVer.String()), Doc: "https://docs.docker.com/"} + } + + // Allow no more than 3 seconds for querying state ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go index 8d7db222d7ed..4b3b5e863ad8 100644 --- a/pkg/minikube/registry/drvs/podman/podman.go +++ b/pkg/minikube/registry/drvs/podman/podman.go @@ -23,10 +23,13 @@ import ( "strings" "time" + "github.com/blang/semver" "github.com/docker/machine/libmachine/drivers" + "github.com/golang/glog" "k8s.io/minikube/pkg/drivers/kic" "k8s.io/minikube/pkg/drivers/kic/oci" "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/driver" "k8s.io/minikube/pkg/minikube/localpath" "k8s.io/minikube/pkg/minikube/registry" @@ -63,11 +66,17 @@ func status() registry.State { return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Podman is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/podman/"} } - _, err := exec.Cmd() - // if err != nil { - // return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Podman is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/podman/"} - // } + cmd := exec.Command(oci.Podman, "version", "-f", "{{.Version}}") + o, err := cmd.CombinedOutput() + output := string(o) + if err != nil { + return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Cant verify mininim required version for podman . See podman website for installation guide.", Doc: "https://podman.io/getting-started/installation.html"} + } + v, err := semver.Make(output) + if v.LT(constants.MinReqPodmanVer) { + glog.Warningf("Warning ! mininim required version for podman is %s. your version is %q. minikube might not work. use at your own risk. To install latest version please see https://podman.io/getting-started/installation.html ", constants.MinReqPodmanVer.String(), v.String) + } // Allow no more than 2 seconds for querying state ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/minikube/service/service_test.go b/pkg/minikube/service/service_test.go index 9d9b33911352..47fd341f42e9 100644 --- a/pkg/minikube/service/service_test.go +++ b/pkg/minikube/service/service_test.go @@ -366,30 +366,30 @@ func TestOptionallyHttpsFormattedUrlString(t *testing.T) { expectedIsHTTPSchemedURL bool }{ { - description: "no https for http schemed with no https option", - bareURLString: "http://192.168.99.100:30563", - https: false, + description: "no https for http schemed with no https option", + bareURLString: "http://192.168.99.100:30563", + https: false, expectedHTTPSFormattedURLString: "http://192.168.99.100:30563", expectedIsHTTPSchemedURL: true, }, { - description: "no https for non-http schemed with no https option", - bareURLString: "xyz.http.myservice:30563", - https: false, + description: "no https for non-http schemed with no https option", + bareURLString: "xyz.http.myservice:30563", + https: false, expectedHTTPSFormattedURLString: "xyz.http.myservice:30563", expectedIsHTTPSchemedURL: false, }, { - description: "https for http schemed with https option", - bareURLString: "http://192.168.99.100:30563", - https: true, + description: "https for http schemed with https option", + bareURLString: "http://192.168.99.100:30563", + https: true, expectedHTTPSFormattedURLString: "https://192.168.99.100:30563", expectedIsHTTPSchemedURL: true, }, { - description: "no https for non-http schemed with https option and http substring", - bareURLString: "xyz.http.myservice:30563", - https: true, + description: "no https for non-http schemed with https option and http substring", + bareURLString: "xyz.http.myservice:30563", + https: true, expectedHTTPSFormattedURLString: "xyz.http.myservice:30563", expectedIsHTTPSchemedURL: false, }, diff --git a/pkg/minikube/vmpath/constants.go b/pkg/minikube/vmpath/constants.go index ccc2474c2e53..aa0d66e2eae2 100644 --- a/pkg/minikube/vmpath/constants.go +++ b/pkg/minikube/vmpath/constants.go @@ -24,7 +24,6 @@ const ( // GuestEphemeralDir is the path where ephemeral data should be stored within the VM GuestEphemeralDir = "/var/tmp/minikube" // GuestPersistentDir is the path where persistent data should be stored within the VM (not tmpfs) -<<<<<<< HEAD GuestPersistentDir = "/var/lib/minikube" // GuestKubernetesCertsDir are where Kubernetes certificates are stored GuestKubernetesCertsDir = GuestPersistentDir + "/certs" @@ -34,13 +33,4 @@ const ( GuestCertStoreDir = "/etc/ssl/certs" // Where gvisor bootstraps from GuestGvisorDir = "/tmp/gvisor" -||||||| constructed merge base - GuestPersistentDir = "/var/lib/minikube" - // GuestCertsDir are where Kubernetes certificates are kept on the guest - GuestCertsDir = GuestPersistentDir + "/certs" -======= - GuestPersistentDir = "/usr/local/minikube" - // GuestCertsDir are where Kubernetes certificates are kept on the guest - GuestCertsDir = GuestPersistentDir + "/certs" ->>>>>>> refactor all hard-coded var lib path ) diff --git a/pkg/util/crypto.go b/pkg/util/crypto.go index 500b9813e0dd..417417e21551 100644 --- a/pkg/util/crypto.go +++ b/pkg/util/crypto.go @@ -53,7 +53,7 @@ func GenerateCACert(certPath, keyPath string, name string) error { KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign, ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth}, BasicConstraintsValid: true, - IsCA: true, + IsCA: true, } return writeCertsAndKeys(&template, certPath, priv, keyPath, &template, priv) From 34af2f53068a3ef9399b6eb90bf80af601bd8fef Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 00:01:33 -0800 Subject: [PATCH 24/63] lint --- pkg/addons/kubectl_test.go | 4 ++-- pkg/minikube/bootstrapper/bsutil/kubelet_test.go | 4 ++-- pkg/minikube/command/kic_runner.go | 2 +- pkg/minikube/registry/drvs/docker/docker.go | 2 +- pkg/minikube/registry/drvs/podman/podman.go | 6 +++++- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkg/addons/kubectl_test.go b/pkg/addons/kubectl_test.go index 42af78d1673d..fe4df2a04eb9 100644 --- a/pkg/addons/kubectl_test.go +++ b/pkg/addons/kubectl_test.go @@ -36,12 +36,12 @@ func TestKubectlCommand(t *testing.T) { description: "enable an addon", files: []string{"a", "b"}, enable: true, - expected: fmt.Sprintf("sudo KUBECONFIG=%s %s apply -f a -f b", path.Join(vmpath.GuestPersistentDir, "kubeconfig"), path.Join(vmpath.GuestPersistentDir, "v1.17.0".kubectl)), + expected: fmt.Sprintf("sudo KUBECONFIG=%s %s apply -f a -f b", path.Join(vmpath.GuestPersistentDir, "kubeconfig"), path.Join(vmpath.GuestPersistentDir, "v1.17.0", "kubectl")), }, { description: "disable an addon", files: []string{"a", "b"}, enable: false, - expected: fmt.Sprintf("sudo KUBECONFIG=%s %s apply -f a -f b", path.Join(vmpath.GuestPersistentDir, "kubeconfig"), path.Join(vmpath.GuestPersistentDir, "v1.17.0".kubectl)), + expected: fmt.Sprintf("sudo KUBECONFIG=%s %s apply -f a -f b", path.Join(vmpath.GuestPersistentDir, "kubeconfig"), path.Join(vmpath.GuestPersistentDir, "v1.17.0", "kubectl")), }, } diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet_test.go b/pkg/minikube/bootstrapper/bsutil/kubelet_test.go index 5a84483c1526..8234bf16550a 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubelet_test.go +++ b/pkg/minikube/bootstrapper/bsutil/kubelet_test.go @@ -142,7 +142,7 @@ ExecStart= ExecStart=%s --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=%s --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.200 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m [Install] -`, vmpath.GuestPersistentDir, "binaries", "v1.17.2", "kubelet"), path.Join(vmpath.GuestPersistentDir, "certs", "ca.crt"), +`, path.Join(vmpath.GuestPersistentDir, "binaries", "v1.17.2", "kubelet"), path.Join(vmpath.GuestPersistentDir, "certs", "ca.crt")), }, { description: "docker with custom image repository", @@ -168,7 +168,7 @@ ExecStart= ExecStart=%s --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=%s --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.1 --pod-manifest-path=/etc/kubernetes/manifests [Install] -`, vmpath.GuestPersistentDir, "binaries", "v1.17.2", "kubelet"), path.Join(vmpath.GuestPersistentDir, "certs", "ca.crt"), +`, path.Join(vmpath.GuestPersistentDir, "binaries", "v1.17.2", "kubelet"), path.Join(vmpath.GuestPersistentDir, "certs", "ca.crt")), }, } diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go index 4b970cc3ec39..d68f14521047 100644 --- a/pkg/minikube/command/kic_runner.go +++ b/pkg/minikube/command/kic_runner.go @@ -176,7 +176,7 @@ func copyToPodman(k *kicRunner, f assets.CopyableFile) error { return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) } if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", fmt.Sprint(perms), fmt.Sprintf("%s/%s", f.GetTargetDir(), f.GetTargetName())).CombinedOutput(); err != nil { - return errors.Wrapf(err, "chmod-ing copied file: %s", f.GetAssetName(), string(out)) + return errors.Wrapf(err, "chmod-ing copied file: %s output: %s", f.GetAssetName(), string(out)) } return nil diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index d198447678fb..724f384cbea3 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -76,7 +76,7 @@ func status() registry.State { glog.Warningf("Warning ! mininim suggested version for docker is %s. your version is %q. minikube might not work. use at your own risk. To install a more recent version please see https://docs.docker.com/", constants.MinSuggestDockerVer.String(), v.String()) } if v.LT(constants.MinReqDockerVer) { - return registry.State{Error: err, Installed: true, Healthy: false, Fix: fmt.Sprint("Your docker version is too old (%s) please the mininim required docker version is %s.", v.String(), constants.MinReqDockerVer.String()), Doc: "https://docs.docker.com/"} + return registry.State{Error: err, Installed: true, Healthy: false, Fix: fmt.Sprintf("Your docker version is too old (%s) please the mininim required docker version is %s.", v.String(), constants.MinReqDockerVer.String()), Doc: "https://docs.docker.com/"} } // Allow no more than 3 seconds for querying state diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go index 4b3b5e863ad8..03b86cc3b211 100644 --- a/pkg/minikube/registry/drvs/podman/podman.go +++ b/pkg/minikube/registry/drvs/podman/podman.go @@ -74,8 +74,12 @@ func status() registry.State { } v, err := semver.Make(output) + if err != nil { + return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Cant verify mininim required version for podman . See podman website for installation guide.", Doc: "https://podman.io/getting-started/installation.html"} + } + if v.LT(constants.MinReqPodmanVer) { - glog.Warningf("Warning ! mininim required version for podman is %s. your version is %q. minikube might not work. use at your own risk. To install latest version please see https://podman.io/getting-started/installation.html ", constants.MinReqPodmanVer.String(), v.String) + glog.Warningf("Warning ! mininim required version for podman is %s. your version is %q. minikube might not work. use at your own risk. To install latest version please see https://podman.io/getting-started/installation.html ", constants.MinReqPodmanVer.String(), v.String()) } // Allow no more than 2 seconds for querying state ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) From 97c35847f6346b44a7dac61e62420b2ae1e78184 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 00:05:18 -0800 Subject: [PATCH 25/63] add github action job for podman --- .github/workflows/main.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2ec7b9b32c3a..eefb91f9d3dc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -142,3 +142,37 @@ jobs: with: name: none_on_ubuntu_latest_report path: report + podman_ubuntu_18_04: + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v2 + - name: build binaries + run : | + make minikube-linux-amd64 + make e2e-linux-amd64 + - name: install podman + run: | + . /etc/os-release + sudo sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" + wget -q https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_${VERSION_ID}/Release.key -O- | sudo apt-key add - + sudo apt-key add - < Release.key + sudo apt-get update -qq + sudo apt-get -qq -y install podman + - name: install gopogh + run: | + cd /tmp + GO111MODULE="on" go get github.com/medyagh/gopogh@v0.0.17 || true + cd - + - name: run integration test + run: | + mkdir -p /tmp/testhome + MINIKUBE_HOME=/tmp/testhome sudo -E ./out/e2e-linux-amd64 -minikube-start-args=--vm-driver=podman -expected-default-driver= -test.timeout=70m -test.v -binary=out/minikube-linux-amd64 2>&1 | tee ./report/testout.txt + - name: generate gopogh report + run: | + export PATH=${PATH}:`go env GOPATH`/bin + go tool test2json -t < ./report/testout.txt > ./report/testout.json || true + gopogh -in ./report/testout.json -out ./report/testout.html -name "docker ubuntu" -repo github.com/kubernetes/minikube/ || true + - uses: actions/upload-artifact@v1 + with: + name: podman_on_ubuntu_latest_report + path: report From a7de2631c43b50c667e8d7d6e0d4cca83e5f9944 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 00:10:55 -0800 Subject: [PATCH 26/63] add podman jenkins script --- .../jenkins/linux_integration_tests_docker.sh | 3 ++ hack/jenkins/linux_integration_tests_none.sh | 2 + .../jenkins/linux_integration_tests_podman.sh | 39 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100755 hack/jenkins/linux_integration_tests_podman.sh diff --git a/hack/jenkins/linux_integration_tests_docker.sh b/hack/jenkins/linux_integration_tests_docker.sh index 6adcccb4b9be..fb912d239102 100755 --- a/hack/jenkins/linux_integration_tests_docker.sh +++ b/hack/jenkins/linux_integration_tests_docker.sh @@ -32,4 +32,7 @@ JOB_NAME="Docker_Linux" mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES" sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP" +# removing possible left over docker containers from previous runs +docker rm -f -v $(docker ps -aq) >/dev/null 2>&1 || true + source ./common.sh diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index b3a05d474499..ddacb25cdb15 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -46,6 +46,8 @@ sudo rm -rf /data/* sudo rm -rf /etc/kubernetes/* # Cleanup old minikube files sudo rm -rf /var/lib/minikube/* +sudo rm -rf /usr/local/minikube/* + # Stop any leftover kubelets systemctl is-active --quiet kubelet \ && echo "stopping kubelet" \ diff --git a/hack/jenkins/linux_integration_tests_podman.sh b/hack/jenkins/linux_integration_tests_podman.sh new file mode 100755 index 000000000000..4ba47a2e3a60 --- /dev/null +++ b/hack/jenkins/linux_integration_tests_podman.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +# Copyright 2019 The Kubernetes Authors All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# This script runs the integration tests on a Linux machine for the KVM Driver + +# The script expects the following env variables: +# MINIKUBE_LOCATION: GIT_COMMIT from upstream build. +# COMMIT: Actual commit ID from upstream build +# EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests +# access_token: The Github API access token. Injected by the Jenkins credential provider. + +set -e + +OS_ARCH="linux-amd64" +VM_DRIVER="podman" +JOB_NAME="Podman_Linux" + +mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES" +sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP" +SUDO_PREFIX="sudo -E " + +# remove possible left over podman containers +sudo podman rm -f -v $(sudo podman ps -aq) + +source ./common.sh From 347dfe963dc0533bf3c88342f1e1410c82379321 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 00:12:29 -0800 Subject: [PATCH 27/63] update unit test data with new structure --- hack/jenkins/linux_integration_tests_none.sh | 2 +- .../bsutil/testdata/v1.11/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.11/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.11/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.11/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.11/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml | 4 ++-- .../bsutil/testdata/v1.12/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.12/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.12/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.12/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml | 4 ++-- .../bsutil/testdata/v1.13/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.13/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.13/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.13/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml | 4 ++-- .../bsutil/testdata/v1.14/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.14/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.14/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.14/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml | 4 ++-- .../bsutil/testdata/v1.15/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.15/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.15/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.15/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml | 4 ++-- .../bsutil/testdata/v1.16/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.16/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.16/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.16/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml | 4 ++-- .../bsutil/testdata/v1.17/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.17/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.17/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.17/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml | 4 ++-- .../bsutil/testdata/v1.18/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.18/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.18/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.18/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml | 4 ++-- .../bsutil/testdata/v1.19/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.19/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.19/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.19/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml | 4 ++-- 81 files changed, 161 insertions(+), 161 deletions(-) diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index ddacb25cdb15..a8c5011bb32d 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -45,7 +45,7 @@ sudo rm -rf /data/* # Cleanup old Kubernetes configs sudo rm -rf /etc/kubernetes/* # Cleanup old minikube files -sudo rm -rf /var/lib/minikube/* +sudo rm -rf /usr/local/minikube/* sudo rm -rf /usr/local/minikube/* # Stop any leftover kubelets 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 e44ab4c92aba..ae004d428f2b 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 @@ -6,11 +6,11 @@ api: bindPort: 12345 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] criSocket: /run/containerd/containerd.sock 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 ed91117f7308..f9f2ce1536c6 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 @@ -6,11 +6,11 @@ api: bindPort: 8443 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] criSocket: /run/containerd/containerd.sock diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml index ed91117f7308..f9f2ce1536c6 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml @@ -6,11 +6,11 @@ api: bindPort: 8443 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] criSocket: /run/containerd/containerd.sock 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 c15e61950852..0d7a214711cd 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 @@ -6,11 +6,11 @@ api: bindPort: 8443 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] criSocket: /var/run/crio/crio.sock diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml index eb4fd3fd1cfe..e8c69f0a8d63 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml @@ -6,11 +6,11 @@ api: bindPort: 8443 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] criSocket: /var/run/crio/crio.sock diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml index 8e3e566bc215..acea97b193a7 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml @@ -6,11 +6,11 @@ api: bindPort: 8443 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] apiServerExtraArgs: 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 6e0860426320..1761d1a683c9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/image-repository.yaml @@ -6,11 +6,11 @@ api: bindPort: 8443 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] imageRepository: test/repo diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml index a3d5c8230327..65b3009b50e2 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml @@ -6,11 +6,11 @@ api: bindPort: 8443 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] apiServerExtraArgs: 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 fee7f3684f18..18b801963f97 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 @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:12345 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local 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 c3399153f923..d5ba91ecf77c 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 @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml index 9beec13a4d53..f03203220a4c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local 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 88253bcb486d..4e8db0544bce 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 @@ -27,13 +27,13 @@ controllerManagerExtraArgs: schedulerExtraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml index 4a3555c9afe5..6475eb7df212 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml index 7ccd2edf2854..5ec31b41adf3 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml index 96bf607d6551..3ec2fad7a962 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: 1.1.1.1 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 f0b48f62e13d..b4413955cce1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml @@ -20,13 +20,13 @@ kind: ClusterConfiguration imageRepository: test/repo apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml index 22809c5ce969..06b33ae3436a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml @@ -24,13 +24,13 @@ controllerManagerExtraArgs: kube-api-burst: "32" schedulerExtraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local 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 3106e329d1f6..a812c4afecac 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 @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:12345 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local 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 279a7c20a381..7ce098ff30b4 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 @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml index 6994f8d92b8a..63818c516170 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local 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 1304deaa3e5b..961a31958bb9 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 @@ -27,13 +27,13 @@ controllerManagerExtraArgs: schedulerExtraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml index a333a2539986..4a0c9fc2df92 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml index afc4d8a8215b..3a6459ec7ad3 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml index 89d56b7bfddc..b94c359236c7 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: 1.1.1.1 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 3fc3446ce482..796703107f7b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml @@ -20,13 +20,13 @@ kind: ClusterConfiguration imageRepository: test/repo apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml index 9a4466840e80..6103fd948170 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml @@ -24,13 +24,13 @@ controllerManagerExtraArgs: kube-api-burst: "32" schedulerExtraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local 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 95c1fb0c59f8..4cef2bff3d5e 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 @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 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 53077ef4eb55..3ec9fd974265 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 @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml index 7b7a6b544355..2540c5ef1e08 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 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 9fdfe4f67925..c3d5975d1b75 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 @@ -31,14 +31,14 @@ scheduler: extraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml index 6c69bdc90d77..35eac145740a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml index d14ce69bc41e..e5e2a5fdaf2a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml index 2056fb7631a6..c29e010b7d7b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 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 132612747a99..585b1d438f79 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml @@ -22,14 +22,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml index 1505f69920eb..73ad46f514c1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml @@ -28,14 +28,14 @@ controllerManager: scheduler: extraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 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 d9402c815f1a..c1c1a72a1ebe 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 @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 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 9a11e8429288..cc794da8c67f 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 @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml index 24901912b630..c0330907e942 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 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 9a278fc9f574..a4c842218188 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 @@ -31,14 +31,14 @@ scheduler: extraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml index ccfed491fe11..06cc1530ad06 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml index 7ae97e1ea81f..5da2e7afa24b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml index 12d3d16b98bf..987c52420ec7 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 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 02fac89c94f9..b3f1d6d8cb95 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml @@ -22,14 +22,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml index fe17557c4e14..2c7cb8ef3480 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml @@ -28,14 +28,14 @@ controllerManager: scheduler: extraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 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 948cbfa1e5ea..e06ad08735a1 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 @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 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 672c3838c4c6..dd5023fe734e 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 @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml index bee7e4b3b6c5..7a052c2e9c41 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 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 c332938f1172..418db02a6dbf 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 @@ -31,14 +31,14 @@ scheduler: extraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml index 1d684b48e786..ae0b70eca5e3 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml index a5f29b0f7ed0..15fd5f22152c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml index a05a319a920b..edd5a982571e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 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 89465d9e4c18..141977f7d6eb 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml @@ -22,14 +22,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml index 24403f0d9d0e..8f5d1397cc1c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml @@ -28,14 +28,14 @@ controllerManager: scheduler: extraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 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 1687279613c0..9cbd6175df1d 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 @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local 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 16872467336e..8dc407fcce40 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 @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml index 5887f5b6aa45..e4433b686e3c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local 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 bb9911f57f43..e9f0890193c4 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 @@ -31,7 +31,7 @@ scheduler: extraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -39,7 +39,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml index ba380dc9f964..da52cff38a13 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml index 2f6a47b7050f..0b734254352d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml index 0005dc69390c..8a291f7d5207 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: 1.1.1.1 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 50ba184b28ed..94f460d02089 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml @@ -22,7 +22,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -30,7 +30,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml index ca68e6e39f4d..5c235bfe9674 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml @@ -28,7 +28,7 @@ controllerManager: scheduler: extraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -36,7 +36,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local 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 e5eb8d2d5ee1..cd57f3209476 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 @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local 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 8d3cd1d2c97b..c3dcd8463e59 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 @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml index eba01c91f235..990a3e700a2b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local 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 1c46d2e7ec6f..3afec0e10d2e 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 @@ -31,7 +31,7 @@ scheduler: extraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -39,7 +39,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml index bd29ae5875dd..635cfc7fb341 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml index a3f4deab94fe..e45bfc3d49df 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml index de9851d20418..86605a7db7bc 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: 1.1.1.1 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 acd3b6d111f1..45bd62579581 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml @@ -22,7 +22,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -30,7 +30,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml index e8b7b28d05a1..e8136e10dede 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml @@ -28,7 +28,7 @@ controllerManager: scheduler: extraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -36,7 +36,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local 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 30dd50136c69..f9792042a725 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 @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local 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 fd1b6aba4340..83085afca707 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 @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml index acde6e12ec34..2b2bba8c01d5 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local 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 9faec4d8213d..551a364bb1dc 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 @@ -31,7 +31,7 @@ scheduler: extraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -39,7 +39,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml index f4025a2de6d4..216fd7493bbc 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml index dbc01e3c63bb..fe40c2c04f9d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml index a8644fa298d2..d145d520d78d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: 1.1.1.1 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 1cf68cf362d9..088a79c25dc9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml @@ -22,7 +22,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -30,7 +30,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml index 40f770699585..400ed7518199 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml @@ -28,7 +28,7 @@ controllerManager: scheduler: extraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /var/lib/minikube/certs +certificatesDir: /usr/local/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -36,7 +36,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /var/lib/minikube/etcd + dataDir: /usr/local/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local From e68aa7b7ff9be231e6be279ae8e87ea849477c54 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 00:25:52 -0800 Subject: [PATCH 28/63] fix unit test --- pkg/addons/kubectl_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/addons/kubectl_test.go b/pkg/addons/kubectl_test.go index fe4df2a04eb9..27476ab0c953 100644 --- a/pkg/addons/kubectl_test.go +++ b/pkg/addons/kubectl_test.go @@ -36,12 +36,12 @@ func TestKubectlCommand(t *testing.T) { description: "enable an addon", files: []string{"a", "b"}, enable: true, - expected: fmt.Sprintf("sudo KUBECONFIG=%s %s apply -f a -f b", path.Join(vmpath.GuestPersistentDir, "kubeconfig"), path.Join(vmpath.GuestPersistentDir, "v1.17.0", "kubectl")), + expected: fmt.Sprintf("sudo KUBECONFIG=%s %s apply -f a -f b", path.Join(vmpath.GuestPersistentDir, "kubeconfig"), path.Join(vmpath.GuestPersistentDir, "binaries", "v1.17.0", "kubectl")), }, { description: "disable an addon", files: []string{"a", "b"}, enable: false, - expected: fmt.Sprintf("sudo KUBECONFIG=%s %s apply -f a -f b", path.Join(vmpath.GuestPersistentDir, "kubeconfig"), path.Join(vmpath.GuestPersistentDir, "v1.17.0", "kubectl")), + expected: fmt.Sprintf("sudo KUBECONFIG=%s %s delete -f a -f b", path.Join(vmpath.GuestPersistentDir, "kubeconfig"), path.Join(vmpath.GuestPersistentDir, "binaries", "v1.17.0", "kubectl")), }, } From 37fd7f4b7755307856e4349d80cf11950173ba6a Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 00:36:22 -0800 Subject: [PATCH 29/63] try a different way to install podman --- .github/workflows/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eefb91f9d3dc..67fda705c655 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -152,9 +152,10 @@ jobs: make e2e-linux-amd64 - name: install podman run: | - . /etc/os-release - sudo sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" - wget -q https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_${VERSION_ID}/Release.key -O- | sudo apt-key add - + # Debian 10 + echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list + wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/Debian_10/Release.key -O Release.key + sudo apt-key add - < Release.key sudo apt-get update -qq sudo apt-get -qq -y install podman From 13c3384312dcb4f0534cf5731b961f28f2f2155b Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 00:43:37 -0800 Subject: [PATCH 30/63] try installing github actions podman with sudo --- .github/workflows/main.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 67fda705c655..ba9e27834dbf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -146,19 +146,18 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - - name: build binaries - run : | - make minikube-linux-amd64 - make e2e-linux-amd64 - name: install podman run: | # Debian 10 - echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list - wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/Debian_10/Release.key -O Release.key - + sudo echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list + sudo wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/Debian_10/Release.key -O Release.key sudo apt-key add - < Release.key sudo apt-get update -qq sudo apt-get -qq -y install podman + - name: build binaries + run : | + make minikube-linux-amd64 + make e2e-linux-amd64 - name: install gopogh run: | cd /tmp From 444e1c74123db5ece65a2847497ceb436a7e1747 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 00:50:49 -0800 Subject: [PATCH 31/63] try one more time --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ba9e27834dbf..3c52acbada7b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -148,10 +148,10 @@ jobs: - uses: actions/checkout@v2 - name: install podman run: | - # Debian 10 - sudo echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list - sudo wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/Debian_10/Release.key -O Release.key - sudo apt-key add - < Release.key + . /etc/os-release + sudo sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" + wget -q https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_${VERSION_ID}/Release.key -O- | sudo apt-key add - + sudo apt-key add - < Release.key || true sudo apt-get update -qq sudo apt-get -qq -y install podman - name: build binaries From de4a385c071bf6640ba544f0bb38d26ad947c58b Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 10:56:20 -0800 Subject: [PATCH 32/63] set pending for podman jenkins job --- hack/jenkins/linux_integration_tests_podman.sh | 2 +- hack/jenkins/minikube_set_pending.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/linux_integration_tests_podman.sh b/hack/jenkins/linux_integration_tests_podman.sh index 4ba47a2e3a60..248d628016b2 100755 --- a/hack/jenkins/linux_integration_tests_podman.sh +++ b/hack/jenkins/linux_integration_tests_podman.sh @@ -34,6 +34,6 @@ sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboo SUDO_PREFIX="sudo -E " # remove possible left over podman containers -sudo podman rm -f -v $(sudo podman ps -aq) +sudo podman rm -f -v $(sudo podman ps -aq) || true source ./common.sh diff --git a/hack/jenkins/minikube_set_pending.sh b/hack/jenkins/minikube_set_pending.sh index ffffc5e72c75..4d7a2bedef4b 100755 --- a/hack/jenkins/minikube_set_pending.sh +++ b/hack/jenkins/minikube_set_pending.sh @@ -41,6 +41,7 @@ jobs=( 'KVM_Linux' 'none_Linux' 'Docker_Linux' + 'Podman_Linux' ) # retry_github_status provides reliable github status updates From d5fbf6a0955137ec70d6dbe88ff17e760703c403 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 11:08:12 -0800 Subject: [PATCH 33/63] diferent way of installing gopogh --- hack/jenkins/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index fce0f103a22d..5dcb2b90a511 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -320,7 +320,7 @@ echo ">> Running go test2json" go tool test2json -t < "${TEST_OUT}" > "${JSON_OUT}" || true echo ">> Installing gopogh" cd /tmp -GO111MODULE="on" go get -u github.com/medyagh/gopogh@v0.0.17 || true +GO111MODULE="off" go get -u github.com/medyagh/gopogh@v0.0.17 || true cd - echo ">> Running gopogh" if test -f "${HTML_OUT}"; then From f14599149e00b07ba6a421edf463adbd926aa188 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 11:23:57 -0800 Subject: [PATCH 34/63] install golang using script for jobs --- hack/jenkins/common.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 5dcb2b90a511..e5b1ae5325f2 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -29,6 +29,10 @@ readonly TEST_HOME="${TEST_ROOT}/${OS_ARCH}-${VM_DRIVER}-${MINIKUBE_LOCATION}-$$ export GOPATH="$HOME/go" export PATH=$PATH:"/usr/local/bin/:/usr/local/go/bin/:$GOPATH/bin" + +# installing golang so we could go-get gopogh +sudo ./check_install_golang.sh "1.13.4" "/usr/local" + echo ">> Starting at $(date)" echo "" echo "arch: ${OS_ARCH}" @@ -320,7 +324,7 @@ echo ">> Running go test2json" go tool test2json -t < "${TEST_OUT}" > "${JSON_OUT}" || true echo ">> Installing gopogh" cd /tmp -GO111MODULE="off" go get -u github.com/medyagh/gopogh@v0.0.17 || true +GO111MODULE="on" go get -u github.com/medyagh/gopogh@v0.0.17 || true cd - echo ">> Running gopogh" if test -f "${HTML_OUT}"; then From 83e683152aaecd2587ede89471ba89f8f06b8a8d Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 11:24:27 -0800 Subject: [PATCH 35/63] dont fail on golang as not needed --- hack/jenkins/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index e5b1ae5325f2..e582687f1b32 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -31,7 +31,7 @@ export PATH=$PATH:"/usr/local/bin/:/usr/local/go/bin/:$GOPATH/bin" # installing golang so we could go-get gopogh -sudo ./check_install_golang.sh "1.13.4" "/usr/local" +sudo ./check_install_golang.sh "1.13.4" "/usr/local" || true echo ">> Starting at $(date)" echo "" From 7dfc1446c4628a35b6ea1a73d9ed2b32a75ddeda Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 13:05:33 -0800 Subject: [PATCH 36/63] check install golang +x --- hack/jenkins/common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index e582687f1b32..1c615f0f99cc 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -30,6 +30,7 @@ export GOPATH="$HOME/go" export PATH=$PATH:"/usr/local/bin/:/usr/local/go/bin/:$GOPATH/bin" +chmod +x check_install_golang.sh # installing golang so we could go-get gopogh sudo ./check_install_golang.sh "1.13.4" "/usr/local" || true From aae4790f44070dc51a765239bf3a03fb3e44bb74 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 13:24:56 -0800 Subject: [PATCH 37/63] try to fix goopogh installer --- hack/jenkins/common.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 1c615f0f99cc..eee3f552673b 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -47,6 +47,7 @@ echo "uptime: $(uptime)" # Setting KUBECONFIG prevents the version ceck from erroring out due to permission issues echo "kubectl: $(env KUBECONFIG=${TEST_HOME} kubectl version --client --short=true)" echo "docker: $(docker version --format '{{ .Client.Version }}')" +echo "podman: $(podman version --format '{{.Version}}')" echo "go: $(go version || true)" @@ -324,7 +325,7 @@ touch "${JSON_OUT}" echo ">> Running go test2json" go tool test2json -t < "${TEST_OUT}" > "${JSON_OUT}" || true echo ">> Installing gopogh" -cd /tmp +cd $(mktemp -d) GO111MODULE="on" go get -u github.com/medyagh/gopogh@v0.0.17 || true cd - echo ">> Running gopogh" From 3710ac2592dffbcaf27189e2d4536102e43bb8f1 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 14:16:39 -0800 Subject: [PATCH 38/63] print podman version in integeration tests --- hack/jenkins/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index eee3f552673b..26775be28deb 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -47,7 +47,7 @@ echo "uptime: $(uptime)" # Setting KUBECONFIG prevents the version ceck from erroring out due to permission issues echo "kubectl: $(env KUBECONFIG=${TEST_HOME} kubectl version --client --short=true)" echo "docker: $(docker version --format '{{ .Client.Version }}')" -echo "podman: $(podman version --format '{{.Version}}')" +echo "podman: $(sudo podman version --format '{{.Version}}' || true)" echo "go: $(go version || true)" From 80f77ba8d4ba0342d110dc32139ae5de8d53b2f3 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 15:16:44 -0800 Subject: [PATCH 39/63] resolve docker-env --- hack/jenkins/linux_integration_tests_none.sh | 4 +- pkg/drivers/kic/kic.go | 14 ++--- pkg/drivers/kic/oci/oci.go | 13 ++-- pkg/drivers/kic/oci/types.go | 6 +- pkg/drivers/kic/types.go | 3 +- pkg/minikube/bootstrapper/certs.go | 4 +- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 4 +- pkg/minikube/cluster/docker_env.go | 66 ++++++++++++++++++++ pkg/minikube/cluster/ip.go | 4 +- 9 files changed, 92 insertions(+), 26 deletions(-) create mode 100644 pkg/minikube/cluster/docker_env.go diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index a8c5011bb32d..37c7e14f28da 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -44,8 +44,8 @@ docker rm -f $(docker ps -aq) >/dev/null 2>&1 || true sudo rm -rf /data/* # Cleanup old Kubernetes configs sudo rm -rf /etc/kubernetes/* -# Cleanup old minikube files -sudo rm -rf /usr/local/minikube/* +sudo rm -rf /var/lib/minikube/* +# Cleanup pre minikube 1.7.2 files sudo rm -rf /usr/local/minikube/* # Stop any leftover kubelets diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go index a44db260e467..bb76fbd5ef2c 100644 --- a/pkg/drivers/kic/kic.go +++ b/pkg/drivers/kic/kic.go @@ -76,15 +76,15 @@ func (d *Driver) Create() error { // control plane specific options params.PortMappings = append(params.PortMappings, oci.PortMapping{ - ListenAddress: DefaultBindIPV4, + ListenAddress: oci.DefaultBindIPV4, ContainerPort: constants.APIServerPort, }, oci.PortMapping{ - ListenAddress: DefaultBindIPV4, + ListenAddress: oci.DefaultBindIPV4, ContainerPort: constants.SSHPort, }, oci.PortMapping{ - ListenAddress: DefaultBindIPV4, + ListenAddress: oci.DefaultBindIPV4, ContainerPort: constants.DockerDaemonPort, }, ) @@ -138,12 +138,12 @@ func (d *Driver) GetIP() (string, error) { // GetExternalIP returns an IP which is accissble from outside func (d *Driver) GetExternalIP() (string, error) { - return DefaultBindIPV4, nil + return oci.DefaultBindIPV4, nil } // GetSSHHostname returns hostname for use with ssh func (d *Driver) GetSSHHostname() (string, error) { - return DefaultBindIPV4, nil + return oci.DefaultBindIPV4, nil } // GetSSHPort returns port for use with ssh @@ -186,7 +186,7 @@ func (d *Driver) GetState() (state.State, error) { cmd := exec.Command(d.NodeConfig.OCIBinary, "inspect", "-f", "{{.State.Status}}", d.MachineName) out, err := cmd.CombinedOutput() - o := strings.Trim(string(out), "\n") + o := strings.TrimSpace(string(out)) if err != nil { return state.Error, errors.Wrapf(err, "get container %s status", d.MachineName) } @@ -222,7 +222,7 @@ func (d *Driver) Remove() error { } cmd := exec.Command(d.NodeConfig.OCIBinary, "rm", "-f", "-v", d.MachineName) o, err := cmd.CombinedOutput() - out := strings.Trim(string(o), "\n") + out := strings.TrimSpace(string(o)) if err != nil { if strings.Contains(out, "is already in progress") { log.Warnf("Docker engine is stuck. please restart docker daemon on your computer.", d.MachineName) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 541b899caff3..c715c7bc30cb 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -183,7 +183,7 @@ func HostPortBinding(ociBinary string, ociID string, contPort int) (int, error) } } - o := strings.Trim(string(out), "\n") + o := strings.TrimSpace(string(out)) o = strings.Trim(o, "'") p, err := strconv.Atoi(o) if err != nil { @@ -195,24 +195,23 @@ func HostPortBinding(ociBinary string, ociID string, contPort int) (int, error) // ContainerIPs returns ipv4,ipv6, error of a container by their name func ContainerIPs(ociBinary string, name string) (string, string, error) { if ociBinary == Podman { - return podomanContinerIP(name) + return podomanConttainerIP(name) } return dockerContainerIP(name) } -func podomanContinerIP(name string) (string, string, error) { +func podomanConttainerIP(name string) (string, string, error) { cmd := exec.Command(Podman, "inspect", "-f", "{{.NetworkSettings.IPAddress}}", name) out, err := cmd.CombinedOutput() - output := string(out) - output = strings.Trim(output, "\n") - output = strings.Trim(output, " ") if err != nil { return "", "", errors.Wrapf(err, "podman inspect ip %s", name) } + output := string(out) + output = strings.TrimSpace(output) if err == nil && output == "" { // podman returns empty for 127.0.0.1 - return "127.0.0.1", "", nil // TODO:medaygh move DefaultBindIP from kic package to here + return DefaultBindIPV4, "", nil } return output, "", nil } diff --git a/pkg/drivers/kic/oci/types.go b/pkg/drivers/kic/oci/types.go index 786cf3980ba9..70ffbe5dbbe7 100644 --- a/pkg/drivers/kic/oci/types.go +++ b/pkg/drivers/kic/oci/types.go @@ -17,8 +17,10 @@ limitations under the License. package oci const ( - Docker = "docker" - Podman = "podman" + // DefaultBindIPV4 is The default IP the container will listen on. + DefaultBindIPV4 = "127.0.0.1" + Docker = "docker" + Podman = "podman" // ClusterLabelKey is applied to each node docker container for identification ClusterLabelKey = "io.x-k8s.kic.cluster" // NodeRoleKey is used to identify if it is control plane or worker diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 317ee956f0a1..f3082952a523 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -23,8 +23,7 @@ const ( DefaultNetwork = "bridge" // DefaultPodCIDR is The CIDR to be used for pods inside the node. DefaultPodCIDR = "10.244.0.0/16" - // DefaultBindIPV4 is The default IP the container will bind to. - DefaultBindIPV4 = "127.0.0.1" + // BaseImage is the base image is used to spin up kic containers. it uses same base-image as kind. BaseImage = "gcr.io/k8s-minikube/kicbase:v0.0.5@sha256:3ddd8461dfb5c3e452ccc44d87750b87a574ec23fc425da67dccc1f0c57d428a" // OverlayImage is the cni plugin used for overlay image, created by kind. diff --git a/pkg/minikube/bootstrapper/certs.go b/pkg/minikube/bootstrapper/certs.go index ed5738a03e1a..bb4bde2a3865 100644 --- a/pkg/minikube/bootstrapper/certs.go +++ b/pkg/minikube/bootstrapper/certs.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/tools/clientcmd/api/latest" - "k8s.io/minikube/pkg/drivers/kic" + "k8s.io/minikube/pkg/drivers/kic/oci" "k8s.io/minikube/pkg/minikube/assets" "k8s.io/minikube/pkg/minikube/command" "k8s.io/minikube/pkg/minikube/config" @@ -169,7 +169,7 @@ func generateCerts(k8s config.KubernetesConfig, n config.Node) error { apiServerIPs := append( k8s.APIServerIPs, - []net.IP{net.ParseIP(n.IP), serviceIP, net.ParseIP(kic.DefaultBindIPV4), net.ParseIP("10.0.0.1")}...) + []net.IP{net.ParseIP(n.IP), serviceIP, net.ParseIP(oci.DefaultBindIPV4), net.ParseIP("10.0.0.1")}...) apiServerNames := append(k8s.APIServerNames, k8s.APIServerName) apiServerAlternateNames := append( apiServerNames, diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index f92e1d470d95..a083b02617cf 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -276,7 +276,7 @@ func (k *Bootstrapper) WaitForCluster(cfg config.MachineConfig, timeout time.Dur ip := cp.IP port := cp.Port if driver.IsKIC(cfg.VMDriver) { - ip = kic.DefaultBindIPV4 + ip = oci.DefaultBindIPV4 port, err = oci.HostPortBinding(cfg.VMDriver, cfg.Name, port) if err != nil { return errors.Wrapf(err, "get host-bind port %d for container %s", port, cfg.Name) @@ -344,7 +344,7 @@ func (k *Bootstrapper) restartCluster(cfg config.MachineConfig) error { ip := n.IP port := n.Port if driver.IsKIC(cfg.VMDriver) { - ip = kic.DefaultBindIPV4 + ip = oci.DefaultBindIPV4 port, err = oci.HostPortBinding(cfg.VMDriver, cfg.Name, port) if err != nil { return errors.Wrapf(err, "get host-bind port %d for container %s", port, cfg.Name) diff --git a/pkg/minikube/cluster/docker_env.go b/pkg/minikube/cluster/docker_env.go new file mode 100644 index 000000000000..03a8550728c3 --- /dev/null +++ b/pkg/minikube/cluster/docker_env.go @@ -0,0 +1,66 @@ +/* +Copyright 2020 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package cluster + +import ( + "fmt" + "net" + + "github.com/docker/machine/libmachine" + "github.com/pkg/errors" + "github.com/spf13/viper" + "k8s.io/minikube/pkg/drivers/kic/oci" + "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/constants" + "k8s.io/minikube/pkg/minikube/driver" + "k8s.io/minikube/pkg/minikube/localpath" +) + +// GetNodeDockerEnv gets the necessary docker env variables to allow the use of docker through minikube's vm +func GetNodeDockerEnv(api libmachine.API) (map[string]string, error) { + pName := viper.GetString(config.MachineProfile) + host, err := CheckIfHostExistsAndLoad(api, pName) + if err != nil { + return nil, errors.Wrap(err, "Error checking that api exists and loading it") + } + + ip := oci.DefaultBindIPV4 + if !driver.IsKIC(host.Driver.DriverName()) { // kic externally accessible ip is different that node ip + ip, err = host.Driver.GetIP() + if err != nil { + return nil, errors.Wrap(err, "Error getting ip from host") + } + + } + + tcpPrefix := "tcp://" + port := constants.DockerDaemonPort + if driver.IsKIC(host.Driver.DriverName()) { // for kic we need to find out what port docker allocated during creation + port, err = oci.HostPortBinding(host.Driver.DriverName(), pName, constants.DockerDaemonPort) + if err != nil { + return nil, errors.Wrapf(err, "get hostbind port for %d", constants.DockerDaemonPort) + } + } + + envMap := map[string]string{ + constants.DockerTLSVerifyEnv: "1", + constants.DockerHostEnv: tcpPrefix + net.JoinHostPort(ip, fmt.Sprint(port)), + constants.DockerCertPathEnv: localpath.MakeMiniPath("certs"), + constants.MinikubeActiveDockerdEnv: pName, + } + return envMap, nil +} diff --git a/pkg/minikube/cluster/ip.go b/pkg/minikube/cluster/ip.go index 8ea0cb5b1011..e1d8e97db2f8 100644 --- a/pkg/minikube/cluster/ip.go +++ b/pkg/minikube/cluster/ip.go @@ -25,7 +25,7 @@ import ( "github.com/docker/machine/libmachine" "github.com/docker/machine/libmachine/host" "github.com/pkg/errors" - "k8s.io/minikube/pkg/drivers/kic" + "k8s.io/minikube/pkg/drivers/kic/oci" "k8s.io/minikube/pkg/minikube/driver" ) @@ -84,7 +84,7 @@ func GetHostDriverIP(api libmachine.API, machineName string) (net.IP, error) { return nil, errors.Wrap(err, "getting IP") } if driver.IsKIC(host.DriverName) { - ipStr = kic.DefaultBindIPV4 + ipStr = oci.DefaultBindIPV4 } ip := net.ParseIP(ipStr) if ip == nil { From b815ae3809499612379b9d7afbf38d0ca411e49c Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 14:46:10 -0800 Subject: [PATCH 40/63] spelling --- pkg/minikube/registry/drvs/docker/docker.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index 724f384cbea3..c1df024f64f9 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -68,15 +68,15 @@ func status() registry.State { o, err := cmd.CombinedOutput() output := string(o) if err != nil { - return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Cant verify mininim required version for podman . See podman website for installation guide.", Doc: "https://docs.docker.com/"} + return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Cant verify minimum required version for podman . See podman website for installation guide.", Doc: "https://docs.docker.com/"} } v, err := semver.Make(output) if v.LT(constants.MinSuggestDockerVer) { - glog.Warningf("Warning ! mininim suggested version for docker is %s. your version is %q. minikube might not work. use at your own risk. To install a more recent version please see https://docs.docker.com/", constants.MinSuggestDockerVer.String(), v.String()) + glog.Warningf("Warning ! minimum suggested version for docker is %s. your version is %q. minikube might not work. use at your own risk. To install a more recent version please see https://docs.docker.com/", constants.MinSuggestDockerVer.String(), v.String()) } if v.LT(constants.MinReqDockerVer) { - return registry.State{Error: err, Installed: true, Healthy: false, Fix: fmt.Sprintf("Your docker version is too old (%s) please the mininim required docker version is %s.", v.String(), constants.MinReqDockerVer.String()), Doc: "https://docs.docker.com/"} + return registry.State{Error: err, Installed: true, Healthy: false, Fix: fmt.Sprintf("Your docker version is too old (%s) please the minimum required docker version is %s.", v.String(), constants.MinReqDockerVer.String()), Doc: "https://docs.docker.com/"} } // Allow no more than 3 seconds for querying state From 48e0b25ce5a6365431f2570f02b2c7b0fc427756 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 16:51:20 -0800 Subject: [PATCH 41/63] revert back to var lib minikube --- cmd/minikube/cmd/docker-env.go | 3 +-- hack/jenkins/linux_integration_tests_none.sh | 2 -- .../bsutil/testdata/v1.11/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.11/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.11/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.11/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.11/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml | 4 ++-- .../bsutil/testdata/v1.12/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.12/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.12/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.12/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.12/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml | 4 ++-- .../bsutil/testdata/v1.13/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.13/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.13/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.13/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.13/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml | 4 ++-- .../bsutil/testdata/v1.14/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.14/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.14/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.14/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml | 4 ++-- .../bsutil/testdata/v1.15/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.15/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.15/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.15/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml | 4 ++-- .../bsutil/testdata/v1.16/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.16/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.16/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.16/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml | 4 ++-- .../bsutil/testdata/v1.17/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.17/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.17/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.17/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml | 4 ++-- .../bsutil/testdata/v1.18/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.18/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.18/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.18/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml | 4 ++-- .../bsutil/testdata/v1.19/containerd-api-port.yaml | 4 ++-- .../bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.19/containerd.yaml | 4 ++-- .../bsutil/testdata/v1.19/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml | 4 ++-- .../bootstrapper/bsutil/testdata/v1.19/image-repository.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml | 4 ++-- pkg/minikube/constants/constants.go | 2 +- 83 files changed, 162 insertions(+), 165 deletions(-) diff --git a/cmd/minikube/cmd/docker-env.go b/cmd/minikube/cmd/docker-env.go index ccea698d3e3f..91f797cad24c 100644 --- a/cmd/minikube/cmd/docker-env.go +++ b/cmd/minikube/cmd/docker-env.go @@ -32,7 +32,6 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" - "k8s.io/minikube/pkg/drivers/kic" "k8s.io/minikube/pkg/drivers/kic/oci" "k8s.io/minikube/pkg/minikube/cluster" "k8s.io/minikube/pkg/minikube/config" @@ -269,7 +268,7 @@ func dockerEnvVars(ec DockerEnvConfig) (map[string]string, error) { if err != nil { return nil, errors.Wrapf(err, "get hostbind port for %d", constants.DockerDaemonPort) } - env[constants.DockerCertPathEnv] = dockerURL(kic.DefaultBindIPV4, port) + env[constants.DockerCertPathEnv] = dockerURL(oci.DefaultBindIPV4, port) } return env, nil } diff --git a/hack/jenkins/linux_integration_tests_none.sh b/hack/jenkins/linux_integration_tests_none.sh index 37c7e14f28da..7c52bb180057 100755 --- a/hack/jenkins/linux_integration_tests_none.sh +++ b/hack/jenkins/linux_integration_tests_none.sh @@ -45,8 +45,6 @@ sudo rm -rf /data/* # Cleanup old Kubernetes configs sudo rm -rf /etc/kubernetes/* sudo rm -rf /var/lib/minikube/* -# Cleanup pre minikube 1.7.2 files -sudo rm -rf /usr/local/minikube/* # Stop any leftover kubelets systemctl is-active --quiet kubelet \ 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 ae004d428f2b..e44ab4c92aba 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 @@ -6,11 +6,11 @@ api: bindPort: 12345 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] criSocket: /run/containerd/containerd.sock 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 f9f2ce1536c6..ed91117f7308 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 @@ -6,11 +6,11 @@ api: bindPort: 8443 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] criSocket: /run/containerd/containerd.sock diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml index f9f2ce1536c6..ed91117f7308 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/containerd.yaml @@ -6,11 +6,11 @@ api: bindPort: 8443 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] criSocket: /run/containerd/containerd.sock 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 0d7a214711cd..c15e61950852 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 @@ -6,11 +6,11 @@ api: bindPort: 8443 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] criSocket: /var/run/crio/crio.sock diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml index e8c69f0a8d63..eb4fd3fd1cfe 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/crio.yaml @@ -6,11 +6,11 @@ api: bindPort: 8443 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] criSocket: /var/run/crio/crio.sock diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml index acea97b193a7..8e3e566bc215 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/default.yaml @@ -6,11 +6,11 @@ api: bindPort: 8443 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] apiServerExtraArgs: 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 1761d1a683c9..6e0860426320 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/image-repository.yaml @@ -6,11 +6,11 @@ api: bindPort: 8443 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] imageRepository: test/repo diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml index 65b3009b50e2..a3d5c8230327 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.11/options.yaml @@ -6,11 +6,11 @@ api: bindPort: 8443 controlPlaneEndpoint: localhost kubernetesVersion: v1.11.0 -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs networking: serviceSubnet: 10.96.0.0/12 etcd: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd nodeName: mk apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] apiServerExtraArgs: 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 18b801963f97..fee7f3684f18 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 @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:12345 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local 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 d5ba91ecf77c..c3399153f923 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 @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml index f03203220a4c..9beec13a4d53 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/containerd.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local 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 4e8db0544bce..88253bcb486d 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 @@ -27,13 +27,13 @@ controllerManagerExtraArgs: schedulerExtraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml index 6475eb7df212..4a3555c9afe5 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/crio.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml index 5ec31b41adf3..7ccd2edf2854 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml index 3ec2fad7a962..96bf607d6551 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/dns.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: 1.1.1.1 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 b4413955cce1..f0b48f62e13d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/image-repository.yaml @@ -20,13 +20,13 @@ kind: ClusterConfiguration imageRepository: test/repo apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml index 06b33ae3436a..22809c5ce969 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/options.yaml @@ -24,13 +24,13 @@ controllerManagerExtraArgs: kube-api-burst: "32" schedulerExtraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.12.0 networking: dnsDomain: cluster.local 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 a812c4afecac..3106e329d1f6 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 @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:12345 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local 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 7ce098ff30b4..279a7c20a381 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 @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml index 63818c516170..6994f8d92b8a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/containerd.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local 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 961a31958bb9..1304deaa3e5b 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 @@ -27,13 +27,13 @@ controllerManagerExtraArgs: schedulerExtraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml index 4a0c9fc2df92..a333a2539986 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/crio.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml index 3a6459ec7ad3..afc4d8a8215b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml index b94c359236c7..89d56b7bfddc 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/dns.yaml @@ -19,13 +19,13 @@ apiVersion: kubeadm.k8s.io/v1alpha3 kind: ClusterConfiguration apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: 1.1.1.1 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 796703107f7b..3fc3446ce482 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/image-repository.yaml @@ -20,13 +20,13 @@ kind: ClusterConfiguration imageRepository: test/repo apiServerExtraArgs: enable-admission-plugins: "Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml index 6103fd948170..9a4466840e80 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/options.yaml @@ -24,13 +24,13 @@ controllerManagerExtraArgs: kube-api-burst: "32" schedulerExtraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes apiServerCertSANs: ["127.0.0.1", "localhost", "1.1.1.1"] controlPlaneEndpoint: localhost:8443 etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.13.0 networking: dnsDomain: cluster.local 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 4cef2bff3d5e..95c1fb0c59f8 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 @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 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 3ec9fd974265..53077ef4eb55 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 @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml index 2540c5ef1e08..7b7a6b544355 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 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 c3d5975d1b75..9fdfe4f67925 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 @@ -31,14 +31,14 @@ scheduler: extraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml index 35eac145740a..6c69bdc90d77 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml index e5e2a5fdaf2a..d14ce69bc41e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml index c29e010b7d7b..2056fb7631a6 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 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 585b1d438f79..132612747a99 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml @@ -22,14 +22,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml index 73ad46f514c1..1505f69920eb 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml @@ -28,14 +28,14 @@ controllerManager: scheduler: extraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.14.0 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 c1c1a72a1ebe..d9402c815f1a 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 @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 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 cc794da8c67f..9a11e8429288 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 @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml index c0330907e942..24901912b630 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 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 a4c842218188..9a278fc9f574 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 @@ -31,14 +31,14 @@ scheduler: extraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml index 06cc1530ad06..ccfed491fe11 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml index 5da2e7afa24b..7ae97e1ea81f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml index 987c52420ec7..12d3d16b98bf 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 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 b3f1d6d8cb95..02fac89c94f9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml @@ -22,14 +22,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml index 2c7cb8ef3480..fe17557c4e14 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml @@ -28,14 +28,14 @@ controllerManager: scheduler: extraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.15.0 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 e06ad08735a1..948cbfa1e5ea 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 @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 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 dd5023fe734e..672c3838c4c6 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 @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml index 7a052c2e9c41..bee7e4b3b6c5 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 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 418db02a6dbf..c332938f1172 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 @@ -31,14 +31,14 @@ scheduler: extraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml index ae0b70eca5e3..1d684b48e786 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml index 15fd5f22152c..a5f29b0f7ed0 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml index edd5a982571e..a05a319a920b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml @@ -21,14 +21,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 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 141977f7d6eb..89465d9e4c18 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml @@ -22,14 +22,14 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml index 8f5d1397cc1c..24403f0d9d0e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml @@ -28,14 +28,14 @@ controllerManager: scheduler: extraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd extraArgs: listen-metrics-urls: http://127.0.0.1:2381,http://1.1.1.1:2381 kubernetesVersion: v1.16.0 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 9cbd6175df1d..1687279613c0 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 @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local 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 8dc407fcce40..16872467336e 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 @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml index e4433b686e3c..5887f5b6aa45 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local 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 e9f0890193c4..bb9911f57f43 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 @@ -31,7 +31,7 @@ scheduler: extraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -39,7 +39,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml index da52cff38a13..ba380dc9f964 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml index 0b734254352d..2f6a47b7050f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml index 8a291f7d5207..0005dc69390c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: 1.1.1.1 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 94f460d02089..50ba184b28ed 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml @@ -22,7 +22,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -30,7 +30,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml index 5c235bfe9674..ca68e6e39f4d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml @@ -28,7 +28,7 @@ controllerManager: scheduler: extraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -36,7 +36,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.17.0 networking: dnsDomain: cluster.local 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 cd57f3209476..e5eb8d2d5ee1 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 @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local 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 c3dcd8463e59..8d3cd1d2c97b 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 @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml index 990a3e700a2b..eba01c91f235 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local 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 3afec0e10d2e..1c46d2e7ec6f 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 @@ -31,7 +31,7 @@ scheduler: extraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -39,7 +39,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml index 635cfc7fb341..bd29ae5875dd 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml index e45bfc3d49df..a3f4deab94fe 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml index 86605a7db7bc..de9851d20418 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: 1.1.1.1 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 45bd62579581..acd3b6d111f1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml @@ -22,7 +22,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -30,7 +30,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml index e8136e10dede..e8b7b28d05a1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml @@ -28,7 +28,7 @@ controllerManager: scheduler: extraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -36,7 +36,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.18.0 networking: dnsDomain: cluster.local 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 f9792042a725..30dd50136c69 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 @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:12345 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local 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 83085afca707..fd1b6aba4340 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 @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml index 2b2bba8c01d5..acde6e12ec34 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local 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 551a364bb1dc..9faec4d8213d 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 @@ -31,7 +31,7 @@ scheduler: extraArgs: feature-gates: "a=b" scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -39,7 +39,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml index 216fd7493bbc..f4025a2de6d4 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml index fe40c2c04f9d..dbc01e3c63bb 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml index d145d520d78d..a8644fa298d2 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml @@ -21,7 +21,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -29,7 +29,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: 1.1.1.1 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 088a79c25dc9..1cf68cf362d9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml @@ -22,7 +22,7 @@ apiServer: certSANs: ["127.0.0.1", "localhost", "1.1.1.1"] extraArgs: enable-admission-plugins: "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -30,7 +30,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml index 400ed7518199..40f770699585 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml @@ -28,7 +28,7 @@ controllerManager: scheduler: extraArgs: scheduler-name: "mini-scheduler" -certificatesDir: /usr/local/minikube/certs +certificatesDir: /var/lib/minikube/certs clusterName: kubernetes controlPlaneEndpoint: localhost:8443 controllerManager: {} @@ -36,7 +36,7 @@ dns: type: CoreDNS etcd: local: - dataDir: /usr/local/minikube/etcd + dataDir: /var/lib/minikube/etcd kubernetesVersion: v1.19.0 networking: dnsDomain: cluster.local diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index bec581ec506d..146c6efb626e 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -91,7 +91,7 @@ var ( // DefaultISOSHAURL is the default location of the minikube.iso.sha256 file DefaultISOSHAURL = DefaultISOURL + SHASuffix - // has list of environment variables to control docker daemon shell is using + // DockerDaemonEnvs is list of docker-daemon related environment variables. DockerDaemonEnvs = [3]string{DockerHostEnv, DockerTLSVerifyEnv, DockerCertPathEnv} // DefaultMinipath is the default Minikube path (under the home directory) From db3063475bacd1a944d18775961ca6f4b6d81353 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 17:09:43 -0800 Subject: [PATCH 42/63] run with context timeout --- pkg/minikube/registry/drvs/docker/docker.go | 12 ++++++++---- pkg/minikube/registry/drvs/podman/podman.go | 11 +++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index c1df024f64f9..c99d3f9af380 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -64,7 +64,11 @@ func status() registry.State { return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Docker is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/docker/"} } - cmd := exec.Command(oci.Docker, "version", "-f", "'{{.Server.Version}}'") + // Allow no more than 2 seconds for getting version + ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) + defer cancel() + + cmd := exec.CommandContext(ctx, oci.Docker, "version", "-f", "'{{.Server.Version}}'") o, err := cmd.CombinedOutput() output := string(o) if err != nil { @@ -79,11 +83,11 @@ func status() registry.State { return registry.State{Error: err, Installed: true, Healthy: false, Fix: fmt.Sprintf("Your docker version is too old (%s) please the minimum required docker version is %s.", v.String(), constants.MinReqDockerVer.String()), Doc: "https://docs.docker.com/"} } - // Allow no more than 3 seconds for querying state - ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) + // Allow no more than 3 seconds for docker info + ctx, cancel = context.WithTimeout(context.Background(), 3*time.Second) defer cancel() - err = exec.CommandContext(ctx, "docker", "info").Run() + err = exec.CommandContext(ctx, oci.Docker, "info").Run() if err != nil { return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Docker is not running or is responding too slow. Try: restarting docker desktop."} } diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go index 03b86cc3b211..8707fa98c1e7 100644 --- a/pkg/minikube/registry/drvs/podman/podman.go +++ b/pkg/minikube/registry/drvs/podman/podman.go @@ -66,7 +66,11 @@ func status() registry.State { return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Podman is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/podman/"} } - cmd := exec.Command(oci.Podman, "version", "-f", "{{.Version}}") + // Allow no more than 2 seconds for version command + ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) + defer cancel() + + cmd := exec.CommandContext(ctx, oci.Podman, "version", "-f", "{{.Version}}") o, err := cmd.CombinedOutput() output := string(o) if err != nil { @@ -81,10 +85,9 @@ func status() registry.State { if v.LT(constants.MinReqPodmanVer) { glog.Warningf("Warning ! mininim required version for podman is %s. your version is %q. minikube might not work. use at your own risk. To install latest version please see https://podman.io/getting-started/installation.html ", constants.MinReqPodmanVer.String(), v.String()) } - // Allow no more than 2 seconds for querying state - ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) + // Allow no more than 3 seconds for querying state + ctx, cancel = context.WithTimeout(context.Background(), 3*time.Second) defer cancel() - err = exec.CommandContext(ctx, oci.Podman, "info").Run() if err != nil { return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Podman is not running or taking too long to respond. Try: restarting podman."} From ffece5344890ef2e14cda47aebbd569349db33d9 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 17:18:41 -0800 Subject: [PATCH 43/63] fix needs root to inlude poxman --- cmd/minikube/cmd/start.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 8e4d9cb42532..fa6d539148b6 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -748,7 +748,7 @@ func validateUser(drvName string) { exit.WithCodeT(exit.Permissions, `The "{{.driver_name}}" driver requires root privileges. Please run minikube using 'sudo minikube --vm-driver={{.driver_name}}'.`, out.V{"driver_name": drvName}) } - if driver.BareMetal(drvName) || u.Uid != "0" { + if driver.NeedsRoot(drvName) || u.Uid != "0" { return } From 7339605ed8bb28ce812cee3a2738e2505990e670 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 17:34:38 -0800 Subject: [PATCH 44/63] fix integration test script for podman --- hack/jenkins/linux_integration_tests_podman.sh | 1 + test/integration/functional_test.go | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hack/jenkins/linux_integration_tests_podman.sh b/hack/jenkins/linux_integration_tests_podman.sh index 248d628016b2..b7b575fa7dc2 100755 --- a/hack/jenkins/linux_integration_tests_podman.sh +++ b/hack/jenkins/linux_integration_tests_podman.sh @@ -32,6 +32,7 @@ JOB_NAME="Podman_Linux" mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES" sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP" SUDO_PREFIX="sudo -E " +export KUBECONFIG="/root/.kube/config" # remove possible left over podman containers sudo podman rm -f -v $(sudo podman ps -aq) || true diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index df85356bb5e3..4a1a1b1cd36a 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -341,7 +341,7 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) { } } }) - t.Run("delete busybox:1.28.4-glibc", func(t *testing.T) { + t.Run("delete_busybox:1.28.4-glibc", func(t *testing.T) { _, err := Run(t, exec.CommandContext(ctx, Target(), "cache", "delete", "busybox:1.28.4-glibc")) if err != nil { t.Errorf("failed to delete image busybox:1.28.4-glibc from cache: %v", err) @@ -361,7 +361,7 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) { } }) - t.Run("verify cache inside node", func(t *testing.T) { + t.Run("verify_cache_inside_node", func(t *testing.T) { rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "sudo", "crictl", "images")) if err != nil { t.Errorf("failed to get images by %q ssh %v", rr.Command(), err) @@ -372,7 +372,7 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) { }) - t.Run("cache reload", func(t *testing.T) { // deleting image inside minikube node manually and expecting reload to bring it back + t.Run("cache_reload", func(t *testing.T) { // deleting image inside minikube node manually and expecting reload to bring it back img := "busybox:latest" // deleting image inside minikube node manually rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "ssh", "sudo", "docker", "rmi", img)) // for some reason crictl rmi doesn't work From aef13749e86ef34deb8e359e5b3c8ee262ff2606 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 19:13:00 -0800 Subject: [PATCH 45/63] get rid of var volume --- hack/jenkins/common.sh | 2 +- pkg/drivers/kic/oci/oci.go | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 26775be28deb..bf0df3313682 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -353,7 +353,7 @@ fi echo ">> Cleaning up after ourselves ..." ${SUDO_PREFIX}${MINIKUBE_BIN} tunnel --cleanup || true -${SUDO_PREFIX}${MINIKUBE_BIN} delete --all >/dev/null 2>/dev/null || true +${SUDO_PREFIX}${MINIKUBE_BIN} delete --all --purge >/dev/null 2>/dev/null || true cleanup_stale_routes || true ${SUDO_PREFIX} rm -Rf "${MINIKUBE_HOME}" || true diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index c715c7bc30cb..f322d051e0a7 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -50,8 +50,6 @@ func CreateContainerNode(p CreateParams) error { "--security-opt", "seccomp=unconfined", // also ignore seccomp "--tmpfs", "/tmp", // various things depend on working /tmp "--tmpfs", "/run", // systemd wants a writable /run - // logs,pods be stroed on filesystem vs inside container, - "--volume", "/var", // some k8s things want /lib/modules "-v", "/lib/modules:/lib/modules:ro", "--hostname", p.Name, // make hostname match container name From 4b82cede3df0d37340337d76de55326968c47b47 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 20:06:46 -0800 Subject: [PATCH 46/63] enable exec in var for podman --- pkg/drivers/kic/oci/oci.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index f322d051e0a7..f70212a9c9f9 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -50,6 +50,7 @@ func CreateContainerNode(p CreateParams) error { "--security-opt", "seccomp=unconfined", // also ignore seccomp "--tmpfs", "/tmp", // various things depend on working /tmp "--tmpfs", "/run", // systemd wants a writable /run + // logs,pods be stroed on filesystem vs inside container, // some k8s things want /lib/modules "-v", "/lib/modules:/lib/modules:ro", "--hostname", p.Name, // make hostname match container name @@ -59,9 +60,15 @@ func CreateContainerNode(p CreateParams) error { // label the node with the role ID "--label", fmt.Sprintf("%s=%s", nodeRoleKey, p.Role), } - // Podman does not allow setting resources when cgroup is specified - // exact podman error: "Error: invalid configuration, cannot set resources with rootless containers not using cgroups v2 unified mode" - if p.OCIBinary != Podman { + + if p.OCIBinary == Podman { // enable execing in /var + // podman mounts var/lib with no-exec by default https://github.com/containers/libpod/issues/5103 + runArgs = append(runArgs, "--volume", "/var:/var:exec") + } + if p.OCIBinary == Docker { + runArgs = append(runArgs, "--volume", "/var") + // setting resource limit in privileged mode is only supported by docker + // podman error: "Error: invalid configuration, cannot set resources with rootless containers not using cgroups v2 unified mode" runArgs = append(runArgs, fmt.Sprintf("--cpus=%s", p.CPUs), fmt.Sprintf("--memory=%s", p.Memory)) } From d20e66fae255cc4b991952b276eb4b3451c78412 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 20:36:00 -0800 Subject: [PATCH 47/63] try not setting root kubeconif for podman script --- hack/jenkins/linux_integration_tests_podman.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/hack/jenkins/linux_integration_tests_podman.sh b/hack/jenkins/linux_integration_tests_podman.sh index b7b575fa7dc2..248d628016b2 100755 --- a/hack/jenkins/linux_integration_tests_podman.sh +++ b/hack/jenkins/linux_integration_tests_podman.sh @@ -32,7 +32,6 @@ JOB_NAME="Podman_Linux" mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES" sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP" SUDO_PREFIX="sudo -E " -export KUBECONFIG="/root/.kube/config" # remove possible left over podman containers sudo podman rm -f -v $(sudo podman ps -aq) || true From ed7a636f17dd510ee8a57d8f65d3c0d2a23aedf6 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 21:00:20 -0800 Subject: [PATCH 48/63] adpot new configure for podman --- pkg/minikube/registry/drvs/podman/podman.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go index 8707fa98c1e7..0de37c8c898c 100644 --- a/pkg/minikube/registry/drvs/podman/podman.go +++ b/pkg/minikube/registry/drvs/podman/podman.go @@ -47,7 +47,7 @@ func init() { } } -func configure(mc config.MachineConfig) interface{} { +func configure(mc config.MachineConfig) (interface{}, error) { return kic.NewDriver(kic.Config{ MachineName: mc.Name, StorePath: localpath.MiniPath(), @@ -56,8 +56,7 @@ func configure(mc config.MachineConfig) interface{} { Memory: mc.Memory, OCIBinary: oci.Podman, APIServerPort: mc.Nodes[0].Port, - }) - + }), nil } func status() registry.State { From a44e13338679dea60fc5610efc45d8a817fe47ba Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 22:07:41 -0800 Subject: [PATCH 49/63] run podman tests non parallel --- hack/jenkins/linux_integration_tests_podman.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hack/jenkins/linux_integration_tests_podman.sh b/hack/jenkins/linux_integration_tests_podman.sh index 248d628016b2..f60941c60d02 100755 --- a/hack/jenkins/linux_integration_tests_podman.sh +++ b/hack/jenkins/linux_integration_tests_podman.sh @@ -33,6 +33,8 @@ mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cro sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP" SUDO_PREFIX="sudo -E " +EXTRA_TEST_ARGS="-test.parallel=1" + # remove possible left over podman containers sudo podman rm -f -v $(sudo podman ps -aq) || true From ecdf62df1433bb4dbe873ce19fcc02612d1d1c08 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 7 Feb 2020 22:34:14 -0800 Subject: [PATCH 50/63] change test run time for podman to containerd --- hack/jenkins/linux_integration_tests_podman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/linux_integration_tests_podman.sh b/hack/jenkins/linux_integration_tests_podman.sh index f60941c60d02..1dfbdb445600 100755 --- a/hack/jenkins/linux_integration_tests_podman.sh +++ b/hack/jenkins/linux_integration_tests_podman.sh @@ -33,7 +33,7 @@ mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cro sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP" SUDO_PREFIX="sudo -E " -EXTRA_TEST_ARGS="-test.parallel=1" +EXTRA_ARGS="--container-runtime=containerd" # remove possible left over podman containers sudo podman rm -f -v $(sudo podman ps -aq) || true From acecdc6e7e3dff01e7dbe5c91a6d8e16c6bb50a7 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Mon, 10 Feb 2020 13:37:15 -0800 Subject: [PATCH 51/63] remove sprintf from test files for clarity --- pkg/addons/kubectl_test.go | 8 ++--- .../bootstrapper/bsutil/kubelet_test.go | 33 +++++++++---------- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/pkg/addons/kubectl_test.go b/pkg/addons/kubectl_test.go index 27476ab0c953..493ff3541241 100644 --- a/pkg/addons/kubectl_test.go +++ b/pkg/addons/kubectl_test.go @@ -17,12 +17,8 @@ limitations under the License. package addons import ( - "fmt" - "path" "strings" "testing" - - "k8s.io/minikube/pkg/minikube/vmpath" ) func TestKubectlCommand(t *testing.T) { @@ -36,12 +32,12 @@ func TestKubectlCommand(t *testing.T) { description: "enable an addon", files: []string{"a", "b"}, enable: true, - expected: fmt.Sprintf("sudo KUBECONFIG=%s %s apply -f a -f b", path.Join(vmpath.GuestPersistentDir, "kubeconfig"), path.Join(vmpath.GuestPersistentDir, "binaries", "v1.17.0", "kubectl")), + expected: "sudo KUBECONFIG=/var/lib/minikube/kubeconfig /var/lib/minikube/binaries/v1.17.0/kubectl apply -f a -f b", }, { description: "disable an addon", files: []string{"a", "b"}, enable: false, - expected: fmt.Sprintf("sudo KUBECONFIG=%s %s delete -f a -f b", path.Join(vmpath.GuestPersistentDir, "kubeconfig"), path.Join(vmpath.GuestPersistentDir, "binaries", "v1.17.0", "kubectl")), + expected: "sudo KUBECONFIG=/var/lib/minikube/kubeconfig /var/lib/minikube/binaries/v1.17.0/kubectl delete -f a -f b", }, } diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet_test.go b/pkg/minikube/bootstrapper/bsutil/kubelet_test.go index 8234bf16550a..56dc23168bec 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubelet_test.go +++ b/pkg/minikube/bootstrapper/bsutil/kubelet_test.go @@ -18,8 +18,6 @@ limitations under the License. package bsutil import ( - "fmt" - "path" "testing" "github.com/pmezard/go-difflib/difflib" @@ -27,7 +25,6 @@ import ( "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/cruntime" - "k8s.io/minikube/pkg/minikube/vmpath" ) func TestGenerateKubeletConfig(t *testing.T) { @@ -52,15 +49,15 @@ func TestGenerateKubeletConfig(t *testing.T) { }, }, }, - expected: fmt.Sprintf(`[Unit] + expected: `[Unit] Wants=docker.socket [Service] ExecStart= -ExecStart=%s --allow-privileged=true --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cadvisor-port=0 --cgroup-driver=cgroupfs --client-ca-file=%s --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests +ExecStart=/var/lib/minikube/binaries/v1.11.10/kubelet --allow-privileged=true --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cadvisor-port=0 --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests [Install] -`, path.Join(vmpath.GuestPersistentDir, "binaries", "v1.11.10", "kubelet"), path.Join(vmpath.GuestPersistentDir, "certs", "ca.crt")), +`, }, { description: "newest cri runtime", @@ -77,15 +74,15 @@ ExecStart=%s --allow-privileged=true --authorization-mode=Webhook --bootstrap-ku }, }, }, - expected: fmt.Sprintf(`[Unit] + expected: `[Unit] Wants=crio.service [Service] ExecStart= -ExecStart=%s --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=%s --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=/var/run/crio/crio.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=/var/run/crio/crio.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m +ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=/var/run/crio/crio.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=/var/run/crio/crio.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m [Install] -`, path.Join(vmpath.GuestPersistentDir, "binaries", "v1.17.2", "kubelet"), path.Join(vmpath.GuestPersistentDir, "certs", "ca.crt")), +`, }, { description: "default containerd runtime", @@ -102,15 +99,15 @@ ExecStart=%s --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes }, }, }, - expected: fmt.Sprintf(`[Unit] + expected: `[Unit] Wants=containerd.service [Service] ExecStart= -ExecStart=%s --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=%s --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m +ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m [Install] -`, path.Join(vmpath.GuestPersistentDir, "binaries", "v1.17.2", "kubelet"), path.Join(vmpath.GuestPersistentDir, "certs", "ca.crt")), +`, }, { description: "default containerd runtime with IP override", @@ -134,15 +131,15 @@ ExecStart=%s --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes }, }, }, - expected: fmt.Sprintf(`[Unit] + expected: `[Unit] Wants=containerd.service [Service] ExecStart= -ExecStart=%s --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=%s --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.200 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m +ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.200 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m [Install] -`, path.Join(vmpath.GuestPersistentDir, "binaries", "v1.17.2", "kubelet"), path.Join(vmpath.GuestPersistentDir, "certs", "ca.crt")), +`, }, { description: "docker with custom image repository", @@ -160,15 +157,15 @@ ExecStart=%s --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes }, }, }, - expected: fmt.Sprintf(`[Unit] + expected: `[Unit] Wants=docker.socket [Service] ExecStart= -ExecStart=%s --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=%s --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.1 --pod-manifest-path=/etc/kubernetes/manifests +ExecStart=/var/lib/minikube/binaries/v1.17.2/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.1 --pod-manifest-path=/etc/kubernetes/manifests [Install] -`, path.Join(vmpath.GuestPersistentDir, "binaries", "v1.17.2", "kubelet"), path.Join(vmpath.GuestPersistentDir, "certs", "ca.crt")), +`, }, } From 5255fc76614ceaaa94d98c40466a670d35cf3529 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Mon, 10 Feb 2020 14:23:44 -0800 Subject: [PATCH 52/63] installer in path based on git --- hack/jenkins/common.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index bf0df3313682..14951e7936c8 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -29,10 +29,8 @@ readonly TEST_HOME="${TEST_ROOT}/${OS_ARCH}-${VM_DRIVER}-${MINIKUBE_LOCATION}-$$ export GOPATH="$HOME/go" export PATH=$PATH:"/usr/local/bin/:/usr/local/go/bin/:$GOPATH/bin" - -chmod +x check_install_golang.sh -# installing golang so we could go-get gopogh -sudo ./check_install_golang.sh "1.13.4" "/usr/local" || true +# installing golang so we could do go get for gopogh +sudo ./installers/check_install_golang.sh "1.13.4" "/usr/local" || true echo ">> Starting at $(date)" echo "" From d471ccf6170384edb186a9aea5743e6a120ba041 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Mon, 10 Feb 2020 15:28:14 -0800 Subject: [PATCH 53/63] delete left over file --- pkg/minikube/cluster/docker_env.go | 66 ------------------------------ 1 file changed, 66 deletions(-) delete mode 100644 pkg/minikube/cluster/docker_env.go diff --git a/pkg/minikube/cluster/docker_env.go b/pkg/minikube/cluster/docker_env.go deleted file mode 100644 index 03a8550728c3..000000000000 --- a/pkg/minikube/cluster/docker_env.go +++ /dev/null @@ -1,66 +0,0 @@ -/* -Copyright 2020 The Kubernetes Authors All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package cluster - -import ( - "fmt" - "net" - - "github.com/docker/machine/libmachine" - "github.com/pkg/errors" - "github.com/spf13/viper" - "k8s.io/minikube/pkg/drivers/kic/oci" - "k8s.io/minikube/pkg/minikube/config" - "k8s.io/minikube/pkg/minikube/constants" - "k8s.io/minikube/pkg/minikube/driver" - "k8s.io/minikube/pkg/minikube/localpath" -) - -// GetNodeDockerEnv gets the necessary docker env variables to allow the use of docker through minikube's vm -func GetNodeDockerEnv(api libmachine.API) (map[string]string, error) { - pName := viper.GetString(config.MachineProfile) - host, err := CheckIfHostExistsAndLoad(api, pName) - if err != nil { - return nil, errors.Wrap(err, "Error checking that api exists and loading it") - } - - ip := oci.DefaultBindIPV4 - if !driver.IsKIC(host.Driver.DriverName()) { // kic externally accessible ip is different that node ip - ip, err = host.Driver.GetIP() - if err != nil { - return nil, errors.Wrap(err, "Error getting ip from host") - } - - } - - tcpPrefix := "tcp://" - port := constants.DockerDaemonPort - if driver.IsKIC(host.Driver.DriverName()) { // for kic we need to find out what port docker allocated during creation - port, err = oci.HostPortBinding(host.Driver.DriverName(), pName, constants.DockerDaemonPort) - if err != nil { - return nil, errors.Wrapf(err, "get hostbind port for %d", constants.DockerDaemonPort) - } - } - - envMap := map[string]string{ - constants.DockerTLSVerifyEnv: "1", - constants.DockerHostEnv: tcpPrefix + net.JoinHostPort(ip, fmt.Sprint(port)), - constants.DockerCertPathEnv: localpath.MakeMiniPath("certs"), - constants.MinikubeActiveDockerdEnv: pName, - } - return envMap, nil -} From 1b44a8a59891d033286dc55ed285047ef8a59e1f Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Tue, 11 Feb 2020 11:33:20 -0800 Subject: [PATCH 54/63] podman command runner --- pkg/minikube/command/kic_runner.go | 3 ++- pkg/minikube/machine/client.go | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go index d68f14521047..3e4bd08e7efb 100644 --- a/pkg/minikube/command/kic_runner.go +++ b/pkg/minikube/command/kic_runner.go @@ -175,7 +175,8 @@ func copyToPodman(k *kicRunner, f assets.CopyableFile) error { if out, err := exec.Command(oci.Podman, "cp", assetFullPath, destination).CombinedOutput(); err != nil { return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) } - if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", fmt.Sprint(perms), fmt.Sprintf("%s/%s", f.GetTargetDir(), f.GetTargetName())).CombinedOutput(); err != nil { + // only for podman trying with 777 till bugs with podman cp are fixed. + if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", "777", fmt.Sprintf("%s/%s", f.GetTargetDir(), f.GetTargetName())).CombinedOutput(); err != nil { return errors.Wrapf(err, "chmod-ing copied file: %s output: %s", f.GetAssetName(), string(out)) } diff --git a/pkg/minikube/machine/client.go b/pkg/minikube/machine/client.go index ba79fe4745ef..0121c923582c 100644 --- a/pkg/minikube/machine/client.go +++ b/pkg/minikube/machine/client.go @@ -154,8 +154,9 @@ func CommandRunner(h *host.Host) (command.Runner, error) { if driver.BareMetal(h.Driver.DriverName()) { return command.NewExecRunner(), nil } - if h.Driver.DriverName() == driver.Docker { - return command.NewKICRunner(h.Name, "docker"), nil + + if driver.IsKIC(h.Driver.DriverName()) { + return command.NewKICRunner(h.Name, h.Driver.DriverName()), nil } client, err := sshutil.NewSSHClient(h.Driver) if err != nil { From de19331f349d6a97c25f89a35df786b7a210fb9f Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Tue, 11 Feb 2020 12:06:05 -0800 Subject: [PATCH 55/63] add noisy log only for podman --- pkg/minikube/command/kic_runner.go | 5 +++-- pkg/minikube/registry/drvs/docker/docker.go | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go index 3e4bd08e7efb..1ba0fdb12fa0 100644 --- a/pkg/minikube/command/kic_runner.go +++ b/pkg/minikube/command/kic_runner.go @@ -175,8 +175,9 @@ func copyToPodman(k *kicRunner, f assets.CopyableFile) error { if out, err := exec.Command(oci.Podman, "cp", assetFullPath, destination).CombinedOutput(); err != nil { return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) } - // only for podman trying with 777 till bugs with podman cp are fixed. - if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", "777", fmt.Sprintf("%s/%s", f.GetTargetDir(), f.GetTargetName())).CombinedOutput(); err != nil { + // till podman cp bugs are fixed I add this noisy log + glog.Info("podman cp: applying permission %s for copied file %ws", fmt.Sprint(perms), f.GetTargetName()) + if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", fmt.Sprint(perms), fmt.Sprintf("%s/%s", f.GetTargetDir(), f.GetTargetName())).CombinedOutput(); err != nil { return errors.Wrapf(err, "chmod-ing copied file: %s output: %s", f.GetAssetName(), string(out)) } diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index c99d3f9af380..9df4b2c158ce 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -20,6 +20,7 @@ import ( "context" "fmt" "os/exec" + "strings" "time" "github.com/blang/semver" @@ -64,17 +65,16 @@ func status() registry.State { return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Docker is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/docker/"} } - // Allow no more than 2 seconds for getting version - ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) + // Allow no more than 1 seconds for getting version + ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second) defer cancel() cmd := exec.CommandContext(ctx, oci.Docker, "version", "-f", "'{{.Server.Version}}'") o, err := cmd.CombinedOutput() - output := string(o) if err != nil { - return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Cant verify minimum required version for podman . See podman website for installation guide.", Doc: "https://docs.docker.com/"} + return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Cant verify minimum required version for docker . See docker website for installation guide.", Doc: "https://docs.docker.com/"} } - + output := strings.TrimSpace(string(o)) v, err := semver.Make(output) if v.LT(constants.MinSuggestDockerVer) { glog.Warningf("Warning ! minimum suggested version for docker is %s. your version is %q. minikube might not work. use at your own risk. To install a more recent version please see https://docs.docker.com/", constants.MinSuggestDockerVer.String(), v.String()) From 14cc32bd979c53870476ac2bd112e75b43b8c767 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Tue, 11 Feb 2020 12:43:44 -0800 Subject: [PATCH 56/63] podman cp --- pkg/minikube/command/kic_runner.go | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go index 1ba0fdb12fa0..e03a27858d7c 100644 --- a/pkg/minikube/command/kic_runner.go +++ b/pkg/minikube/command/kic_runner.go @@ -159,25 +159,13 @@ func copyToPodman(k *kicRunner, f assets.CopyableFile) error { assetFullPath = tmpFile.Name() } - perms, err := strconv.ParseInt(f.GetPermissions(), 8, 0) - if err != nil { - return errors.Wrapf(err, "converting permissions %s to integer", f.GetPermissions()) - } - - // Rely on cp -a to propagate permissions - if err := os.Chmod(assetFullPath, os.FileMode(perms)); err != nil { - return errors.Wrapf(err, "chmod") - } - //example: podman cp file.txt minikube:/home/docker/file.txt - // older versions of podman (for example 1.4) has a bug that creates a directory for the file ! - // TODO:medyagh add a check to not allow using old podmans (works on 1.7) destination := fmt.Sprintf("%s:%s%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) if out, err := exec.Command(oci.Podman, "cp", assetFullPath, destination).CombinedOutput(); err != nil { return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) } // till podman cp bugs are fixed I add this noisy log - glog.Info("podman cp: applying permission %s for copied file %ws", fmt.Sprint(perms), f.GetTargetName()) - if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", fmt.Sprint(perms), fmt.Sprintf("%s/%s", f.GetTargetDir(), f.GetTargetName())).CombinedOutput(); err != nil { + glog.Infof("podman cp: applying permission %s for copied file %ws", f, f.GetPermissions(), f.GetTargetName()) + if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", f.GetPermissions(), fmt.Sprintf("%s/%s", f.GetTargetDir(), f.GetTargetName())).CombinedOutput(); err != nil { return errors.Wrapf(err, "chmod-ing copied file: %s output: %s", f.GetAssetName(), string(out)) } From e2aa6ffa7c5c654d2e3c94c51138cf067ed4d11f Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Tue, 11 Feb 2020 13:14:08 -0800 Subject: [PATCH 57/63] lint --- pkg/minikube/command/kic_runner.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go index e03a27858d7c..2e47d7c5c411 100644 --- a/pkg/minikube/command/kic_runner.go +++ b/pkg/minikube/command/kic_runner.go @@ -164,7 +164,7 @@ func copyToPodman(k *kicRunner, f assets.CopyableFile) error { return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) } // till podman cp bugs are fixed I add this noisy log - glog.Infof("podman cp: applying permission %s for copied file %ws", f, f.GetPermissions(), f.GetTargetName()) + glog.Infof("podman cp: applying permission %s for copied file %s", f.GetPermissions(), f.GetTargetName()) if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", f.GetPermissions(), fmt.Sprintf("%s/%s", f.GetTargetDir(), f.GetTargetName())).CombinedOutput(); err != nil { return errors.Wrapf(err, "chmod-ing copied file: %s output: %s", f.GetAssetName(), string(out)) From b30fbd3ce3dd77d893e1b91b481665b9b3c3e55a Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Tue, 11 Feb 2020 14:22:37 -0800 Subject: [PATCH 58/63] podman cp --- pkg/minikube/command/kic_runner.go | 72 ++++++++---------------------- 1 file changed, 19 insertions(+), 53 deletions(-) diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go index 2e47d7c5c411..f0085921440e 100644 --- a/pkg/minikube/command/kic_runner.go +++ b/pkg/minikube/command/kic_runner.go @@ -127,53 +127,7 @@ func (k *kicRunner) RunCmd(cmd *exec.Cmd) (*RunResult, error) { // Copy copies a file and its permissions func (k *kicRunner) Copy(f assets.CopyableFile) error { - if k.ociBin == oci.Podman { - return copyToPodman(k, f) - } - return copyToDocker(k, f) -} - -// Podman cp command doesn't match docker and doesn't have -a -func copyToPodman(k *kicRunner, f assets.CopyableFile) error { - assetFullPath := f.GetAssetName() - if _, err := os.Stat(f.GetAssetName()); os.IsNotExist(err) { - fc := make([]byte, f.GetLength()) // Read asset file into a []byte - if _, err := f.Read(fc); err != nil { - return errors.Wrap(err, "can't copy non-existing file") - } // we have a MemoryAsset, will write to disk before copying - - tmpFile, err := ioutil.TempFile(os.TempDir(), "tmpf-memory-asset") - if err != nil { - return errors.Wrap(err, "creating temporary file") - } - // clean up the temp file - defer os.Remove(tmpFile.Name()) - if _, err = tmpFile.Write(fc); err != nil { - return errors.Wrap(err, "write to temporary file") - } - - // Close the file - if err := tmpFile.Close(); err != nil { - return errors.Wrap(err, "close temporary file") - } - assetFullPath = tmpFile.Name() - } - - destination := fmt.Sprintf("%s:%s%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) - if out, err := exec.Command(oci.Podman, "cp", assetFullPath, destination).CombinedOutput(); err != nil { - return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) - } - // till podman cp bugs are fixed I add this noisy log - glog.Infof("podman cp: applying permission %s for copied file %s", f.GetPermissions(), f.GetTargetName()) - if out, err := exec.Command(oci.Podman, "exec", "-it", k.nameOrID, "chmod", f.GetPermissions(), fmt.Sprintf("%s/%s", f.GetTargetDir(), f.GetTargetName())).CombinedOutput(); err != nil { - return errors.Wrapf(err, "chmod-ing copied file: %s output: %s", f.GetAssetName(), string(out)) - - } - return nil -} - -func copyToDocker(k *kicRunner, f assets.CopyableFile) error { - assetFullPath := f.GetAssetName() + src := f.GetAssetName() if _, err := os.Stat(f.GetAssetName()); os.IsNotExist(err) { fc := make([]byte, f.GetLength()) // Read asset file into a []byte if _, err := f.Read(fc); err != nil { @@ -194,7 +148,7 @@ func copyToDocker(k *kicRunner, f assets.CopyableFile) error { if err := tmpFile.Close(); err != nil { return errors.Wrap(err, "close temporary file") } - assetFullPath = tmpFile.Name() + src = tmpFile.Name() } perms, err := strconv.ParseInt(f.GetPermissions(), 8, 0) @@ -203,15 +157,27 @@ func copyToDocker(k *kicRunner, f assets.CopyableFile) error { } // Rely on cp -a to propagate permissions - if err := os.Chmod(assetFullPath, os.FileMode(perms)); err != nil { + if err := os.Chmod(src, os.FileMode(perms)); err != nil { return errors.Wrapf(err, "chmod") } + dest := fmt.Sprintf("%s:%s%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) + if k.ociBin == oci.Podman { + return copyToPodman(k, dest, dest) + } + return copyToDocker(k, dest, dest) +} - // example "docker cp containerName:destination src" - destination := fmt.Sprintf("%s:%s/%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) - if out, err := exec.Command(k.ociBin, "cp", "-a", assetFullPath, destination).CombinedOutput(); err != nil { +// Podman cp command doesn't match docker and doesn't have -a +func copyToPodman(k *kicRunner, src string, dest string) error { + if out, err := exec.Command(k.ociBin, "cp", src, dest).CombinedOutput(); err != nil { + return errors.Wrapf(err, "docker copy %s into %s, output: %s", src, dest, string(out)) + } + return nil +} - return errors.Wrapf(err, "copying %s into node, output: %s", f.GetAssetName(), string(out)) +func copyToDocker(k *kicRunner, src string, dest string) error { + if out, err := exec.Command(k.ociBin, "cp", "-a", src, dest).CombinedOutput(); err != nil { + return errors.Wrapf(err, "docker copy %s into %s, output: %s", src, dest, string(out)) } return nil } From 987858efd94dce4427c37c80a1fc3eb265381646 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Tue, 11 Feb 2020 14:45:03 -0800 Subject: [PATCH 59/63] still fixing podman cp --- pkg/minikube/command/kic_runner.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/minikube/command/kic_runner.go b/pkg/minikube/command/kic_runner.go index f0085921440e..2d00a15251c4 100644 --- a/pkg/minikube/command/kic_runner.go +++ b/pkg/minikube/command/kic_runner.go @@ -160,23 +160,23 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error { if err := os.Chmod(src, os.FileMode(perms)); err != nil { return errors.Wrapf(err, "chmod") } - dest := fmt.Sprintf("%s:%s%s", k.nameOrID, f.GetTargetDir(), f.GetTargetName()) + dest := fmt.Sprintf("%s:%s", k.nameOrID, path.Join(f.GetTargetDir(), f.GetTargetName())) if k.ociBin == oci.Podman { - return copyToPodman(k, dest, dest) + return copyToPodman(src, dest) } - return copyToDocker(k, dest, dest) + return copyToDocker(src, dest) } // Podman cp command doesn't match docker and doesn't have -a -func copyToPodman(k *kicRunner, src string, dest string) error { - if out, err := exec.Command(k.ociBin, "cp", src, dest).CombinedOutput(); err != nil { - return errors.Wrapf(err, "docker copy %s into %s, output: %s", src, dest, string(out)) +func copyToPodman(src string, dest string) error { + if out, err := exec.Command(oci.Podman, "cp", src, dest).CombinedOutput(); err != nil { + return errors.Wrapf(err, "podman copy %s into %s, output: %s", src, dest, string(out)) } return nil } -func copyToDocker(k *kicRunner, src string, dest string) error { - if out, err := exec.Command(k.ociBin, "cp", "-a", src, dest).CombinedOutput(); err != nil { +func copyToDocker(src string, dest string) error { + if out, err := exec.Command(oci.Docker, "cp", "-a", src, dest).CombinedOutput(); err != nil { return errors.Wrapf(err, "docker copy %s into %s, output: %s", src, dest, string(out)) } return nil From 5cfd32c726ea41deaf135f2e421c8a5bb2643d6e Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Tue, 11 Feb 2020 15:34:52 -0800 Subject: [PATCH 60/63] move kubeconfig up in test script to make it effective --- hack/jenkins/common.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 14951e7936c8..4a3431e39881 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -27,11 +27,13 @@ readonly TEST_ROOT="${HOME}/minikube-integration" readonly TEST_HOME="${TEST_ROOT}/${OS_ARCH}-${VM_DRIVER}-${MINIKUBE_LOCATION}-$$-${COMMIT}" export GOPATH="$HOME/go" +export KUBECONFIG="${TEST_HOME}/kubeconfig" export PATH=$PATH:"/usr/local/bin/:/usr/local/go/bin/:$GOPATH/bin" # installing golang so we could do go get for gopogh sudo ./installers/check_install_golang.sh "1.13.4" "/usr/local" || true + echo ">> Starting at $(date)" echo "" echo "arch: ${OS_ARCH}" @@ -239,7 +241,6 @@ cleanup_stale_routes || true mkdir -p "${TEST_HOME}" export MINIKUBE_HOME="${TEST_HOME}/.minikube" -export KUBECONFIG="${TEST_HOME}/kubeconfig" # Build the gvisor image so that we can integration test changes to pkg/gvisor From 3425d9d083f11afb28d3398f8a274c572b92ebf3 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Tue, 11 Feb 2020 23:44:03 -0800 Subject: [PATCH 61/63] correct host path vol for podman --- pkg/drivers/kic/oci/oci.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index f70212a9c9f9..53dc2cf0f2f6 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -18,6 +18,7 @@ package oci import ( "os" + "path/filepath" "strconv" "bufio" @@ -26,6 +27,7 @@ import ( "github.com/golang/glog" "github.com/pkg/errors" "k8s.io/minikube/pkg/minikube/constants" + "k8s.io/minikube/pkg/minikube/localpath" "fmt" "os/exec" @@ -63,7 +65,8 @@ func CreateContainerNode(p CreateParams) error { if p.OCIBinary == Podman { // enable execing in /var // podman mounts var/lib with no-exec by default https://github.com/containers/libpod/issues/5103 - runArgs = append(runArgs, "--volume", "/var:/var:exec") + hostVolPath := filepath.Join(localpath.MiniPath(), "machines", p.Name) + runArgs = append(runArgs, "--volume", fmt.Sprintf("%s:/var:exec", hostVolPath)) } if p.OCIBinary == Docker { runArgs = append(runArgs, "--volume", "/var") From fb29982e2351dc84fce3f46690920ff2425306ce Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 12 Feb 2020 00:21:06 -0800 Subject: [PATCH 62/63] create dirs for volume car --- pkg/drivers/kic/oci/oci.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 53dc2cf0f2f6..5f32a4d1a135 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -63,13 +63,18 @@ func CreateContainerNode(p CreateParams) error { "--label", fmt.Sprintf("%s=%s", nodeRoleKey, p.Role), } + // volume path in minikube home folder to mount to /var + hostVarVolPath := filepath.Join(localpath.MiniPath(), "machines", p.Name, "var") + if err := os.MkdirAll(hostVarVolPath, 0777); err != nil { + return errors.Wrapf(err, "create var dir %s", hostVarVolPath) + } + if p.OCIBinary == Podman { // enable execing in /var // podman mounts var/lib with no-exec by default https://github.com/containers/libpod/issues/5103 - hostVolPath := filepath.Join(localpath.MiniPath(), "machines", p.Name) - runArgs = append(runArgs, "--volume", fmt.Sprintf("%s:/var:exec", hostVolPath)) + runArgs = append(runArgs, "--volume", fmt.Sprintf("%s:/var:exec", hostVarVolPath)) } if p.OCIBinary == Docker { - runArgs = append(runArgs, "--volume", "/var") + runArgs = append(runArgs, "--volume", fmt.Sprintf("%s:/var", hostVarVolPath)) // setting resource limit in privileged mode is only supported by docker // podman error: "Error: invalid configuration, cannot set resources with rootless containers not using cgroups v2 unified mode" runArgs = append(runArgs, fmt.Sprintf("--cpus=%s", p.CPUs), fmt.Sprintf("--memory=%s", p.Memory)) From 4d227c70892cc6afd4d7ddba4f71154a30b1544b Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 12 Feb 2020 16:04:35 -0800 Subject: [PATCH 63/63] resolve code review comments --- cmd/minikube/cmd/start.go | 4 ++-- pkg/drivers/kic/oci/oci.go | 11 +++++----- pkg/minikube/constants/constants.go | 8 ------- pkg/minikube/driver/driver.go | 5 +++++ pkg/minikube/registry/drvs/docker/docker.go | 24 +-------------------- pkg/minikube/registry/drvs/podman/podman.go | 10 +++++---- 6 files changed, 20 insertions(+), 42 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index fa6d539148b6..8fe432ca5955 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -812,7 +812,7 @@ func validateFlags(cmd *cobra.Command, drvName string) { validateDiskSize() validateMemorySize() - if driver.NeedsRoot(drvName) { // both podman and none need root and they both cant specify resources + if !driver.HasResourceLimits(drvName) { // both podman and none need root and they both cant specify resources if cmd.Flags().Changed(cpus) { out.WarningT("The '{{.name}}' driver does not respect the --cpus flag", out.V{"name": drvName}) } @@ -823,7 +823,7 @@ func validateFlags(cmd *cobra.Command, drvName string) { if driver.BareMetal(drvName) { if viper.GetString(config.MachineProfile) != constants.DefaultMachineName { - exit.WithCodeT(exit.Config, "The 'none' driver does not support multiple profiles: https://minikube.sigs.k8s.io/docs/reference/drivers/none/") + exit.WithCodeT(exit.Config, "The '{{.name}} driver does not support multiple profiles: https://minikube.sigs.k8s.io/docs/reference/drivers/none/", out.V{"name": drvName}) } runtime := viper.GetString(containerRuntime) diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go index 5f32a4d1a135..13b9c7f50d55 100644 --- a/pkg/drivers/kic/oci/oci.go +++ b/pkg/drivers/kic/oci/oci.go @@ -65,7 +65,7 @@ func CreateContainerNode(p CreateParams) error { // volume path in minikube home folder to mount to /var hostVarVolPath := filepath.Join(localpath.MiniPath(), "machines", p.Name, "var") - if err := os.MkdirAll(hostVarVolPath, 0777); err != nil { + if err := os.MkdirAll(hostVarVolPath, 0711); err != nil { return errors.Wrapf(err, "create var dir %s", hostVarVolPath) } @@ -208,12 +208,13 @@ func HostPortBinding(ociBinary string, ociID string, contPort int) (int, error) // ContainerIPs returns ipv4,ipv6, error of a container by their name func ContainerIPs(ociBinary string, name string) (string, string, error) { if ociBinary == Podman { - return podomanConttainerIP(name) + return podmanConttainerIP(name) } return dockerContainerIP(name) } -func podomanConttainerIP(name string) (string, string, error) { +// podmanConttainerIP returns ipv4, ipv6 of container or error +func podmanConttainerIP(name string) (string, string, error) { cmd := exec.Command(Podman, "inspect", "-f", "{{.NetworkSettings.IPAddress}}", name) @@ -221,14 +222,14 @@ func podomanConttainerIP(name string) (string, string, error) { if err != nil { return "", "", errors.Wrapf(err, "podman inspect ip %s", name) } - output := string(out) - output = strings.TrimSpace(output) + output := strings.TrimSpace(string(out)) if err == nil && output == "" { // podman returns empty for 127.0.0.1 return DefaultBindIPV4, "", nil } return output, "", nil } +// dockerContainerIP returns ipv4, ipv6 of container or error func dockerContainerIP(name string) (string, string, error) { if err := PointToHostDockerDaemon(); err != nil { return "", "", errors.Wrap(err, "point host docker-daemon") diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 146c6efb626e..5fab19f81686 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -20,7 +20,6 @@ import ( "fmt" "path/filepath" - "github.com/blang/semver" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/util/homedir" "k8s.io/minikube/pkg/minikube/localpath" @@ -78,13 +77,6 @@ var ( ) var ( - // MinReqPodmanVer is required the mininum version of podman to be installed for podman driver. - MinReqPodmanVer = semver.Version{Major: 1, Minor: 7, Patch: 0} - // MinReqDockerVer is required the mininum version of docker server to be installed for docker driver. - MinReqDockerVer = semver.Version{Major: 16, Minor: 0, Patch: 0} - // MinSuggestDockerVer is the suggsted the mininum version of docker server to be installed for docker driver. - MinSuggestDockerVer = semver.Version{Major: 19, Minor: 0, Patch: 0} - SHASuffix = ".sha256" // DefaultISOURL is the default location of the minikube.iso file DefaultISOURL = fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", minikubeVersion.GetISOPath(), minikubeVersion.GetISOVersion()) diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go index cd1466b1c175..9791b0ab8b5d 100644 --- a/pkg/minikube/driver/driver.go +++ b/pkg/minikube/driver/driver.go @@ -113,6 +113,11 @@ func NeedsRoot(name string) bool { return name == None || name == Podman } +// HasResourceLimits returns true if driver can set resource limits such as memory size or CPU count. +func HasResourceLimits(name string) bool { + return name == None || name == Podman +} + // FlagHints are hints for what default options should be used for this driver type FlagHints struct { ExtraOptions []string diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index 9df4b2c158ce..38cc95acb794 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -20,16 +20,12 @@ import ( "context" "fmt" "os/exec" - "strings" "time" - "github.com/blang/semver" "github.com/docker/machine/libmachine/drivers" - "github.com/golang/glog" "k8s.io/minikube/pkg/drivers/kic" "k8s.io/minikube/pkg/drivers/kic/oci" "k8s.io/minikube/pkg/minikube/config" - "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/driver" "k8s.io/minikube/pkg/minikube/localpath" "k8s.io/minikube/pkg/minikube/registry" @@ -65,26 +61,8 @@ func status() registry.State { return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Docker is required.", Doc: "https://minikube.sigs.k8s.io/docs/reference/drivers/docker/"} } - // Allow no more than 1 seconds for getting version - ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second) - defer cancel() - - cmd := exec.CommandContext(ctx, oci.Docker, "version", "-f", "'{{.Server.Version}}'") - o, err := cmd.CombinedOutput() - if err != nil { - return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Cant verify minimum required version for docker . See docker website for installation guide.", Doc: "https://docs.docker.com/"} - } - output := strings.TrimSpace(string(o)) - v, err := semver.Make(output) - if v.LT(constants.MinSuggestDockerVer) { - glog.Warningf("Warning ! minimum suggested version for docker is %s. your version is %q. minikube might not work. use at your own risk. To install a more recent version please see https://docs.docker.com/", constants.MinSuggestDockerVer.String(), v.String()) - } - if v.LT(constants.MinReqDockerVer) { - return registry.State{Error: err, Installed: true, Healthy: false, Fix: fmt.Sprintf("Your docker version is too old (%s) please the minimum required docker version is %s.", v.String(), constants.MinReqDockerVer.String()), Doc: "https://docs.docker.com/"} - } - // Allow no more than 3 seconds for docker info - ctx, cancel = context.WithTimeout(context.Background(), 3*time.Second) + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() err = exec.CommandContext(ctx, oci.Docker, "info").Run() diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go index 0de37c8c898c..a8e19dbbc01d 100644 --- a/pkg/minikube/registry/drvs/podman/podman.go +++ b/pkg/minikube/registry/drvs/podman/podman.go @@ -1,5 +1,5 @@ /* -Copyright 2019 The Kubernetes Authors All rights reserved. +Copyright 2020 The Kubernetes Authors All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -29,12 +29,14 @@ import ( "k8s.io/minikube/pkg/drivers/kic" "k8s.io/minikube/pkg/drivers/kic/oci" "k8s.io/minikube/pkg/minikube/config" - "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/driver" "k8s.io/minikube/pkg/minikube/localpath" "k8s.io/minikube/pkg/minikube/registry" ) +// minReqPodmanVer is required the mininum version of podman to be installed for podman driver. +var minReqPodmanVer = semver.Version{Major: 1, Minor: 7, Patch: 0} + func init() { if err := registry.Register(registry.DriverDef{ Name: driver.Podman, @@ -81,8 +83,8 @@ func status() registry.State { return registry.State{Error: err, Installed: true, Healthy: false, Fix: "Cant verify mininim required version for podman . See podman website for installation guide.", Doc: "https://podman.io/getting-started/installation.html"} } - if v.LT(constants.MinReqPodmanVer) { - glog.Warningf("Warning ! mininim required version for podman is %s. your version is %q. minikube might not work. use at your own risk. To install latest version please see https://podman.io/getting-started/installation.html ", constants.MinReqPodmanVer.String(), v.String()) + if v.LT(minReqPodmanVer) { + glog.Warningf("Warning ! mininim required version for podman is %s. your version is %q. minikube might not work. use at your own risk. To install latest version please see https://podman.io/getting-started/installation.html ", minReqPodmanVer.String(), v.String()) } // Allow no more than 3 seconds for querying state ctx, cancel = context.WithTimeout(context.Background(), 3*time.Second)