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"

deploy/kubernetes/overlays/prow-gke-release-staging-head/increase-sidecar-operation-timeout.yaml

@@ -0,0 +1,12 @@
+# Increase operation timeout for provisioner sidecar.
+- op: add
+  path: /spec/template/spec/containers/0/args/-
+  value: "--timeout=250s"
+# Increase operation timeout for attacher sidecar.
+- op: add
+  path: /spec/template/spec/containers/1/args/-
+  value: "--timeout=250s"
+# Increase operation timeout for snapshotter sidecar.
+- op: add
+  path: /spec/template/spec/containers/3/args/-
+  value: "--timeout=300s"

deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml

@@ -17,3 +17,15 @@ patchesJson6902:
     kind: Deployment
     name: csi-gce-pd-controller
   path: volume-inuse-error-handler.yaml
+- target:
+    group: apps
+    version: v1
+    kind: Deployment
+    name: csi-gce-pd-controller
+  path: increase-sidecar-operation-timeout.yaml
+- target:
+    group: apps
+    version: v1
+    kind: Deployment
+    name: csi-gce-pd-controller
+  path: enable-extra-create-metadata.yaml

deploy/kubernetes/overlays/prow-gke-release-staging-rc/increase-sidecar-operation-timeout.yaml

@@ -0,0 +1,12 @@
+# Increase operation timeout for provisioner sidecar.
+- op: add
+  path: /spec/template/spec/containers/0/args/-
+  value: "--timeout=250s"
+# Increase operation timeout for attacher sidecar.
+- op: add
+  path: /spec/template/spec/containers/1/args/-
+  value: "--timeout=250s"
+# Increase operation timeout for snapshotter sidecar.
+- op: add
+  path: /spec/template/spec/containers/3/args/-
+  value: "--timeout=300s"

deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml

@@ -4,3 +4,10 @@ resources:
 - ../stable
 transformers:
 - ../../images/prow-gke-release-staging-rc
+patchesJson6902:
+- path: increase-sidecar-operation-timeout.yaml
+  target:
+    group: apps
+    kind: Deployment
+    name: csi-gce-pd-controller
+    version: v1

go.mod

@@ -4,15 +4,15 @@ go 1.13
 
 require (
 	cloud.google.com/go v0.45.1
-	github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190612171043-2e19bb35a278
+	github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534
 	github.com/container-storage-interface/spec v1.2.0
 	github.com/golang/protobuf v1.3.4
 	github.com/google/btree v1.0.0 // indirect
 	github.com/google/uuid v1.1.1
 	github.com/hashicorp/go-multierror v1.0.0 // indirect
 	github.com/kubernetes-csi/csi-proxy/client v0.0.0-20200330215040-9eff16441b2a
 	github.com/kubernetes-csi/csi-test/v3 v3.0.0
-	github.com/onsi/ginkgo v1.10.3
+	github.com/onsi/ginkgo v1.11.0
 	github.com/onsi/gomega v1.7.1
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056
@@ -22,9 +22,58 @@ require (
 	google.golang.org/grpc v1.27.1
 	gopkg.in/gcfg.v1 v1.2.3
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	k8s.io/apimachinery v0.17.1
+	k8s.io/apimachinery v0.18.0
 	k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
 	k8s.io/klog v1.0.0
+	k8s.io/kubernetes v1.18.0
 	k8s.io/test-infra v0.0.0-20200115230622-70a5174aa78d
-	k8s.io/utils v0.0.0-20200124190032-861946025e34
+	k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
 )
+
+replace k8s.io/api => k8s.io/api v0.18.0
+
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.18.0
+
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.0
+
+replace k8s.io/apiserver => k8s.io/apiserver v0.18.0
+
+replace k8s.io/client-go => k8s.io/client-go v0.18.0
+
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.0
+
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.0
+
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.0
+
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.0
+
+replace k8s.io/code-generator => k8s.io/code-generator v0.18.0
+
+replace k8s.io/component-base => k8s.io/component-base v0.18.0
+
+replace k8s.io/cri-api => k8s.io/cri-api v0.18.0
+
+replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.0
+
+replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.0
+
+replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.0
+
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.0
+
+replace k8s.io/kubectl => k8s.io/kubectl v0.18.0
+
+replace k8s.io/kubelet => k8s.io/kubelet v0.18.0
+
+replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.0
+
+replace k8s.io/metrics => k8s.io/metrics v0.18.0
+
+replace k8s.io/node-api => k8s.io/node-api v0.18.0
+
+replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.0
+
+replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.18.0
+
+replace k8s.io/sample-controller => k8s.io/sample-controller v0.18.0