Merge pull request kubernetes#23586 from locker95/fix/registry-addon-major-tag

hack/update: track registry addon on the major tag

Author: nirs

hack/update/registry_version/registry_version.go

@@ -17,7 +17,10 @@ limitations under the License.
 package main
 
 import (
+	"context"
 	"fmt"
+	"strings"
+	"time"
 
 	"k8s.io/minikube/hack/update"
 
@@ -39,14 +42,14 @@ type Data struct {
 }
 
 func main() {
-	tags, err := update.ImageTagsFromDockerHub("library/registry")
-	if err != nil {
-		klog.Fatal(err)
-	}
-	tag, err := latestStableSemverTag(tags)
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+	defer cancel()
+
+	stable, _, _, err := update.GHReleases(ctx, "distribution", "distribution")
 	if err != nil {
-		klog.Fatal(err)
+		klog.Fatalf("Unable to get stable version: %v", err)
 	}
+	tag := strings.TrimPrefix(semver.Major(stable.Tag), "v")
 	sha, err := update.GetImageSHA(fmt.Sprintf("docker.io/registry:%s", tag))
 	if err != nil {
 		klog.Fatalf("failed to get image SHA: %v", err)
@@ -58,13 +61,3 @@ func main() {
 		klog.Fatalf("unable to apply update: %v", err)
 	}
 }
-
-func latestStableSemverTag(tags []string) (string, error) {
-	for _, tag := range tags {
-		vTag := fmt.Sprintf("v%s", tag)
-		if semver.IsValid(vTag) && semver.Prerelease(vTag) == "" {
-			return tag, nil
-		}
-	}
-	return "", fmt.Errorf("no stable semver tag found")
-}

pkg/minikube/assets/addons.go

@@ -381,7 +381,7 @@ var Addons = map[string]*Addon{
 			"0640"),
 	}, false, "registry", "minikube", "", "", map[string]string{
 		"KubeRegistryProxy": "minikube/kube-registry-proxy:v0.0.11@sha256:e321acf067df0a78fba3ff97748c10029ca2c413c5b7207e4ca000c62fcdac93",
-		"Registry":          "registry:3.1.1@sha256:85347ed2ecde64161c7a4788a4d7d3dcc9d6f86f7be95834022e3c6a423a945a",
+		"Registry":          "registry:3@sha256:1be55279f18a2fe1a74edf2664cac61c1bea305b7b4642dab412e7affdcb3e33",
 	}, map[string]string{
 		"KubeRegistryProxy": "registry.k8s.io",
 		"Registry":          "docker.io",