fix(release): remove operator-init image references (tigera#4554)

Author: radTuti

Makefile

@@ -149,7 +149,6 @@ CONTAINERIZED= mkdir -p .go-pkg-cache $(GOMOD_CACHE) && \
 DOCKER_RUN := $(CONTAINERIZED) $(CALICO_BUILD)
 
 BUILD_IMAGE?=tigera/operator
-BUILD_INIT_IMAGE?=tigera/operator-init
 
 BUILD_DIR?=build/_output
 BINDIR?=$(BUILD_DIR)/bin
@@ -309,12 +308,6 @@ image-all: $(addprefix sub-image-,$(VALIDARCHES))
 sub-image-%:
 	$(MAKE) images ARCH=$*
 
-.PHONY: image-init
-image-init: image
-ifeq ($(ARCH),amd64)
-	docker tag $(BUILD_IMAGE):latest-$(ARCH) $(BUILD_INIT_IMAGE):latest
-endif
-
 BINDIR?=build/init/bin
 $(BINDIR)/kubectl:
 	mkdir -p $(BINDIR)

hack/release/build.go

@@ -229,9 +229,7 @@ var buildAction = cli.ActionFunc(func(ctx context.Context, c *cli.Command) error
 	image := c.String(imageFlag.Name)
 	if image != defaultImageName {
 		buildLog = buildLog.WithField("image", image)
-		buildEnv = append(buildEnv,
-			fmt.Sprintf("BUILD_IMAGE=%s", image),
-			fmt.Sprintf("BUILD_INIT_IMAGE=%s-init", image))
+		buildEnv = append(buildEnv, fmt.Sprintf("BUILD_IMAGE=%s", image))
 	}
 	registry := c.String(registryFlag.Name)
 	if registry != "" && registry != quayRegistry {

hack/release/from.go

@@ -169,7 +169,6 @@ func newHashreleaseOperator(dir, version, imageName, registry string, arches []s
 }
 
 func buildHashreleaseOperator(dir, version, imageName, registry string, arches []string) error {
-	initImageName := fmt.Sprintf("%s-init", imageName)
 	env := os.Environ()
 	env = append(env, fmt.Sprintf("ARCHES=%s", strings.Join(arches, " ")))
 	env = append(env, fmt.Sprintf("GIT_VERSION=%s", version))
@@ -190,27 +189,6 @@ func buildHashreleaseOperator(dir, version, imageName, registry string, arches [
 		}
 		logrus.WithField("tag", tag).Debug("Built image")
 	}
-
-	env = os.Environ()
-	env = append(env, fmt.Sprintf("ARCHES=%s", strings.Join(arches, " ")))
-	env = append(env, fmt.Sprintf("GIT_VERSION=%s", version))
-	env = append(env, fmt.Sprintf("BUILD_IMAGE=%s", imageName))
-	env = append(env, fmt.Sprintf("BUILD_INIT_IMAGE=%s", initImageName))
-	if out, err := makeInDir(dir, "image-init", env...); err != nil {
-		logrus.Error(out)
-		return fmt.Errorf("building init image: %w", err)
-	}
-
-	initTag := fmt.Sprintf("%s/%s:%s", registry, initImageName, version)
-	if out, err := runCommand("docker", []string{
-		"tag",
-		fmt.Sprintf("%s:latest", initImageName),
-		fmt.Sprintf("%s/%s:%s", registry, initImageName, version),
-	}, env); err != nil {
-		logrus.Error(out)
-		return fmt.Errorf("tagging init image: %w", err)
-	}
-	logrus.WithField("tag", initTag).Debug("Built init image")
 	return nil
 }
 
@@ -240,13 +218,6 @@ func publishHashreleaseOperator(version, imageName, registry string, archs []str
 		return fmt.Errorf("pushing manifest: %w", err)
 	}
 	logrus.WithField("image", image).Debug("Pushed manifest")
-
-	initImage := fmt.Sprintf("%s/%s-init:%s", registry, imageName, version)
-	if out, err := runCommand("docker", []string{"push", initImage}, nil); err != nil {
-		logrus.Error(out)
-		return fmt.Errorf("pushing init image: %w", err)
-	}
-	logrus.WithField("image", initImage).Debug("Pushed init image")
 	return nil
 }
 

hack/release/publish.go

@@ -136,7 +136,6 @@ var publishImages = func(c *cli.Command, repoRootDir string) error {
 	if image := c.String(imageFlag.Name); image != defaultImageName {
 		log = log.WithField("image", image)
 		publishEnv = append(publishEnv, fmt.Sprintf("BUILD_IMAGE=%s", image))
-		publishEnv = append(publishEnv, fmt.Sprintf("BUILD_INIT_IMAGE=%s-init", image))
 	}
 	if registry := c.String(registryFlag.Name); registry != "" && registry != quayRegistry {
 		log = log.WithField("registry", registry)