Skip to content

Fix help messages for Makefile targets #9813

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

Open
mboersma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix help messages for Makefile targets #9813

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 27 additions & 27 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ image: build-all-ccm-images build-all-node-images ## Build all images.
.PHONY: push
push: push-multi-arch-controller-manager-image push-multi-arch-node-manager-image ## Push all images.

.PHONY: push-multi-arch-controller-manager-image ## Push multi-arch controller-manager image
push-multi-arch-controller-manager-image: push-all-ccm-images ## Create and push a manifest list containing all the Linux ccm images.
.PHONY: push-multi-arch-controller-manager-image
push-multi-arch-controller-manager-image: push-all-ccm-images ## Push multi-arch controller-manager image
## Linux amd64 ccm image name has no amd64
docker tag $(CONTROLLER_MANAGER_FULL_IMAGE_NAME):$(IMAGE_TAG) $(CONTROLLER_MANAGER_FULL_IMAGE_NAME)-amd64:$(IMAGE_TAG)
docker push $(CONTROLLER_MANAGER_FULL_IMAGE_NAME)-amd64:$(IMAGE_TAG)
Expand All @@ -261,8 +261,8 @@ push-multi-arch-controller-manager-image: push-all-ccm-images ## Create and push
done
docker manifest push --purge $(CONTROLLER_MANAGER_IMAGE)

.PHONY: push-multi-arch-node-manager-image ## Push multi-arch node-manager image
push-multi-arch-node-manager-image: push-all-node-images ## Create and push a manifest list containing all the Windows and Linux images.
.PHONY: push-multi-arch-node-manager-image
push-multi-arch-node-manager-image: push-all-node-images ## Push multi-arch node-manager image
docker manifest create --amend $(NODE_MANAGER_IMAGE) $(ALL_NODE_MANAGER_IMAGES)
for arch in $(ALL_ARCH.linux); do \
docker manifest annotate --os linux --arch $${arch} $(NODE_MANAGER_IMAGE) $(NODE_MANAGER_LINUX_FULL_IMAGE_PREFIX)-$${arch}; \
Expand All @@ -278,17 +278,17 @@ push-multi-arch-node-manager-image: push-all-node-images ## Create and push a ma
done
docker manifest push --purge $(NODE_MANAGER_IMAGE)

.PHONY: push-all-node-images ## Push node-manager image for os and archs.
push-all-node-images: push-all-node-images-linux push-all-node-images-windows
.PHONY: push-all-node-images
push-all-node-images: push-all-node-images-linux push-all-node-images-windows ## Push node-manager image for os and archs.

.PHONY: push-all-node-images-linux ## Push node-manager image for Linux.
push-all-node-images-linux: $(addprefix push-node-image-linux-,$(ALL_ARCH.linux))
.PHONY: push-all-node-images-linux
push-all-node-images-linux: $(addprefix push-node-image-linux-,$(ALL_ARCH.linux)) ## Push node-manager image for Linux.

.PHONY: push-all-node-images-windows ## Push node-manager image for Windows.
push-all-node-images-windows: $(addprefix push-node-image-windows-,$(ALL_OS_ARCH.windows))
.PHONY: push-all-node-images-windows
push-all-node-images-windows: $(addprefix push-node-image-windows-,$(ALL_OS_ARCH.windows)) ## Push node-manager image for Windows.

.PHONY: push-all-node-images-windows-hpc ## Push node-manager image for Windows.
push-all-node-images-windows-hpc: $(addprefix push-node-images-windows-hpc-,$(ALL_OS_ARCH.windows))
.PHONY: push-all-node-images-windows-hpc
push-all-node-images-windows-hpc: $(addprefix push-node-images-windows-hpc-,$(ALL_OS_ARCH.windows)) ## Push node-manager image for Windows.

# split words on hyphen, access by 1-index
word-hyphen = $(word $2,$(subst -, ,$1))
Expand All @@ -302,14 +302,14 @@ push-node-image-windows-%:
push-node-image-windows-hpc-%:
$(MAKE) ARCH=$(call word-hyphen,$*,1) OUTPUT_TYPE=registry build-node-image-windows-hpc

.PHONY: build-all-node-images ## Build node-manager image for all OS and archs.
build-all-node-images: build-all-node-images-linux build-all-node-images-windows
.PHONY: build-all-node-images
build-all-node-images: build-all-node-images-linux build-all-node-images-windows ## Build node-manager image for all OS and archs.

.PHONY: build-all-node-images-linux ## Build node-manager image for Linux.
build-all-node-images-linux: $(addprefix build-node-image-linux-,$(ALL_ARCH.linux))
.PHONY: build-all-node-images-linux
build-all-node-images-linux: $(addprefix build-node-image-linux-,$(ALL_ARCH.linux)) ## Build node-manager image for Linux.

.PHONY: build-all-node-images-windows ## Build node-manager image for Windows.
build-all-node-images-windows: $(addprefix build-node-image-windows-,$(ALL_OS_ARCH.windows))
.PHONY: build-all-node-images-windows
build-all-node-images-windows: $(addprefix build-node-image-windows-,$(ALL_OS_ARCH.windows)) ## Build node-manager image for Windows.

