Merge branch 'master' into shared-pd

Author: nikhilkathare

Dockerfile

@@ -14,11 +14,10 @@
 
 
 
-FROM golang:1.13.4-alpine3.10 as builder
+FROM golang:1.13.4 as builder
 WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
 ADD . .
-ARG TAG
-RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-X main.vendorVersion='"${TAG:-latest}"' -extldflags "-static"' -o bin/gce-pd-csi-driver ./cmd/
+RUN make
 
 # MAD HACKS: Build a version first so we can take the scsi_id bin and put it somewhere else in our real build
 FROM gcr.io/google-containers/debian-base-amd64:v2.0.0 as base

Dockerfile.Windows

@@ -1,9 +1,17 @@
 ARG BASE_IMAGE
 ARG BASE_IMAGE_TAG
+FROM --platform=$BUILDPLATFORM golang:1.13.3 AS builder
+
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+ARG STAGINGVERSION
+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 mcr.microsoft.com/windows/${BASE_IMAGE}:${BASE_IMAGE_TAG}
 LABEL description="PD CSI driver"
-COPY bin/gce-pd-csi-driver.exe /gce-pd-csi-driver.exe
+COPY --from=builder /code/bin/gce-pd-csi-driver.exe /gce-pd-csi-driver.exe
 
 USER ContainerAdministrator
 ENTRYPOINT ["/gce-pd-csi-driver.exe"]

Makefile

@@ -24,14 +24,14 @@ STAGINGIMAGE=${GCE_PD_CSI_STAGING_IMAGE}
 DRIVERBINARY=gce-pd-csi-driver
 DRIVERWINDOWSBINARY=${DRIVERBINARY}.exe
 
-all: gce-pd-driver
+all: gce-pd-driver gce-pd-driver-windows
 gce-pd-driver:
 	mkdir -p bin
-	go build -ldflags "-X main.vendorVersion=${STAGINGVERSION}" -o bin/${DRIVERBINARY} ./cmd/
+	go build -mod=vendor -ldflags "-X main.vendorVersion=${STAGINGVERSION}" -o bin/${DRIVERBINARY} ./cmd/
 
 gce-pd-driver-windows:
 	mkdir -p bin
-	GOOS=windows go build -ldflags -X=main.vendorVersion=$(STAGINGVERSION) -o bin/${DRIVERWINDOWSBINARY} ./cmd/
+	GOOS=windows go build -mod=vendor -ldflags -X=main.vendorVersion=$(STAGINGVERSION) -o bin/${DRIVERWINDOWSBINARY} ./cmd/
 
 build-container:
 ifndef GCE_PD_CSI_STAGING_IMAGE
@@ -45,22 +45,22 @@ ifndef GCE_PD_CSI_STAGING_IMAGE
 endif
 	@sh init-buildx.sh; \
 	DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --file=Dockerfile.Windows --platform=windows \
-	-t $(STAGINGIMAGE):$(STAGINGVERSION) --build-arg BASE_IMAGE=servercore --build-arg BASE_IMAGE_TAG=ltsc2019 --push .
+	-t $(STAGINGIMAGE):$(STAGINGVERSION) --build-arg BASE_IMAGE=servercore --build-arg BASE_IMAGE_TAG=ltsc2019 --build-arg STAGINGVERSION=$(STAGINGVERSION) --push .
 
 build-and-push-windows-container-1909:
 ifndef GCE_PD_CSI_STAGING_IMAGE
 	$(error "Must set environment variable GCE_PD_CSI_STAGING_IMAGE to staging image repository")
 endif
 	@sh init-buildx.sh; \
 	DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --file=Dockerfile.Windows --platform=windows \
-	-t $(STAGINGIMAGE):$(STAGINGVERSION) --build-arg BASE_IMAGE=servercore --build-arg BASE_IMAGE_TAG=1909 --push .
+	-t $(STAGINGIMAGE):$(STAGINGVERSION) --build-arg BASE_IMAGE=servercore --build-arg BASE_IMAGE_TAG=1909 --build-arg STAGINGVERSION=$(STAGINGVERSION) --push .
 
 push-container: build-container
 	gcloud docker -- push $(STAGINGIMAGE):$(STAGINGVERSION)
 
 test-sanity: gce-pd-driver
-	go test -v -timeout 30s sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/sanity -run ^TestSanity$
+	go test -mod=vendor --v -timeout 30s sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/sanity -run ^TestSanity$
 
 test-k8s-integration:
-	go build -o bin/k8s-integration-test ./test/k8s-integration
+	go build -mod=vendor -o bin/k8s-integration-test ./test/k8s-integration
 

OWNERS

@@ -1,11 +1,15 @@
 reviewers:
-  - msau42
   - davidz627
+  - jingxu97
+  - mattcary
+  - msau42
   - saad-ali
+  - saikat-royc
   - verult
-  - jingxu97
 approvers:
   - davidz627
-  - saad-ali
+  - mattcary
   - msau42
+  - saad-ali
+  - saikat-royc
   - verult

deploy/kubernetes/base/controller/cluster_setup.yaml

@@ -272,4 +272,3 @@ roleRef:
   kind: Role
   name: csi-gce-pd-leaderelection-role
   apiGroup: rbac.authorization.k8s.io
-

deploy/kubernetes/base/controller/csidriver_info.yaml

@@ -0,0 +1,8 @@
+#### TODO: This need to be updated to v1 once we official support 1.18+
+apiVersion: storage.k8s.io/v1beta1
+kind: CSIDriver
+metadata:
+  name: pd.csi.storage.gke.io
+spec:
+  attachRequired: true
+  podInfoOnMount: false

deploy/kubernetes/base/controller/kustomization.yaml

@@ -5,3 +5,4 @@ namespace:
 resources:
 - cluster_setup.yaml
 - controller.yaml
+- csidriver_info.yaml

deploy/kubernetes/images/alpha/image.yaml

@@ -4,8 +4,8 @@ metadata:
   name: imagetag-gcepd-driver-alpha-win
 imageTag:
   name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver-win
-  newName: gcr.io/jing-k8s-dev/gce-pd-windows-2019
-  newTag: "0.2.0"
+  newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver-amd64-windows-1909
+  newTag: "cca3c14"
 ---
 
 apiVersion: builtin

deploy/kubernetes/overlays/alpha/kustomization.yaml

@@ -1,7 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace:
-  gce-pd-csi-driver
+namespace: gce-pd-csi-driver
 resources:
 - ../../base/
 transformers:

deploy/kubernetes/overlays/prow-gke-release-staging-head/enable-extra-create-metadata.yaml

@@ -0,0 +1,4 @@
+# Enable extra-create-metadata flag for external-provisioner
+- op: add
+  path: /spec/template/spec/containers/0/args/-
+  value: "--extra-create-metadata"