Merge pull request #31 from hakman/etc-manager-ctl

Add etcd-manager-ctl to etcd-manager-slim image

Author: k8s-ci-robot

.ko.yaml

@@ -0,0 +1,8 @@
+defaultBaseImage: debian:12-slim
+# https://pkg.go.dev/cmd/link
+# -s: omit symbol/debug info
+# -w: omit DWARF symbol table
+# -X importpath.name=value: sets name to value
+builds:
+- ldflags:
+  - -s -w

Makefile

@@ -23,6 +23,7 @@ KO=go run github.com/google/ko@v0.18.0
 all: test
 
 .PHONY: test
+test:
 	go test -v -short ./...
 
 # Must match AllEtcdVersions in pkg/etcdversions/mappings.go
@@ -90,39 +91,55 @@ staticcheck-all:
 staticcheck-working:
 	go list ./... | grep -v "etcd-manager/pkg/[cepv]" | xargs go run honnef.co/go/tools/cmd/staticcheck@v0.2.1
 
+.PHONY: images-amd64
+images-amd64: export-etcd-manager-ctl-amd64 export-etcd-manager-slim-amd64 export-etcd-backup-amd64 export-etcd-dump-amd64
+
+.PHONY: images-arm64
+images-arm64: export-etcd-manager-ctl-arm64 export-etcd-manager-slim-arm64 export-etcd-backup-arm64 export-etcd-dump-arm64
+
 .PHONY: images
-images: export-etcd-manager-slim-amd64 export-etcd-manager-slim-arm64 export-etcd-backup-amd64 export-etcd-backup-arm64 export-etcd-dump-amd64 export-etcd-dump-arm64
+images: images-amd64 images-arm64
 
 .PHONY: push
 push: push-etcd-manager-slim push-etcd-backup push-etcd-backup push-etcd-dump
 
+.PHONY: export-etcd-manager-ctl-amd64 export-etcd-manager-ctl-arm64
+export-etcd-manager-ctl-amd64 export-etcd-manager-ctl-arm64: export-etcd-manager-ctl-%:
+	mkdir -p dist
+	KO_DOCKER_REPO="registry.k8s.io/etcd-manager/etcd-manager-ctl" ${KO} build --tags ${STABLE_DOCKER_TAG} --platform=linux/$* -B --push=false --tarball=dist/etcd-manager-ctl-$*.tar ./cmd/etcd-manager/
+	gzip -f dist/etcd-manager-ctl-$*.tar
+
+.PHONY: push-etcd-manager-ctl
+push-etcd-manager-ctl:
+	KO_DOCKER_REPO="${IMAGE_BASE}etcd-manager-ctl" ${KO} build --tags ${STABLE_DOCKER_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/etcd-manager-ctl/
+
 .PHONY: export-etcd-manager-slim-amd64 export-etcd-manager-slim-arm64
 export-etcd-manager-slim-amd64 export-etcd-manager-slim-arm64: export-etcd-manager-slim-%:
 	mkdir -p dist
-	KO_DEFAULTBASEIMAGE="debian:12-slim" KO_DOCKER_REPO="registry.k8s.io/etcd-manager/etcd-manager-slim" ${KO} build --tags ${STABLE_DOCKER_TAG} --platform=linux/$* -B --push=false --tarball=dist/etcd-manager-slim-$*.tar ./cmd/etcd-manager/
+	KO_DOCKER_REPO="registry.k8s.io/etcd-manager/etcd-manager-slim" ${KO} build --tags ${STABLE_DOCKER_TAG} --platform=linux/$* -B --push=false --tarball=dist/etcd-manager-slim-$*.tar ./cmd/etcd-manager/
 	gzip -f dist/etcd-manager-slim-$*.tar
 
 .PHONY: push-etcd-manager-slim
-push-etcd-manager-slim:
-	KO_DEFAULTBASEIMAGE="debian:12-slim" KO_DOCKER_REPO="${IMAGE_BASE}etcd-manager-slim" ${KO} build --tags ${STABLE_DOCKER_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/etcd-manager/
+push-etcd-manager-slim: push-etcd-manager-ctl
+	KO_DEFAULTBASEIMAGE="${IMAGE_BASE}etcd-manager-ctl:${STABLE_DOCKER_TAG}" KO_DOCKER_REPO="${IMAGE_BASE}etcd-manager-slim" ${KO} build --tags ${STABLE_DOCKER_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/etcd-manager/
 
 .PHONY: export-etcd-backup-amd64 export-etcd-backup-arm64
 export-etcd-backup-amd64 export-etcd-backup-arm64: export-etcd-backup-%:
 	mkdir -p dist
-	KO_DEFAULTBASEIMAGE="debian:12-slim" KO_DOCKER_REPO="registry.k8s.io/etcd-manager/etcd-backup" ${KO} build --tags ${STABLE_DOCKER_TAG} --platform=linux/$* -B --push=false --tarball=dist/etcd-backup-$*.tar ./cmd/etcd-backup/
+	KO_DOCKER_REPO="registry.k8s.io/etcd-manager/etcd-backup" ${KO} build --tags ${STABLE_DOCKER_TAG} --platform=linux/$* -B --push=false --tarball=dist/etcd-backup-$*.tar ./cmd/etcd-backup/
 	gzip -f dist/etcd-backup-$*.tar
 
 .PHONY: push-etcd-backup
 push-etcd-backup:
-	KO_DEFAULTBASEIMAGE="debian:12-slim" KO_DOCKER_REPO="${IMAGE_BASE}etcd-backup" ${KO} build --tags ${STABLE_DOCKER_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/etcd-backup/
+	KO_DOCKER_REPO="${IMAGE_BASE}etcd-backup" ${KO} build --tags ${STABLE_DOCKER_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/etcd-backup/
 
 .PHONY: export-etcd-dump-amd64 export-etcd-dump-arm64
 export-etcd-dump-amd64 export-etcd-dump-arm64: export-etcd-dump-%:
 	mkdir -p dist
-	KO_DEFAULTBASEIMAGE="debian:12-slim" KO_DOCKER_REPO="registry.k8s.io/etcd-manager/etcd-dump" ${KO} build --tags ${STABLE_DOCKER_TAG} --platform=linux/$* -B --push=false --tarball=dist/etcd-dump-$*.tar ./cmd/etcd-dump/
+	KO_DOCKER_REPO="registry.k8s.io/etcd-manager/etcd-dump" ${KO} build --tags ${STABLE_DOCKER_TAG} --platform=linux/$* -B --push=false --tarball=dist/etcd-dump-$*.tar ./cmd/etcd-dump/
 	gzip -f dist/etcd-dump-$*.tar
 
 .PHONY: push-etcd-dump
 push-etcd-dump:
-	KO_DEFAULTBASEIMAGE="debian:12-slim" KO_DOCKER_REPO="${IMAGE_BASE}etcd-dump" ${KO} build --tags ${STABLE_DOCKER_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/etcd-dump/
+	KO_DOCKER_REPO="${IMAGE_BASE}etcd-dump" ${KO} build --tags ${STABLE_DOCKER_TAG} --platform=linux/amd64,linux/arm64 --bare ./cmd/etcd-dump/
 

version.txt

@@ -1 +1 @@
-3.0.20241012
+3.0.20250628