Switches windows builds to base off new base image (#1569)

Author: jaxesn

Common.mk

@@ -176,9 +176,6 @@ IMAGE_TARGETS=$(foreach image,$(IMAGE_NAMES),$(if $(filter true,$(BUILD_OCI_TARS
 
 ############# WINDOWS #############################
 # similiar to https://github.com/kubernetes-csi/livenessprobe/blob/master/release-tools/prow.sh#L78
-WINDOWS_IMAGE_REGISTRY=mcr.microsoft.com/windows
-WINDOWS_BASE_IMAGE_NAME=nanoserver
-WINDOWS_ADDON_IMAGE_NAME=servercore
 WINDOWS_IMAGE_VERSIONS=1809 20H2 ltsc2022
 
 # if multiple platforms requested, remove windows since it will be
@@ -668,7 +665,7 @@ endif
 %/images/push: $(BINARY_TARGETS) $(LICENSES_TARGETS_FOR_PREREQ) $(HANDLE_DEPENDENCIES_TARGET) $$(WINDOWS_IMAGE_BUILD_TARGETS_FOR_IMAGE)
 	$(BUILDCTL)
 	@if [ -n "$(WINDOWS_IMAGE_BUILD_TARGETS_FOR_IMAGE)" ]; then \
-		$(BUILD_LIB)/create_windows_manifest_list.sh $(IMAGE_NAME) $(IMAGE) $(LATEST_IMAGE) "$(WINDOWS_IMAGE_VERSIONS)" $(WINDOWS_IMAGE_REGISTRY) $(WINDOWS_BASE_IMAGE_NAME); \
+		$(BUILD_LIB)/create_windows_manifest_list.sh $(IMAGE_NAME) $(IMAGE) $(LATEST_IMAGE) "$(WINDOWS_IMAGE_VERSIONS)"; \
 	fi
 
 %/images/amd64: $(BINARY_TARGETS) $(LICENSES_TARGETS_FOR_PREREQ) $(HANDLE_DEPENDENCIES_TARGET)
@@ -684,8 +681,8 @@ endif
 %/windows/images/push: IMAGE_NAME=$(word 1,$(subst ., ,$*))
 %/windows/images/push: WINDOWS_OS_VERSION=$(word 2,$(subst ., ,$*))
 %/windows/images/push: DOCKERFILE_FOLDER=./docker/windows
-%/windows/images/push: BUILDER_IMAGE=$(WINDOWS_IMAGE_REGISTRY)/$(WINDOWS_ADDON_IMAGE_NAME):$(WINDOWS_OS_VERSION)
-%/windows/images/push: BASE_IMAGE=$(WINDOWS_IMAGE_REGISTRY)/$(WINDOWS_BASE_IMAGE_NAME):$(WINDOWS_OS_VERSION)
+%/windows/images/push: BASE_IMAGE_NAME=eks-distro-windows-base-$(WINDOWS_OS_VERSION)
+%/windows/images/push: BASE_IMAGE=$(BASE_IMAGE_REPO)/eks-distro-windows-base:$(BASE_IMAGE_TAG)
 %/windows/images/push: IMAGE_PLATFORMS=windows/amd64
 %/windows/images/push: IMAGE_METADATA_FILE=/tmp/$(IMAGE_NAME)-$(WINDOWS_OS_VERSION)-metadata.json
 %/windows/images/push: $(BINARY_TARGETS) $(LICENSES_TARGETS_FOR_PREREQ) $(HANDLE_DEPENDENCIES_TARGET)

EKS_DISTRO_WINDOWS_BASE_1809_TAG_FILE

@@ -0,0 +1 @@
+1809-2022-12-19-1671485888.2

EKS_DISTRO_WINDOWS_BASE_20H2_TAG_FILE

@@ -0,0 +1 @@
+20H2-2022-12-19-1671485888.2

EKS_DISTRO_WINDOWS_BASE_LTSC2022_TAG_FILE

@@ -0,0 +1 @@
+ltsc2022-2022-12-19-1671485888.2

build/lib/create_windows_manifest_list.sh

@@ -24,8 +24,6 @@ IMAGE_NAME="$1"
 IMAGE="$2"
 LATEST_IMAGE="$3"
 WINDOWS_IMAGE_VERSIONS="$4"
-WINDOWS_IMAGE_REGISTRY="$5"
-WINDOWS_BASE_IMAGE_NAME="$6"
 
 # this metadate file contains the linux/amd+arm images
 if [ ! -f /tmp/$IMAGE_NAME-metadata.json ]; then
@@ -43,9 +41,12 @@ for version in "${VERSIONS[@]}"; do
         echo "No metadata file for image: /tmp/$IMAGE_NAME-$version-metadata.json!"
         exit 1
     fi
+
+    BASE_IMAGE=$(jq -r '."containerimage.buildinfo".attrs."build-arg:BASE_IMAGE"' /tmp/$IMAGE_NAME-$version-metadata.json)
+
     # need to remove mediaType from descri since buildx segfaults when it is set
     jq -r '."containerimage.descriptor"  | {size, digest}' /tmp/$IMAGE_NAME-$version-metadata.json > /tmp/$IMAGE_NAME-$version-descr.json
-    retry docker buildx imagetools inspect --raw $WINDOWS_IMAGE_REGISTRY/$WINDOWS_BASE_IMAGE_NAME:$version | jq '.manifests[0] | {platform}' | jq add -s - /tmp/$IMAGE_NAME-$version-descr.json > /tmp/$IMAGE_NAME-$version-descr-final.json
+    retry docker buildx imagetools inspect --raw $BASE_IMAGE | jq '.manifests[0] | {platform}' | jq add -s - /tmp/$IMAGE_NAME-$version-descr.json > /tmp/$IMAGE_NAME-$version-descr-final.json
     CREATE_ARGS+="-f /tmp/$IMAGE_NAME-$version-descr-final.json "
 done
 

projects/kubernetes-csi/livenessprobe/docker/windows/Dockerfile

@@ -12,17 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG BUILDER_IMAGE
 ARG BASE_IMAGE
-FROM $BUILDER_IMAGE as servercore
 FROM $BASE_IMAGE
 
-COPY --from=servercore /Windows/System32/netapi32.dll /Windows/System32/netapi32.dll
-
 ARG TARGETARCH
 ARG TARGETOS
 
-
 COPY LICENSES /LICENSES
 COPY ATTRIBUTION.txt /ATTRIBUTION.txt
 COPY bin/livenessprobe/$TARGETOS-$TARGETARCH/livenessprobe.exe /livenessprobe.exe

projects/kubernetes-csi/node-driver-registrar/docker/windows/Dockerfile

@@ -12,17 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG BUILDER_IMAGE
 ARG BASE_IMAGE
-FROM $BUILDER_IMAGE as servercore
 FROM $BASE_IMAGE
 
-COPY --from=servercore /Windows/System32/netapi32.dll /Windows/System32/netapi32.dll
-
 ARG TARGETARCH
 ARG TARGETOS
 
-
 COPY LICENSES /LICENSES
 COPY ATTRIBUTION.txt /ATTRIBUTION.txt
 COPY bin/node-driver-registrar/$TARGETOS-$TARGETARCH/csi-node-driver-registrar.exe /csi-node-driver-registrar.exe