From d156e5cbed1675d44126b89bb176b3b399e3d2b7 Mon Sep 17 00:00:00 2001 From: Peixuan Ding Date: Wed, 12 May 2021 21:33:39 -0400 Subject: [PATCH 1/2] Fix TestKubernetesUpgrade Signed-off-by: Peixuan Ding --- cmd/minikube/cmd/start_flags.go | 4 ++++ test/integration/version_upgrade_test.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index 32e368f6ab..c795d75db7 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -571,6 +571,10 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC updateBoolFromFlag(cmd, &cc.KubernetesConfig.ShouldLoadCachedImages, cacheImages) updateIntFromFlag(cmd, &cc.KubernetesConfig.NodePort, apiServerPort) + if cmd.Flags().Changed(kubernetesVersion) { + cc.KubernetesConfig.KubernetesVersion = getKubernetesVersion(existing) + } + if cmd.Flags().Changed("extra-config") { cc.KubernetesConfig.ExtraOptions = config.ExtraOptions } diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go index fea73b2b64..d7351283d9 100644 --- a/test/integration/version_upgrade_test.go +++ b/test/integration/version_upgrade_test.go @@ -266,7 +266,7 @@ func TestKubernetesUpgrade(t *testing.T) { } if cv.ServerVersion.GitVersion != constants.NewestKubernetesVersion { - t.Fatalf("expected server version %s is not the same with latest version %s", cv.ServerVersion.GitVersion, constants.NewestKubernetesVersion) + t.Fatalf("server version %s is not the same with the expected version %s after upgrade", cv.ServerVersion.GitVersion, constants.NewestKubernetesVersion) } t.Logf("Attempting to downgrade Kubernetes (should fail)") From 7b98243ea31c214de4f7639249b7d65991aaf7f3 Mon Sep 17 00:00:00 2001 From: Peixuan Ding Date: Thu, 13 May 2021 02:02:34 -0400 Subject: [PATCH 2/2] Add missing apiserver-names config update --- cmd/minikube/cmd/start_flags.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index c795d75db7..ec112b8c06 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -562,6 +562,7 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC updateIntFromFlag(cmd, &cc.SSHPort, sshSSHPort) updateStringFromFlag(cmd, &cc.KubernetesConfig.Namespace, startNamespace) updateStringFromFlag(cmd, &cc.KubernetesConfig.APIServerName, apiServerName) + updateStringSliceFromFlag(cmd, &cc.KubernetesConfig.APIServerNames, "apiserver-names") updateStringFromFlag(cmd, &cc.KubernetesConfig.DNSDomain, dnsDomain) updateStringFromFlag(cmd, &cc.KubernetesConfig.FeatureGates, featureGates) updateStringFromFlag(cmd, &cc.KubernetesConfig.ContainerRuntime, containerRuntime)