Fix handling of VALIDARCHES for release

hack/release/pkg/builder/builder.go

@@ -36,10 +36,6 @@ var (
 		"us.gcr.io/projectcalico-org",
 	}
 
-	// Architectures to build as part of a release.
-	// Left blank defaults to auto-detect each image's supported architectures.
-	architectures = []string{}
-
 	// Git configuration for publishing to GitHub.
 	organization = "projectcalico"
 	repo         = "calico"
@@ -311,7 +307,6 @@ func (r *ReleaseBuilder) buildContainerImages(ver string) error {
 	env := append(os.Environ(),
 		fmt.Sprintf("VERSION=%s", ver),
 		fmt.Sprintf("DEV_REGISTRIES=%s", strings.Join(registries, " ")),
-		fmt.Sprintf("VALIDARCHES=%s", strings.Join(architectures, " ")),
 	)
 
 	for _, dir := range releaseDirs {
@@ -381,7 +376,6 @@ func (r *ReleaseBuilder) publishContainerImages(ver string) error {
 		"RELEASE=true",
 		"CONFIRM=true",
 		fmt.Sprintf("DEV_REGISTRIES=%s", strings.Join(registries, " ")),
-		fmt.Sprintf("VALIDARCHES=%s", strings.Join(architectures, " ")),
 	)
 
 	for _, dir := range releaseDirs {

lib.Makefile

@@ -27,7 +27,7 @@ endif
 # list of arches *not* to build when doing *-all
 #    until s390x works correctly
 EXCLUDEARCH ?= s390x
-VALIDARCHES ?= $(filter-out $(EXCLUDEARCH),$(ARCHES))
+VALIDARCHES = $(filter-out $(EXCLUDEARCH),$(ARCHES))
 
 # BUILDARCH is the host architecture
 # ARCH is the target architecture