cloud: push only amd64 for the operator-cloud image - #5128
Merged
Conversation
caseydavenport
approved these changes
Jul 30, 2026
caseydavenport
left a comment
Member
There was a problem hiding this comment.
over-commented, but otherwise LGTM
…ches The cloud variant only builds amd64, but push-all iterates ARCHES while tag-images-all/image-all iterate VALIDARCHES. Setting only VALIDARCHES:=amd64 left push-all trying to push arm64/ppc64le/s390x, which were never built: tag does not exist: gcr.io/tigera-tesla/operator-cloud:master-arm64 Constrain ARCHES itself; VALIDARCHES derives from it, so all image targets agree on amd64. Enterprise is unaffected (guarded by VARIANT=cloud). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Brian-McM
force-pushed
the
bm-cloud-push-amd64-only
branch
from
July 30, 2026 22:53
5103113 to
f81b017
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Bug fix for the Calico Cloud release/CD tooling.
The cloud variant (
VARIANT=cloud) builds and tags theoperator-cloudimage for amd64 only:image-all,tag-images-all, and manifest creation all iterate$(VALIDARCHES), which the cloudblock pinned to
amd64. Butpush-alliterates$(ARCHES), which was left at all four arches(
amd64 arm64 ppc64le s390x). So the post-merge CDpush-alltried to push arches that were neverbuilt, and failed:
Fix: constrain
ARCHES:=amd64in the cloud block instead of onlyVALIDARCHES.VALIDARCHESderives from
ARCHES, so every image target — build, tag, push, manifest — now agrees on amd64.The change is inside the
ifeq ($(VARIANT),cloud)block, so enterprise/OSS builds are unaffected.Testing — verified target expansion with
make -pn:push-allsub-push-amd64 sub-push-arm64 sub-push-ppc64le sub-push-s390xsub-push-amd64tag-images-allsub-tag-images-amd64Enterprise expansion is unchanged; cloud
push-allnow matches what actually gets built.Components affected: build/release tooling (
Makefile) for the Calico Cloud operator image only.Follow-up to #4980 (the cloud un-fork), which introduced the cloud variant.
Release Note
For PR author
make gen-filesmake gen-versionsFor PR reviewers
A note for code reviewers - all pull requests must have the following:
kind/bugif this is a bugfix.kind/enhancementif this is a a new feature.enterpriseif this PR applies to Calico Enterprise only.