Merge pull request #397 from justinblalock87/fix-cleanup-release

Add multi-arch manifest for node cleanup controller

Author: k8s-ci-robot

Makefile

@@ -40,7 +40,8 @@ all: build-container-linux-amd64
 cross: init-buildx \
 	$(addprefix build-and-push-container-linux-,$(LINUX_ARCH)) \
 	$(addprefix build-and-push-node-cleanup-controller-linux-,$(LINUX_ARCH)) \
-	$(addprefix build-and-push-container-windows-,$(WINDOWS_DISTROS))
+	$(addprefix build-and-push-container-windows-,$(WINDOWS_DISTROS)) \
+	$(addprefix build-and-push-node-cleanup-controller-windows-,$(WINDOWS_DISTROS))
 .PHONY: cross
 
 verify:
@@ -68,7 +69,7 @@ build-container-linux-%:
 build-node-cleanup-controller-linux-%:
 	CGO_ENABLED=0 GOOS=linux GOARCH=$* go build -a -ldflags '-extldflags "-static"' -mod vendor -o _output/linux/$*/local-volume-node-cleanup ./cmd/node-cleanup
 	$(DOCKER) buildx build --file=./cmd/node-cleanup/Dockerfile --platform=linux/$* \
-		-t $(STAGINGIMAGENODECLEANUPCONTROLLER):$(STAGINGVERSION) --output=type=$(OUTPUT_TYPE) \
+		-t $(STAGINGIMAGENODECLEANUPCONTROLLER):$(STAGINGVERSION)_linux_$* --output=type=$(OUTPUT_TYPE) \
 		--build-arg OS=linux \
 		--build-arg ARCH=$* .
 
@@ -83,7 +84,7 @@ build-and-push-container-linux-%: init-buildx
 build-and-push-node-cleanup-controller-linux-%: init-buildx
 	CGO_ENABLED=0 GOOS=linux GOARCH=$* go build -a -ldflags '-extldflags "-static"' -mod vendor -o _output/linux/$*/local-volume-node-cleanup ./cmd/node-cleanup
 	$(DOCKER) buildx build --file=./cmd/node-cleanup/Dockerfile --platform=linux/$* \
-		-t $(STAGINGIMAGENODECLEANUPCONTROLLER):$(STAGINGVERSION) \
+		-t $(STAGINGIMAGENODECLEANUPCONTROLLER):$(STAGINGVERSION)_linux_$* \
 		--build-arg OS=linux \
 		--build-arg ARCH=$* \
 		--push .
@@ -95,6 +96,13 @@ build-and-push-container-windows-%: init-buildx
 		--build-arg OSVERSION=$* \
 		--push .
 
+build-and-push-node-cleanup-controller-windows-%: init-buildx
+	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -a -ldflags='-extldflags="-static" -X="main.version=${STAGINGVERSION}"' -mod vendor -o _output/windows/amd64/local-volume-node-cleanup.exe ./cmd/node-cleanup
+	$(DOCKER) buildx build --file=./cmd/node-cleanup/Dockerfile.Windows --platform=windows/amd64 \
+		-t $(STAGINGIMAGENODECLEANUPCONTROLLER):$(STAGINGVERSION)_windows_$* \
+		--build-arg OSVERSION=$* \
+		--push .
+
 test: build-container-linux-amd64
 	go test ./cmd/... ./pkg/...
 	docker run --privileged -v $(PWD)/deployment/docker/test.sh:/test.sh --entrypoint bash $(STAGINGIMAGE):$(STAGINGVERSION)_linux_amd64 /test.sh

cmd/node-cleanup/Dockerfile.Windows

@@ -0,0 +1,25 @@
+# Copyright 2023 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ARG OSVERSION
+FROM mcr.microsoft.com/windows/nanoserver:${OSVERSION}
+LABEL description="Local Volume Provisioner Node Cleanup Controller"
+
+ARG OS=windows
+ARG ARCH=amd64
+ARG binary=./_output/${OS}/${ARCH}/local-volume-node-cleanup.exe
+COPY ${binary} main.exe
+
+USER ContainerAdministrator
+ENTRYPOINT ["/main.exe"]

