Provide configurable options for variable to build windows image

Author: akankshapanse

hack/release.sh

@@ -52,7 +52,7 @@ BUILD_RELEASE_TYPE="${BUILD_RELEASE_TYPE:-}"
 GOLANG_IMAGE=${CUSTOM_REPO_FOR_GOLANG:-}golang:1.22
 
 ARCH=amd64
-OSVERSION=1809
+OSVERSION=${OSVERSION:=1809}
 # OS Version for the Windows images: 1809, 20H2, ltsc2022
 OSVERSION_WIN=(1809 20H2 ltsc2022)
 # The output type could either be docker (local), or registry.
@@ -62,6 +62,9 @@ LINUX_IMAGE_OUTPUT="type=docker"
 
 REGISTRY=
 
+# set windows buildkit image if not given already
+WIN_BUILDKIT_IMAGE="${WIN_BUILDKIT_IMAGE:=moby/buildkit:v0.10.6}"
+
 # set base image if not given already
 BASE_IMAGE="${BASE_IMAGE:=photon:4.0}"
 
@@ -108,7 +111,7 @@ function fatal() {
 
 
 function build_driver_images_windows() {
-  docker buildx use vsphere-csi-builder-win || docker buildx create --driver-opt image=moby/buildkit:v0.10.6 --name vsphere-csi-builder-win --platform windows/amd64 --use
+  docker buildx use vsphere-csi-builder-win || docker buildx create --driver-opt image=${WIN_BUILDKIT_IMAGE} --name vsphere-csi-builder-win --platform windows/amd64 --use
   echo "building ${CSI_IMAGE_NAME}:${VERSION} for windows"
   # some registry do not allow uppercase tags
   osv=$(lcase "${OSVERSION}")
@@ -169,13 +172,13 @@ function build_images() {
   LATEST="latest"
 
   # build images for linux platform
-  build_driver_images_linux
-  build_syncer_image_linux
+  #build_driver_images_linux
+  #build_syncer_image_linux
 
-  if [ "$DO_WINDOWS_BUILD" = true ]; then
+  #if [ "$DO_WINDOWS_BUILD" = true ]; then
     # build images for windows platform
     build_driver_images_windows
-  fi
+  #fi
 }
 
 function push_manifest_driver() {

images/windows/driver/Dockerfile

@@ -17,15 +17,16 @@
 ################################################################################
 # This build arg allows the specification of a custom Golang image.
 ARG GOLANG_IMAGE=golang:1.22
-ARG OSVERSION
+ARG OSVERSION=${OSVERSION:-1809}
 ARG ARCH=amd64
+ARG TARGET_PLATFORM=linux/amd64
 
 ################################################################################
 ##                              BUILD STAGE                                   ##
 ################################################################################
 # Build the manager as a statically compiled binary so it has no dependencies
 # libc, muscl, etc.
-FROM --platform=linux/amd64 ${GOLANG_IMAGE} as builder
+FROM --platform=${TARGET_PLATFORM} ${GOLANG_IMAGE} AS builder
 
 # This build arg is the version to embed in the CSI binary
 ARG VERSION=unknown
@@ -38,14 +39,14 @@ COPY go.mod go.sum ./
 COPY pkg/    pkg/
 COPY cmd/    cmd/
 ENV CGO_ENABLED=0
-ENV GOPROXY ${GOPROXY:-https://proxy.golang.org}
+ENV GOPROXY=${GOPROXY:-https://proxy.golang.org}
 RUN GOOS=windows GOARCH=amd64 go build -a -ldflags="-w -s -extldflags=static -X sigs.k8s.io/vsphere-csi-driver/v3/pkg/csi/service.Version=${VERSION}" -o ./bin/vsphere-csi.windows_amd64 cmd/vsphere-csi/main.go
 
 
 ################################################################################
 ##                              MAIN STAGE                                   ##
 ################################################################################
-FROM --platform=linux/amd64 gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-${ARCH}-${OSVERSION} as core
+FROM --platform=${TARGET_PLATFORM} gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-${ARCH}-${OSVERSION} AS core
 
 FROM mcr.microsoft.com/windows/nanoserver:${OSVERSION}
 COPY --from=core /Windows/System32/netapi32.dll /Windows/System32/netapi32.dll