Pin buildx builder image to v0.16.0

Author: mauriciopoppe

Dockerfile.Windows

@@ -21,7 +21,7 @@ WORKDIR /code
 ADD . /code/
 RUN cd /code/ && GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GCE_PD_CSI_STAGING_VERSION=${STAGINGVERSION} make gce-pd-driver-windows
 
-FROM --platform=$TARGETPLATFORM ${BASE_IMAGE}
+FROM ${BASE_IMAGE}
 LABEL description="PD CSI driver"
 COPY --from=builder /code/bin/gce-pd-csi-driver.exe /gce-pd-csi-driver.exe
 

Makefile

@@ -23,10 +23,10 @@ DRIVERWINDOWSBINARY=${DRIVERBINARY}.exe
 
 DOCKER=DOCKER_CLI_EXPERIMENTAL=enabled docker
 
-BASE_IMAGE_LTSC2019=mcr.microsoft.com/windows/servercore:ltsc2022
+BASE_IMAGE_LTSC2019=mcr.microsoft.com/windows/servercore:ltsc2019
 
 # Both arrays MUST be index aligned.
-WINDOWS_IMAGE_TAGS=ltsc2022
+WINDOWS_IMAGE_TAGS=ltsc2019
 WINDOWS_BASE_IMAGES=$(BASE_IMAGE_LTSC2019)
 
 GCFLAGS=""
@@ -61,12 +61,14 @@ build-and-push-windows-container-ltsc2019: require-GCE_PD_CSI_STAGING_IMAGE init
 		--build-arg STAGINGVERSION=$(STAGINGVERSION) --push --provenance=false .
 
 build-and-push-multi-arch: build-and-push-container-linux-amd64 build-and-push-container-linux-arm64 build-and-push-windows-container-ltsc2019
-	$(DOCKER) manifest create --amend $(STAGINGIMAGE):$(STAGINGVERSION) $(STAGINGIMAGE):$(STAGINGVERSION)_linux_amd64 $(STAGINGIMAGE):$(STAGINGVERSION)_linux_arm64 $(STAGINGIMAGE):$(STAGINGVERSION)_ltsc2019
+	$(DOCKER) manifest create $(STAGINGIMAGE):$(STAGINGVERSION) $(STAGINGIMAGE):$(STAGINGVERSION)_linux_amd64 $(STAGINGIMAGE):$(STAGINGVERSION)_linux_arm64 $(STAGINGIMAGE):$(STAGINGVERSION)_ltsc2019
+	# $(DOCKER) manifest annotate --os linux --arch arm64 $(STAGINGIMAGE):$(STAGINGVERSION) $(STAGINGIMAGE):$(STAGINGVERSION)_linux_arm64
 	STAGINGIMAGE="$(STAGINGIMAGE)" STAGINGVERSION="$(STAGINGVERSION)" WINDOWS_IMAGE_TAGS="$(WINDOWS_IMAGE_TAGS)" WINDOWS_BASE_IMAGES="$(WINDOWS_BASE_IMAGES)" ./manifest_osversion.sh
 	$(DOCKER) manifest push -p $(STAGINGIMAGE):$(STAGINGVERSION)
 	$(DOCKER) manifest inspect $(STAGINGIMAGE):$(STAGINGVERSION)
 
 build-and-push-multi-arch-debug: build-and-push-container-linux-debug build-and-push-windows-container-ltsc2019
+	# TODO: make this command the same as the above
 	$(DOCKER) manifest create --amend $(STAGINGIMAGE):$(STAGINGVERSION) $(STAGINGIMAGE):$(STAGINGVERSION)_linux $(STAGINGIMAGE):$(STAGINGVERSION)_ltsc2019
 	STAGINGIMAGE="$(STAGINGIMAGE)" STAGINGVERSION="$(STAGINGVERSION)" WINDOWS_IMAGE_TAGS="ltsc2019" WINDOWS_BASE_IMAGES="$(BASE_IMAGE_LTSC2019)" ./manifest_osversion.sh
 	$(DOCKER) manifest push -p $(STAGINGIMAGE):$(STAGINGVERSION)
@@ -131,7 +133,7 @@ init-buildx:
 	$(DOCKER) run --rm --privileged multiarch/qemu-user-static --reset --credential yes --persistent yes
 	# Ensure we use a builder that can leverage it (the default on linux will not)
 	-$(DOCKER) buildx rm multiarch-multiplatform-builder
