refactor(release): make default registry and image overridable (#4572)

Author: radTuti

hack/release/build.go

@@ -227,12 +227,12 @@ var buildAction = cli.ActionFunc(func(ctx context.Context, c *cli.Command) error
 		buildEnv = append(buildEnv, fmt.Sprintf("ARCHES=%s", strings.Join(arches, " ")))
 	}
 	image := c.String(imageFlag.Name)
-	if image != defaultImageName {
+	if image != defaultImage {
 		buildLog = buildLog.WithField("image", image)
 		buildEnv = append(buildEnv, fmt.Sprintf("BUILD_IMAGE=%s", image))
 	}
 	registry := c.String(registryFlag.Name)
-	if registry != "" && registry != quayRegistry {
+	if registry != "" && registry != defaultRegistry {
 		buildLog = buildLog.WithField("registry", registry)
 		buildEnv = append(buildEnv,
 			fmt.Sprintf("IMAGE_REGISTRY=%s", registry),
@@ -334,14 +334,14 @@ func assertOperatorImageVersion(registry, image, expectedVersion string) error {
 // It registers a cleanup function to reset git state after the build completes.
 var setupHashreleaseBuild = func(ctx context.Context, c *cli.Command, repoRootDir string) error {
 	image := c.String(imageFlag.Name)
-	if image != defaultImageName {
+	if image != defaultImage {
 		imageParts := strings.SplitN(c.String(imageFlag.Name), "/", 2)
 		if err := modifyComponentImageConfig(repoRootDir, componentImageConfigRelPath, operatorImagePathConfigKey, addTrailingSlash(imageParts[0])); err != nil {
 			return fmt.Errorf("updating Operator image path: %w", err)
 		}
 	}
 	registry := c.String(registryFlag.Name)
-	if registry != "" && registry != quayRegistry {
+	if registry != "" && registry != defaultRegistry {
 		if err := modifyComponentImageConfig(repoRootDir, componentImageConfigRelPath, operatorRegistryConfigKey, addTrailingSlash(registry)); err != nil {
 			return fmt.Errorf("updating Operator registry: %w", err)
 		}

hack/release/flags.go

@@ -157,7 +157,7 @@ var (
 		Category: operatorFlagCategory,
 		Usage:    "The image name to use for the new operator (ONLY for hashreleases operator).",
 		Sources:  cli.EnvVars("IMAGE_NAME"),
-		Value:    defaultImageName,
+		Value:    defaultImage,
 	}
 	archOptions = []string{"amd64", "arm64", "ppc64le", "s390x"}
 	archFlag    = &cli.StringSliceFlag{
@@ -181,7 +181,7 @@ var (
 		Category: operatorFlagCategory,
 		Usage:    "The registry to push the new operator to (ONLY for hashreleases operator).",
 		Sources:  cli.EnvVars("REGISTRY"),
-		Value:    quayRegistry,
+		Value:    defaultRegistry,
 	}
 )
 

hack/release/from.go

@@ -75,7 +75,7 @@ var releaseFromBefore = cli.BeforeFunc(func(ctx context.Context, c *cli.Command)
 		return ctx, fmt.Errorf("compiling hashrelease regex: %s", err)
 	}
 	if !hashreleaseRegex.MatchString(version) {
-		if c.Bool(publishFlag.Name) && c.String(registryFlag.Name) == quayRegistry && c.String(imageFlag.Name) == defaultImageName {
+		if c.Bool(publishFlag.Name) && c.String(registryFlag.Name) == defaultRegistry && c.String(imageFlag.Name) == defaultImage {
 			return ctx, fmt.Errorf("cannot use the default registry and image for publishing operator version %q. "+
 				"Either update registry and/or image flag OR specify version in the format ", version)
 		}

hack/release/publish.go

@@ -133,11 +133,11 @@ var publishImages = func(c *cli.Command, repoRootDir string) error {
 		log = log.WithField("arches", arches)
 		publishEnv = append(publishEnv, fmt.Sprintf("ARCHES=%s", strings.Join(arches, " ")))
 	}
-	if image := c.String(imageFlag.Name); image != defaultImageName {
+	if image := c.String(imageFlag.Name); image != defaultImage {
 		log = log.WithField("image", image)
 		publishEnv = append(publishEnv, fmt.Sprintf("BUILD_IMAGE=%s", image))
 	}
-	if registry := c.String(registryFlag.Name); registry != "" && registry != quayRegistry {
+	if registry := c.String(registryFlag.Name); registry != "" && registry != defaultRegistry {
 		log = log.WithField("registry", registry)
 		publishEnv = append(publishEnv,
 			fmt.Sprintf("IMAGE_REGISTRY=%s", registry),
@@ -164,7 +164,7 @@ var publishImages = func(c *cli.Command, repoRootDir string) error {
 func operatorImagePublished(c *cli.Command) (bool, error) {
 	registry := c.String(registryFlag.Name)
 	if registry == "" {
-		registry = quayRegistry
+		registry = defaultRegistry
 	}
 	fqImage := fmt.Sprintf("%s:%s", path.Join(registry, c.String(imageFlag.Name)), c.String(versionFlag.Name))
 	ref, err := name.ParseReference(fqImage)

hack/release/utils.go

@@ -34,12 +34,17 @@ import (
 //go:embed templates/release-notes.md.gotmpl
 var releaseNoteTemplate string
 
+var (
+	defaultRegistry = quayRegistry
+	defaultImage    = operatorImage
+)
+
 const (
 	dockerHub    = "docker.io"
 	quayRegistry = "quay.io"
 
-	mainRepo         = "tigera/operator"
-	defaultImageName = "tigera/operator"
+	mainRepo      = "tigera/operator"
+	operatorImage = "tigera/operator"
 
 	tmplGithubFileURL = `https://github.com/{gitRepo}/raw/{gitHashOrTag}/{filePath}`