Merge pull request #8095 from sharifelgamal/create-node

recreate existing control plane node correctly
kubernetes · May 18, 2020 · 2754bb6 · 2754bb6
2 parents 02cee02 + 4cbeb18
commit 2754bb6
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 11 deletions.
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
@@ -877,8 +877,27 @@ func validateRegistryMirror() {
 	}
 }
 
-func createNode(cc config.ClusterConfig, kubeNodeName string) (config.ClusterConfig, config.Node, error) {
+func createNode(cc config.ClusterConfig, kubeNodeName string, existing *config.ClusterConfig) (config.ClusterConfig, config.Node, error) {
 	// Create the initial node, which will necessarily be a control plane
+	if existing != nil {
+		cp, err := config.PrimaryControlPlane(existing)
+		cp.KubernetesVersion = getKubernetesVersion(&cc)
+		if err != nil {
+			return cc, config.Node{}, err
+		}
+
+		// Make sure that existing nodes honor if KubernetesVersion gets specified on restart
+		// KubernetesVersion is the only attribute that the user can override in the Node object
+		nodes := []config.Node{}
+		for _, n := range existing.Nodes {
+			n.KubernetesVersion = getKubernetesVersion(&cc)
+			nodes = append(nodes, n)
+		}
+		cc.Nodes = nodes
+
+		return cc, cp, nil
+	}
+
 	cp := config.Node{
 		Port:              cc.KubernetesConfig.NodePort,
 		KubernetesVersion: getKubernetesVersion(&cc),

diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
@@ -348,7 +348,7 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
 	if driver.BareMetal(cc.Driver) {
 		kubeNodeName = "m01"
 	}
-	return createNode(cc, kubeNodeName)
+	return createNode(cc, kubeNodeName, existing)
 }
 
 // updateExistingConfigFromFlags will update the existing config from the flags - used on a second start

diff --git a/pkg/minikube/download/preload.go b/pkg/minikube/download/preload.go
@@ -76,12 +76,7 @@ func remoteTarballURL(k8sVersion, containerRuntime string) string {
 }
 
 // PreloadExists returns true if there is a preloaded tarball that can be used
-func PreloadExists(k8sVersion, containerRuntime string) bool {
-	// TODO: debug why this func is being called two times
-	glog.Infof("Checking if preload exists for k8s version %s and runtime %s", k8sVersion, containerRuntime)
-	if !viper.GetBool("preload") {
-		return false
-	}
+func PreloadExists(k8sVersion, containerRuntime string, forcePreload ...bool) bool {
 
 	// and https://github.com/kubernetes/minikube/issues/6934
 	// to track status of adding crio
@@ -90,6 +85,18 @@ func PreloadExists(k8sVersion, containerRuntime string) bool {
 		return false
 	}
 
+	// TODO (#8166): Get rid of the need for this and viper at all
+	force := false
+	if len(forcePreload) > 0 {
+		force = forcePreload[0]
+	}
+
+	// TODO: debug why this func is being called two times
+	glog.Infof("Checking if preload exists for k8s version %s and runtime %s", k8sVersion, containerRuntime)
+	if !viper.GetBool("preload") && !force {
+		return false
+	}
+
 	// Omit remote check if tarball exists locally
 	targetPath := TarballPath(k8sVersion, containerRuntime)
 	if _, err := os.Stat(targetPath); err == nil {

diff --git a/test/integration/aaa_download_only_test.go b/test/integration/aaa_download_only_test.go
@@ -57,7 +57,6 @@ func TestDownloadOnly(t *testing.T) {
 				t.Run(v, func(t *testing.T) {
 					defer PostMortemLogs(t, profile)
 
-					// Explicitly does not pass StartArgs() to test driver default
 					// --force to avoid uid check
 					args := append([]string{"start", "--download-only", "-p", profile, "--force", "--alsologtostderr", fmt.Sprintf("--kubernetes-version=%s", v), fmt.Sprintf("--container-runtime=%s", r)}, StartArgs()...)
 
@@ -74,7 +73,7 @@ func TestDownloadOnly(t *testing.T) {
 
 					// skip for none, as none driver does not have preload feature.
 					if !NoneDriver() {
-						if download.PreloadExists(v, r) {
+						if download.PreloadExists(v, r, true) {
 							// Just make sure the tarball path exists
 							if _, err := os.Stat(download.TarballPath(v, r)); err != nil {
 								t.Errorf("failed to verify preloaded tarball file exists: %v", err)

diff --git a/test/integration/helpers.go b/test/integration/helpers.go
@@ -203,7 +203,7 @@ func PostMortemLogs(t *testing.T, profile string) {
 	t.Logf("-----------------------post-mortem--------------------------------")
 
 	if DockerDriver() {
-		t.Logf("======>  post-mortem[%s]: docker inpect <======", t.Name())
+		t.Logf("======>  post-mortem[%s]: docker inspect <======", t.Name())
 		rr, err := Run(t, exec.Command("docker", "inspect", profile))
 		if err != nil {
 			t.Logf("failed to get docker inspect: %v", err)