Merge pull request #1351 from torredil/release-1.11

Explicitly pass VERSION as a build-arg

Author: k8s-ci-robot

.github/workflows/publish-ecr.yaml

@@ -36,6 +36,7 @@ jobs:
       run: |
           echo "REGISTRY=${REGISTRY}" >> $GITHUB_ENV
           echo "TAG=${GITHUB_REF_NAME}" >> $GITHUB_ENV
+          echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
 
     - name: Build, tag, and push manifest to Amazon ECR
       run: make -j `nproc` all-push

.github/workflows/release.yaml

@@ -22,5 +22,5 @@ jobs:
 
             ## CHANGELOG
             See [CHANGELOG](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/CHANGELOG.md) for full list of changes
-          draft: false
+          draft: true
           prerelease: false

Dockerfile

@@ -23,6 +23,7 @@ RUN go mod download
 COPY . .
 ARG TARGETOS
 ARG TARGETARCH
+ARG VERSION
 RUN OS=$TARGETOS ARCH=$TARGETARCH make $TARGETOS/$TARGETARCH
 
 FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs:latest.2 AS linux-amazon

Makefile

@@ -102,6 +102,7 @@ image: .image-$(TAG)-$(OS)-$(ARCH)-$(OSVERSION)
 		--output=type=$(OUTPUT_TYPE) \
 		-t=$(IMAGE):$(TAG)-$(OS)-$(ARCH)-$(OSVERSION) \
 		--build-arg=GOPROXY=$(GOPROXY) \
+		--build-arg=VERSION=$(VERSION) \
 		.
 	touch $@