From 77f207e01b4c4b129336c3e10181d33a16c6bf08 Mon Sep 17 00:00:00 2001
From: Steven Powell <spowellgrr@gmail.com>
Date: Wed, 29 Mar 2023 09:58:47 -0700
Subject: [PATCH] small clean and fix tests with old k8s versions

---
 pkg/minikube/bootstrapper/images/repo.go      | 13 +++----------
 pkg/minikube/bootstrapper/images/repo_test.go |  6 +++---
 pkg/minikube/node/start.go                    |  2 +-
 test/integration/start_stop_delete_test.go    | 10 ++++++++--
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkg/minikube/bootstrapper/images/repo.go b/pkg/minikube/bootstrapper/images/repo.go
index 3472e82ee2..9d739f6ce4 100644
--- a/pkg/minikube/bootstrapper/images/repo.go
+++ b/pkg/minikube/bootstrapper/images/repo.go
@@ -16,20 +16,13 @@ limitations under the License.
 
 package images
 
-// OldDefaultKubernetesRepo is the old default Kubernetes repository
-const OldDefaultKubernetesRepo = "k8s.gcr.io"
-
-// NewDefaultKubernetesRepo is the new default Kubernetes repository
-const NewDefaultKubernetesRepo = "registry.k8s.io"
+// DefaultKubernetesRepo is the default Kubernetes repository
+const DefaultKubernetesRepo = "registry.k8s.io"
 
 // kubernetesRepo returns the official Kubernetes repository, or an alternate
 func kubernetesRepo(mirror string) string {
 	if mirror != "" {
 		return mirror
 	}
-	return DefaultKubernetesRepo()
-}
-
-func DefaultKubernetesRepo() string {
-	return NewDefaultKubernetesRepo
+	return DefaultKubernetesRepo
 }
diff --git a/pkg/minikube/bootstrapper/images/repo_test.go b/pkg/minikube/bootstrapper/images/repo_test.go
index 6979c6ef0c..6744b16070 100644
--- a/pkg/minikube/bootstrapper/images/repo_test.go
+++ b/pkg/minikube/bootstrapper/images/repo_test.go
@@ -29,7 +29,7 @@ func Test_kubernetesRepo(t *testing.T) {
 	}{
 		{
 			"",
-			DefaultKubernetesRepo(),
+			DefaultKubernetesRepo,
 		},
 		{
 			"mirror.k8s.io",
@@ -37,11 +37,11 @@ func Test_kubernetesRepo(t *testing.T) {
 		},
 		{
 			"",
-			NewDefaultKubernetesRepo,
+			DefaultKubernetesRepo,
 		},
 		{
 			"",
-			NewDefaultKubernetesRepo,
+			DefaultKubernetesRepo,
 		},
 	}
 	for _, tc := range tests {
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
index fa8b240bc0..b1ddf65bbb 100644
--- a/pkg/minikube/node/start.go
+++ b/pkg/minikube/node/start.go
@@ -822,7 +822,7 @@ func tryRegistry(r command.Runner, driverName, imageRepository, ip string) {
 	}
 
 	if imageRepository == "" {
-		imageRepository = images.DefaultKubernetesRepo()
+		imageRepository = images.DefaultKubernetesRepo
 	}
 
 	opts = append(opts, fmt.Sprintf("https://%s/", imageRepository))
diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go
index edfe9be877..9f4b4d606e 100644
--- a/test/integration/start_stop_delete_test.go
+++ b/test/integration/start_stop_delete_test.go
@@ -354,7 +354,7 @@ func testPulledImages(ctx context.Context, t *testing.T, profile, version string
 
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), "ssh", "-p", profile, "sudo crictl images -o json"))
 	if err != nil {
-		t.Errorf("failed tp get images inside minikube. args %q: %v", rr.Command(), err)
+		t.Errorf("failed to get images inside minikube. args %q: %v", rr.Command(), err)
 	}
 	jv := map[string][]struct {
 		Tags []string `json:"repoTags"`
@@ -377,7 +377,13 @@ func testPulledImages(ctx context.Context, t *testing.T, profile, version string
 			}
 		}
 	}
-	wantRaw, err := images.Kubeadm("", version)
+
+	mirror := ""
+	// Kubernetes versions prior to v1.25 will contain the old registry due to the preload
+	if v, _ := util.ParseKubernetesVersion(kubernetesVersion); v.LT(semver.MustParse("1.25.0-alpha.1")) {
+		mirror = "k8s.gcr.io"
+	}
+	wantRaw, err := images.Kubeadm(mirror, version)
 	if err != nil {
 		t.Errorf("failed to get kubeadm images for %s : %v", version, err)
 	}