Skip to content

cherry-picked makefile commits from 4.8 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vishu2498 merged 2 commits into from
May 19, 2026
Merged

cherry-picked makefile commits from 4.8 #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a594e01
fixed docker mk file not present during build
kpiyush17 Nov 11, 2025
442553b
fixed multi arch
kpiyush17 Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ DOCKER_BUILD_INPUTS=$(MANAGER_BIN_INPUTS) Dockerfile
docker-build: generate-deepcopy generate-conversion ## Build docker image containing the controller manager.
docker buildx build --load --platform linux/${ARCH} ${BUILD_ARGS} --build-arg ARCH=$(ARCH) . -t $(CONTROLLER_IMG)-$(ARCH):$(TAG)
@echo $(CONTROLLER_IMG)-$(ARCH):$(TAG)
@touch .dockerflag.mk

.PHONY: docker-build-all ## Build all the architecture docker images
docker-build-all: $(addprefix docker-build-,$(ALL_ARCH))
Expand All @@ -255,12 +256,10 @@ docker-push-core-manifest: ## Push the fat manifest docker image.

.PHONY: docker-push-manifest
docker-push-manifest: ## Push the manifest image
@# Extract the actual image digests from the architecture-specific manifest lists
@amd64_digest=$$(docker buildx imagetools inspect ${CONTROLLER_IMAGE}-amd64:${TAG} --format "{{json .}}" | jq -r '.manifest.manifests[] | select(.platform.architecture=="amd64") | .digest'); \
arm64_digest=$$(docker buildx imagetools inspect ${CONTROLLER_IMAGE}-arm64:${TAG} --format "{{json .}}" | jq -r '.manifest.manifests[] | select(.platform.architecture=="arm64") | .digest'); \
@# Create multi-platform manifest from architecture-specific images
docker buildx imagetools create -t ${CONTROLLER_IMAGE}:${TAG} \
${CONTROLLER_IMAGE}-amd64@$$amd64_digest \
${CONTROLLER_IMAGE}-arm64@$$arm64_digest
${CONTROLLER_IMAGE}-amd64:${TAG} \
${CONTROLLER_IMAGE}-arm64:${TAG}

##@ Tilt
## --------------------------------------
Expand Down Expand Up @@ -398,4 +397,4 @@ release-templates: ## Generate release templates

.PHONY: upload-staging-artifacts
upload-staging-artifacts: ## Upload release artifacts to the staging bucket
gsutil cp $(RELEASE_DIR)/* gs://$(STAGING_BUCKET)/components/$(RELEASE_ALIAS_TAG)/
gsutil cp $(RELEASE_DIR)/* gs://$(STAGING_BUCKET)/components/$(RELEASE_ALIAS_TAG)/
Loading