build-node-image-linux-%:
$(MAKE) ARCH=$* build-node-image-linux
Expand All @@ -318,13 +318,13 @@ build-node-image-windows-%:
$(MAKE) WINDOWS_OSVERSION=$(call word-hyphen,$*,1) ARCH=$(call word-hyphen,$*,2) build-node-image-windows

.PHONY: build-all-ccm-images
build-all-ccm-images: $(addprefix build-ccm-image-,$(ALL_ARCH.linux))
build-all-ccm-images: $(addprefix build-ccm-image-,$(ALL_ARCH.linux)) ## Build all CCM images.

build-ccm-image-%:
$(MAKE) ARCH=$* build-ccm-image

.PHONY: push-all-ccm-images
push-all-ccm-images: $(addprefix push-ccm-image-,$(ALL_ARCH.linux))
push-all-ccm-images: $(addprefix push-ccm-image-,$(ALL_ARCH.linux)) ## Push all CCM images.

push-ccm-image-%:
$(MAKE) ARCH=$* push-ccm-image
Expand All @@ -336,16 +336,16 @@ manifest-node-manager-image-windows-hpc-%:
$(MAKE) ARCH=$(call word-hyphen,$*,1) manifest-node-manager-image-windows-hpc

.PHONY: manifest-node-manager-image-windows
manifest-node-manager-image-windows:
manifest-node-manager-image-windows: ## Create and push Windows node-manager manifest.
set -x
docker manifest create --amend $(NODE_MANAGER_IMAGE) $(NODE_MANAGER_LINUX_FULL_IMAGE_PREFIX)-$(ARCH) $(NODE_MANAGER_WINDOWS_FULL_IMAGE_PREFIX)-$(WINDOWS_OSVERSION)-$(ARCH)
docker manifest annotate --os linux --arch $(ARCH) $(NODE_MANAGER_IMAGE) $(NODE_MANAGER_LINUX_FULL_IMAGE_PREFIX)-$(ARCH)
full_version=`docker manifest inspect ${BASE.windows}:$(WINDOWS_OSVERSION) | jq -r '.manifests[0].platform["os.version"]'`; \
docker manifest annotate --os windows --arch $(ARCH) --os-version $${full_version} $(NODE_MANAGER_IMAGE) $(NODE_MANAGER_WINDOWS_FULL_IMAGE_PREFIX)-$(WINDOWS_OSVERSION)-$(ARCH)
docker manifest push --purge $(NODE_MANAGER_IMAGE)

.PHONY: manifest-node-manager-images-windows-hpc
manifest-node-manager-image-windows-hpc:
.PHONY: manifest-node-manager-image-windows-hpc
manifest-node-manager-image-windows-hpc: ## Create and push Windows HPC node-manager manifest.
Copy link
Contributor

@nilo19 nilo19 Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks it does not match L347. could you please help update it in this pr?

Copy link
Contributor Author

@mboersma mboersma Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed line 347 to image instead of images so they match.

set -x
docker manifest create --amend $(NODE_MANAGER_IMAGE) $(NODE_MANAGER_LINUX_FULL_IMAGE_PREFIX)-$(ARCH) $(NODE_MANAGER_WINDOWS_FULL_IMAGE_PREFIX)-hpc-$(ARCH)
docker manifest annotate --os linux --arch $(ARCH) $(NODE_MANAGER_IMAGE) $(NODE_MANAGER_LINUX_FULL_IMAGE_PREFIX)-$(ARCH)
Expand Down Expand Up @@ -412,7 +412,7 @@ test-e2e: ## Run k8s e2e tests.
test-e2e-capz: ## Run k8s e2e tests with capz
hack/test_k8s_e2e_capz.sh $(TEST_E2E_ARGS)

ensure-azcli:
ensure-azcli: ## Ensure az CLI is installed.
hack/ensure-azcli.sh

test-ccm-e2e: ensure-azcli ## Run cloud provider e2e tests.
Expand All @@ -438,7 +438,7 @@ deploy: image push ## Build, push and deploy an aks-engine cluster.
CCM_IMAGE=$(CONTROLLER_MANAGER_IMAGE) CNM_IMAGE=$(NODE_MANAGER_IMAGE) HYPERKUBE_IMAGE=$(HYPERKUBE_IMAGE) hack/deploy-cluster.sh

.PHONY: cloud-build-prerequisites
cloud-build-prerequisites:
cloud-build-prerequisites: ## Install prerequisites for cloud build.
apk add --no-cache jq

.PHONY: release-staging
Expand All @@ -454,11 +454,11 @@ endif
## --------------------------------------

.PHONY: deploy-workload-cluster
deploy-workload-cluster:
deploy-workload-cluster: ## Deploy a workload cluster with CAPZ.
hack/deploy-workload-cluster.sh

.PHONY: delete-workload-cluster
delete-workload-cluster:
delete-workload-cluster: ## Delete a CAPZ workload cluster.
hack/delete-workload-cluster.sh

##@ Tools
Expand Down