Merge pull request #613 from jingxu97/sep/multios

Enable multi-arch build in Makefile

Author: k8s-ci-robot

Makefile

@@ -40,19 +40,30 @@ build-container: require-GCE_PD_CSI_STAGING_IMAGE
 
 build-and-push-windows-container-ltsc2019: require-GCE_PD_CSI_STAGING_IMAGE init-buildx
 	$(DOCKER) buildx build --file=Dockerfile.Windows --platform=windows \
-		-t $(STAGINGIMAGE):$(STAGINGVERSION) --build-arg BASE_IMAGE=servercore \
+		-t $(STAGINGIMAGE)-ltsc2019:$(STAGINGVERSION) --build-arg BASE_IMAGE=servercore \
 		--build-arg BASE_IMAGE_TAG=ltsc2019 \
 		--build-arg STAGINGVERSION=$(STAGINGVERSION) --push .
 
 build-and-push-windows-container-1909: require-GCE_PD_CSI_STAGING_IMAGE init-buildx
 	$(DOCKER) buildx build --file=Dockerfile.Windows --platform=windows \
-		-t $(STAGINGIMAGE):$(STAGINGVERSION) --build-arg BASE_IMAGE=servercore \
+		-t $(STAGINGIMAGE)-1909:$(STAGINGVERSION) --build-arg BASE_IMAGE=servercore \
 		--build-arg BASE_IMAGE_TAG=1909 \
 		--build-arg STAGINGVERSION=$(STAGINGVERSION) --push .
 
+build-and-push-multi-arch: build-and-push-container-linux build-and-push-windows-container-ltsc2019 build-and-push-windows-container-1909
+	$(DOCKER) manifest create --amend $(STAGINGIMAGE):$(STAGINGVERSION) ${STAGINGIMAGE}-linux:${STAGINGVERSION} ${STAGINGIMAGE}-1909:${STAGINGVERSION} ${STAGINGIMAGE}-ltsc2019:${STAGINGVERSION}
+	STAGINGIMAGE=${STAGINGIMAGE} STAGINGVERSION=${STAGINGVERSION} ./manifest_osversion.sh
+	$(DOCKER) manifest push -p $(STAGINGIMAGE):$(STAGINGVERSION)
+
 push-container: build-container
 	gcloud docker -- push $(STAGINGIMAGE):$(STAGINGVERSION)
 
+build-and-push-container-linux: require-GCE_PD_CSI_STAGING_IMAGE init-buildx
+	$(DOCKER) buildx build --platform=linux \
+		-t $(STAGINGIMAGE)-linux:$(STAGINGVERSION) \
+		--build-arg TAG=$(STAGINGVERSION) --push .
+
+
 test-sanity: gce-pd-driver
 	go test -mod=vendor --v -timeout 30s sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/sanity -run ^TestSanity$
 

deploy/kubernetes/base/node_windows/node.yaml

@@ -42,7 +42,7 @@ spec:
         - name: gce-pd-driver
           # Don't change base image without changing pdImagePlaceholder in
           # test/k8s-integration/main.go
-          image: gke.gcr.io/gcp-compute-persistent-disk-csi-driver-win
+          image: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
           args:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"

deploy/kubernetes/images/alpha/image.yaml

@@ -3,7 +3,7 @@ kind: ImageTagTransformer
 metadata:
   name: imagetag-gcepd-driver-alpha-win
 imageTag:
-  name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver-win
+  name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
   newTag: "v1.0.1-gke.9"
 ---