-	$(DOCKER) buildx create --use --name=multiarch-multiplatform-builder --driver-opt network=host --driver-opt image=moby/buildkit:v0.14.1
+	$(DOCKER) buildx create --use --name=multiarch-multiplatform-builder --driver-opt network=host --driver-opt image=moby/buildkit:v0.16.0
 	# Register gcloud as a Docker credential helper.
 	# Required for "docker buildx build --push".
 	gcloud auth configure-docker --quiet

manifest_osversion.sh

@@ -25,13 +25,14 @@ for ((i=0;i<${#imagetags[@]};++i)); do
   BASEIMAGE="${baseimages[i]}"
   echo $BASEIIMAGE
 
-  full_version=$(docker manifest inspect ${BASEIMAGE} | grep "os.version" | head -n 1 | awk '{print $2}') || true
+  full_version=$(docker manifest inspect ${BASEIMAGE} | grep "os.version" | head -n 1 | awk '{print $2}' | sed 's/^\"//' | sed 's/\",$//') || true
   echo $full_version
 
   IMAGETAG=${STAGINGIMAGE}:${STAGINGVERSION}_${imagetags[i]}
   image_folder=$(echo "${IMAGETAG}" | sed "s|/|_|g" | sed "s/:/-/")
   echo ${manifest_folder}
 
+  docker manifest annotate --os windows --arch amd64 --os-version ${full_version} ${STAGINGIMAGE}:${STAGINGVERSION} ${IMAGETAG}
   # sed -i -r "s/(\"os\"\:\"windows\")/\0,\"os.version\":$full_version/" \
   # "${HOME}/.docker/manifests/${manifest_folder}/${image_folder}"
 

test/k8s-integration/cluster.go

@@ -59,10 +59,27 @@ func clusterDownGKE(gceZone, gceRegion string) error {
 	return nil
 }
 
+const hardcodeBuildChange = `/template:/,/spec:/s/spec:$/spec:\n\ \ \ \ \ \ nodeSelector:\n\ \ \ \ \ \ \ \ kubernetes.io\/os: linux/`
+
 func buildKubernetes(k8sDir, command string) error {
-	cmd := exec.Command("make", "-C", k8sDir, command)
+	// TODO: REMOVE THESE HARDCODED LINES
+	cmd := exec.Command("sed", "-i", hardcodeBuildChange, fmt.Sprintf("%s/cluster/addons/node-problem-detector/npd.yaml", k8sDir))
+	cmd.Env = os.Environ()
+	err := runCommand(fmt.Sprintf("Make hardcoded change in path=%s", k8sDir), cmd)
+	if err != nil {
+		return fmt.Errorf("failed to make hardcoded changes before building Kubernetes: %w", err)
+	}
+
+	cmd = exec.Command("cat", fmt.Sprintf("%s/cluster/addons/node-problem-detector/npd.yaml", k8sDir))
+	cmd.Env = os.Environ()
+	err = runCommand(fmt.Sprintf("Check hardcoded change in path=%s", k8sDir), cmd)
+	if err != nil {
+		return fmt.Errorf("failed to check hardcoded changes before building Kubernetes: %w", err)
+	}
+
+	cmd = exec.Command("make", "-C", k8sDir, command)
 	cmd.Env = os.Environ()
-	err := runCommand(fmt.Sprintf("Running command in kubernetes/kubernetes path=%s", k8sDir), cmd)
+	err = runCommand(fmt.Sprintf("Running command in kubernetes/kubernetes path=%s", k8sDir), cmd)
 	if err != nil {
 		return fmt.Errorf("failed to build Kubernetes: %w", err)
 	}

test/run-windows-k8s-integration.sh

@@ -28,7 +28,7 @@ export KUBE_BUILD_PLATFORMS=${KUBE_BUILD_PLATFORMS:-"linux/amd64 windows/amd64"}
 make -C "${PKGDIR}" test-k8s-integration
 
 if [ "$use_kubetest2" = true ]; then
-    kt2_version=0e09086b60c122e1084edd2368d3d27fe36f384f
+    kt2_version=22d5b1410bef09ae679fa5813a5f0d196b6079de
     go install sigs.k8s.io/kubetest2@${kt2_version}
     go install sigs.k8s.io/kubetest2/kubetest2-gce@${kt2_version}
     go install sigs.k8s.io/kubetest2/kubetest2-gke@${kt2_version}