Skip to content

Move -$$arch suffix from image name to tag. Bump kubelet-to-gcm version to 1.4.4 #1025

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
baizhenyu merged 4 commits into from
Dec 12, 2025
Merged

Move -$$arch suffix from image name to tag. Bump kubelet-to-gcm version to 1.4.4 #1025

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1bb3649
Move -$$arch suffix from image name to tag.
jakweg Dec 12, 2025
6fd5fed
Update kubelet-to-gcm version from 1.4.3 to 1.4.4
jakweg Dec 12, 2025
bc64e2a
Fix "Recursive variable 'TAG' references itself (eventually)."
jakweg Dec 12, 2025
be2b1e6
Remove echo command from Makefile
jakweg Dec 12, 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
9 changes: 5 additions & 4 deletions kubelet-to-gcm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ OUT_DIR = build
PACKAGE = github.com/GoogleCloudPlatform/k8s-stackdriver/kubelet-to-gcm
IMAGE_NAME = kubelet-to-gcm
PREFIX ?= staging-k8s.gcr.io
TAG ?= 1.4.3
VERSION_TAG ?= 1.4.4
ALL_ARCH=amd64 arm64

IMAGE=$(PREFIX)/$(IMAGE_NAME)

TAG=$(VERSION_TAG)
ifdef ARCH
IMAGE=$(PREFIX)/$(IMAGE_NAME)-$(ARCH)
TAG=$(VERSION_TAG)-$(ARCH)
BUILD_FLAGS=--platform=linux/$(ARCH)
endif

Expand Down Expand Up @@ -56,9 +57,9 @@ push: .push
$(MAKE) --no-print-directory ARCH=$* .push

push-multiarch: $(addprefix .sub-push-,$(ALL_ARCH))
docker manifest create --amend $(IMAGE):$(TAG) $(addsuffix :$(TAG),$(addprefix $(IMAGE)-,$(ALL_ARCH)))
docker manifest create --amend $(IMAGE):$(TAG) $(addprefix $(IMAGE):$(TAG)-, $(ALL_ARCH))
for arch in $(ALL_ARCH); do \
docker manifest annotate --os=linux --arch=$$arch $(IMAGE):$(TAG) $(IMAGE)-$$arch:$(TAG); \
docker manifest annotate --os=linux --arch=$$arch $(IMAGE):$(TAG) $(IMAGE):$(TAG)-$$arch; \
done
docker manifest push -p $(IMAGE):$(TAG)

Expand Down
Loading