Clean up previously tried workarounds.

Author: tonyzhc

Makefile

@@ -62,14 +62,11 @@ build-and-push-windows-container-ltsc2019: require-GCE_PD_CSI_STAGING_IMAGE init
 
 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 $(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
+	$(DOCKER) manifest create $(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)
 
@@ -133,7 +130,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.16.0
+	$(DOCKER) buildx create --use --name=multiarch-multiplatform-builder --driver-opt network=host --driver-opt image=moby/buildkit:v0.20.0
 	# Register gcloud as a Docker credential helper.
 	# Required for "docker buildx build --push".
 	gcloud auth configure-docker --quiet

manifest_osversion.sh

@@ -32,9 +32,9 @@ for ((i=0;i<${#imagetags[@]};++i)); do
   image_folder=$(echo "${IMAGETAG}" | sed "s|/|_|g" | sed "s/:/-/")
   echo ${manifest_folder}
 
+  # Needed for Windows nodes to correctly recognize the version of image to pull.
+  # Populates the os.version field of the multi-arch image manifest.
   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}"
 
   # manifest after transformations
   cat "${HOME}/.docker/manifests/${manifest_folder}/${image_folder}"

test/k8s-integration/cluster.go

@@ -59,27 +59,10 @@ 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 {
-	// 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 := 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)
 	}