From 13f6c042db944887d62ebc3c2a0a6c506b5fa131 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Mon, 14 Sep 2020 16:45:34 -0700 Subject: [PATCH 1/7] revert native-ssh change --- cmd/minikube/cmd/start.go | 10 +++++----- pkg/minikube/machine/ssh.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 21214cc48c..1ea218f02c 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -287,17 +287,17 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing * } } + mRunner, preExists, mAPI, host, err := node.Provision(&cc, &n, true, viper.GetBool(deleteOnFailure)) + if err != nil { + return node.Starter{}, err + } + if viper.GetBool(nativeSSH) { ssh.SetDefaultClient(ssh.Native) } else { ssh.SetDefaultClient(ssh.External) } - mRunner, preExists, mAPI, host, err := node.Provision(&cc, &n, true, viper.GetBool(deleteOnFailure)) - if err != nil { - return node.Starter{}, err - } - return node.Starter{ Runner: mRunner, PreExists: preExists, diff --git a/pkg/minikube/machine/ssh.go b/pkg/minikube/machine/ssh.go index c547ed09d7..0f991e2f2c 100644 --- a/pkg/minikube/machine/ssh.go +++ b/pkg/minikube/machine/ssh.go @@ -42,14 +42,14 @@ func CreateSSHShell(api libmachine.API, cc config.ClusterConfig, n config.Node, return errors.Errorf("%q is not running", machineName) } + client, err := host.CreateSSHClient() + if native { ssh.SetDefaultClient(ssh.Native) } else { ssh.SetDefaultClient(ssh.External) } - client, err := host.CreateSSHClient() - if err != nil { return errors.Wrap(err, "Creating ssh client") } From e7876bd355861f4c2d2f8aa6a6efdcdcbc2d69d5 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Wed, 16 Sep 2020 16:40:30 -0700 Subject: [PATCH 2/7] only revert ssh, keep start --- cmd/minikube/cmd/start.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 1ea218f02c..21214cc48c 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -287,17 +287,17 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing * } } - mRunner, preExists, mAPI, host, err := node.Provision(&cc, &n, true, viper.GetBool(deleteOnFailure)) - if err != nil { - return node.Starter{}, err - } - if viper.GetBool(nativeSSH) { ssh.SetDefaultClient(ssh.Native) } else { ssh.SetDefaultClient(ssh.External) } + mRunner, preExists, mAPI, host, err := node.Provision(&cc, &n, true, viper.GetBool(deleteOnFailure)) + if err != nil { + return node.Starter{}, err + } + return node.Starter{ Runner: mRunner, PreExists: preExists, From 4be665866479469cb8a9692bfdcc3d1449055d31 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Wed, 16 Sep 2020 17:55:07 -0700 Subject: [PATCH 3/7] full revert --- cmd/minikube/cmd/start.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 21214cc48c..1ea218f02c 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -287,17 +287,17 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing * } } + mRunner, preExists, mAPI, host, err := node.Provision(&cc, &n, true, viper.GetBool(deleteOnFailure)) + if err != nil { + return node.Starter{}, err + } + if viper.GetBool(nativeSSH) { ssh.SetDefaultClient(ssh.Native) } else { ssh.SetDefaultClient(ssh.External) } - mRunner, preExists, mAPI, host, err := node.Provision(&cc, &n, true, viper.GetBool(deleteOnFailure)) - if err != nil { - return node.Starter{}, err - } - return node.Starter{ Runner: mRunner, PreExists: preExists, From 2001d205103f2ad1e8bc047da58ddd4e7d7a17d0 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 17 Sep 2020 13:29:19 -0700 Subject: [PATCH 4/7] Update binaries.md --- site/content/en/docs/contrib/releasing/binaries.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/site/content/en/docs/contrib/releasing/binaries.md b/site/content/en/docs/contrib/releasing/binaries.md index 2a320004cd..cd0dd72056 100644 --- a/site/content/en/docs/contrib/releasing/binaries.md +++ b/site/content/en/docs/contrib/releasing/binaries.md @@ -20,13 +20,12 @@ description: > See [ISO release instructions]({{}}) -## Tag KIC base image +## Release new kicbase image -for container drivers (docker,podman), if there has been any change in Dockerfile -(and there is a -snapshot image), should tag with latest release and push to gcr and docker hub and github packages. +If there are changes to the Dockerfile for the docker and/or podman drivers +(and there is a -snapshot image), you should retag it as a new version and push it to GCR, dockerhub and github packages. -for example if you are releasing v0.0.13 and latest kicbase image is v0.0.12-snapshot -should tag v0.0.13 and change the [kic/types.go](https://github.com/medyagh/minikube/blob/635ff53a63e5bb1be4e1abb9067ebe502a16224e/pkg/drivers/kic/types.go#L29-L30) file as well. +For example, if you are releasing v0.0.13 and the current kicbase image tag is v0.0.12-snapshot, you should tag v0.0.13 and change [kic/types.go](https://github.com/medyagh/minikube/blob/635ff53a63e5bb1be4e1abb9067ebe502a16224e/pkg/drivers/kic/types.go#L29-L30) as well. ## Update Release Notes From 474c9c2ced24da04fc1d538a7f049f387a12eac8 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 17 Sep 2020 13:57:06 -0700 Subject: [PATCH 5/7] Fix cache functional test --- test/integration/functional_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index baedabd59e..3a042a13fd 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -497,7 +497,7 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) { t.Run("cache", func(t *testing.T) { t.Run("add_remote", func(t *testing.T) { - for _, img := range []string{"k8s.gcr.io/pause:3.0", "k8s.gcr.io/pause:3.3", "k8s.gcr.io/pause:latest"} { + for _, img := range []string{"k8s.gcr.io/pause:3.1", "k8s.gcr.io/pause:3.3", "k8s.gcr.io/pause:latest"} { rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "cache", "add", img)) if err != nil { t.Errorf("failed to 'cache add' remote image %q. args %q err %v", img, rr.Command(), err) From 4226decf841a064538c8ec6f9edf1390b52b2e15 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 17 Sep 2020 14:12:48 -0700 Subject: [PATCH 6/7] delete the correct image --- test/integration/functional_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index 3a042a13fd..52d188190a 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -587,7 +587,7 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) { // delete will clean up the cached images since they are global and all other tests will load it for no reason t.Run("delete", func(t *testing.T) { - for _, img := range []string{"k8s.gcr.io/pause:3.0", "k8s.gcr.io/pause:latest"} { + for _, img := range []string{"k8s.gcr.io/pause:3.1", "k8s.gcr.io/pause:latest"} { rr, err := Run(t, exec.CommandContext(ctx, Target(), "cache", "delete", img)) if err != nil { t.Errorf("failed to delete %s from cache. args %q: %v", img, rr.Command(), err) From 291bec503ee6e0593b8de9bdbd002843afce50c9 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 17 Sep 2020 14:58:33 -0700 Subject: [PATCH 7/7] partial revert --- cmd/minikube/cmd/start.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index dd4e995b02..fc3acd592d 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -289,17 +289,17 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing * } } - mRunner, preExists, mAPI, host, err := node.Provision(&cc, &n, true, viper.GetBool(deleteOnFailure)) - if err != nil { - return node.Starter{}, err - } - if viper.GetBool(nativeSSH) { ssh.SetDefaultClient(ssh.Native) } else { ssh.SetDefaultClient(ssh.External) } + mRunner, preExists, mAPI, host, err := node.Provision(&cc, &n, true, viper.GetBool(deleteOnFailure)) + if err != nil { + return node.Starter{}, err + } + return node.Starter{ Runner: mRunner, PreExists: preExists,