manifest_osversion.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# The following is a workaround for issue https://github.com/moby/moby/issues/41417
+# to manually inserver os.version information into docker manifest file
+# TODO: once docker manifest annotation for os.versions is availabler for the installed docker here,
+# replace the following with annotation approach. https://github.com/docker/cli/pull/2578
+
+export DOCKER_CLI_EXPERIMENTAL=enabled
+_WINDOWS_VERSIONS="1909 ltsc2019"
+BASE="mcr.microsoft.com/windows/servercore"
+
+IFS=', ' read -r -a osversions <<< "$_WINDOWS_VERSIONS"
+MANIFEST_TAG=${STAGINGIMAGE}:${STAGINGVERSION}
+
+# translate from image tag to docker manifest foler format
+# e.g., gcr.io_k8s-staging-csi_gce-pd-windows-v2
+manifest_folder=$(echo "${MANIFEST_TAG}" | sed "s|/|_|g" | sed "s/:/-/")
+echo ${manifest_folder}
+echo ${#osversions[@]}
+
+for ((i=0;i<${#osversions[@]};++i)); do
+  BASEIMAGE="${BASE}:${osversions[i]}"
+  echo $BASEIIMAGE
+
+  full_version=$(docker manifest inspect ${BASEIMAGE} | grep "os.version" | head -n 1 | awk '{print $2}') || true
+  echo $full_version
+
+  IMAGETAG=${STAGINGIMAGE}-${osversions[i]}:${STAGINGVERSION}
+  image_folder=$(echo "${IMAGETAG}" | sed "s|/|_|g" | sed "s/:/-/")
+  echo ${manifest_folder}
+
+  sed -i -r "s/(\"os\"\:\"windows\")/\0,\"os.version\":$full_version/" \
+  "${HOME}/.docker/manifests/${manifest_folder}/${image_folder}"
+
+done

test/k8s-integration/driver.go

@@ -42,17 +42,6 @@ func installDriver(platform, goPath, pkgDir, stagingImage, stagingVersion, deplo
 		if err != nil {
 			return fmt.Errorf("failed to edit kustomize: %s, err: %v", out, err)
 		}
-		if platform == "windows" {
-			out, err = exec.Command(
-				filepath.Join(pkgDir, "bin", "kustomize"),
-				"edit",
-				"set",
-				"image",
-				fmt.Sprintf("%s-win=%s-win:%s", pdImagePlaceholder, stagingImage, stagingVersion)).CombinedOutput()
-			if err != nil {
-				return fmt.Errorf("failed to edit kustomize: %s, err: %v", out, err)
-			}
-		}
 	}
 
 	var deployEnv []string
@@ -131,22 +120,15 @@ func pushImage(pkgDir, stagingImage, stagingVersion, platform string) error {
 	}
 	var cmd *exec.Cmd
 
-	cmd = exec.Command("make", "-C", pkgDir, "push-container",
+	// build multi-arch image which can work for both Linux and Windows
+	cmd = exec.Command("make", "-C", pkgDir, "build-and-push-multi-arch",
 		fmt.Sprintf("GCE_PD_CSI_STAGING_VERSION=%s", stagingVersion),
 		fmt.Sprintf("GCE_PD_CSI_STAGING_IMAGE=%s", stagingImage))
-	err = runCommand("Pushing GCP Container for Linux", cmd)
+	err = runCommand("Building and Pushing GCP Container for Windows", cmd)
 	if err != nil {
-		return fmt.Errorf("failed to run make command for linux: err: %v", err)
-	}
-	if platform == "windows" {
-		cmd = exec.Command("make", "-C", pkgDir, "build-and-push-windows-container-ltsc2019",
-			fmt.Sprintf("GCE_PD_CSI_STAGING_VERSION=%s", stagingVersion),
-			fmt.Sprintf("GCE_PD_CSI_STAGING_IMAGE=%s-win", stagingImage))
-		err = runCommand("Building and Pushing GCP Container for Windows", cmd)
-		if err != nil {
-			return fmt.Errorf("failed to run make command for windows: err: %v", err)
-		}
+		return fmt.Errorf("failed to run make command for windows: err: %v", err)
 	}
+
 	return nil
 }
 

test/k8s-integration/prepull.yaml

@@ -38,4 +38,4 @@ spec:
         resources:
           requests:
             cpu: 1m
-        command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']
+        command: ['cmd.exe', '/c', 'ping -n 1800 127.0.0.1 >NUL']