hack/release.sh

@@ -110,7 +110,7 @@ go version
 IMAGE="$REGISTRY/local-volume-provisioner"
 NODECLEANUPCONTROLLERIMAGE="$REGISTRY/local-volume-node-cleanup"
 
-if [ -z "$REGISTRY" ];
+if [ -z "$REGISTRY" ]; then
   echo "error: REGISTRY must be set"
   exit 1
 fi
@@ -223,19 +223,19 @@ else
     echo "info: build and push is skipped"
 fi
 
-echo "info: create multi-arch manifest for $IMAGE:$VERSION"
 function docker_create_multi_arch() {
     # tag_version is the version used in the docker manifest that ties
     # all of the images that were tagged with $VERSION
     local tag_version=${1}
-    local manifest_image=$IMAGE:$tag_version
+    local image=${2}
+    local manifest_image=$image:$tag_version
 
     # get the list of all the images created
     local linux_images=$(echo "${LINUX_ARCH}" | tr ' ' '\n' | while read -r arch; do \
-        echo $IMAGE:${VERSION}_linux_${arch}; \
+        echo $image:${VERSION}_linux_${arch}; \
     done);
     local windows_images=$(echo "${WINDOWS_DISTROS}" | tr ' ' '\n' | while read -r distro; do \
-        echo $IMAGE:${VERSION}_windows_${distro}; \
+        echo $image:${VERSION}_windows_${distro}; \
     done);
     local all_images="${linux_images} ${windows_images}"
 
@@ -245,14 +245,14 @@ function docker_create_multi_arch() {
     # annotate the linux images with the right arch
     # from https://github.com/kubernetes/release/blob/8dbca63a6875e59e2234954ad3876d9490bbeede/images/build/debian-base/Makefile#L67-L70
     echo "${LINUX_ARCH}" | tr ' ' '\n' | while read -r arch; do
-        local linux_image=$IMAGE:${VERSION}_linux_${arch}
+        local linux_image=$image:${VERSION}_linux_${arch}
         docker manifest annotate --arch $arch $manifest_image $linux_image
     done
 
     # annotate the windows images with the base image os-version
     # from https://github.com/kubernetes-csi/csi-release-tools/blob/5b9a1e06794ddb137ff7e2d565416cc6934ec380/build.make#L181-L189
     echo "${WINDOWS_DISTROS}" | tr ' ' '\n' | while read -r distro; do
-        local windows_image=$IMAGE:${VERSION}_windows_${distro}
+        local windows_image=$image:${VERSION}_windows_${distro}
         # the image matches the value in the Makefile
         local os_version=$(docker manifest inspect mcr.microsoft.com/windows/servercore:${distro} | grep "os.version" | head -n 1 | awk '{print $2}' | sed -e 's/"//g')
         docker manifest annotate --os-version ${os_version} $manifest_image $windows_image
@@ -261,7 +261,11 @@ function docker_create_multi_arch() {
     docker manifest push --purge $manifest_image
 }
 
-docker_create_multi_arch $VERSION
+echo "info: create multi-arch manifest for $IMAGE:$VERSION"
+docker_create_multi_arch $VERSION $IMAGE
+
+echo "info: create multi-arch manifest for $NODECLEANUPCONTROLLERIMAGE:$VERSION"
+docker_create_multi_arch $VERSION $NODECLEANUPCONTROLLERIMAGE
 
 if ! is_stable_version "$VERSION" || [ -n "$SKIP_PUSH_LATEST" ]; then
     echo "info: VERSION '$VERSION' is not stable version or SKIP_PUSH_LATEST is set, skip pushing $VERSION as the latest image"
@@ -283,4 +287,7 @@ if [ "$VERSION" != "$latest_stable_version" ]; then
 fi
 
 echo "info: VERSION '$VERSION' is latest stable version, tagging $IMAGE as latest"
-docker_create_multi_arch latest
+docker_create_multi_arch latest $IMAGE
+
+echo "info: VERSION '$VERSION' is latest stable version, tagging $NODECLEANUPCONTROLLERIMAGE as latest"
+docker_create_multi_arch latest $NODECLEANUPCONTROLLERIMAGE