Merge pull request #266 from davidz627/feature/kustomizeFix

Fix Kustomize overlay dependencies so that Dev overlay replaces driver image successfully

Author: k8s-ci-robot

Dockerfile

@@ -21,7 +21,7 @@ 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/
 
 # Start from Google Debian base
-FROM gcr.io/google-containers/debian-base-amd64:0.4.0
+FROM gcr.io/google-containers/debian-base-amd64:v1.0.0
 COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver
 
 # Install necessary dependencies

deploy/kubernetes/base/controller.yaml

@@ -16,7 +16,7 @@ spec:
       serviceAccountName: csi-controller-sa
       containers:
         - name: csi-provisioner
-          image: REPLACEME/csi-provisioner
+          image: gcr.io/gke-release/csi-provisioner
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
@@ -25,15 +25,15 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-attacher
-          image: REPLACEME/csi-attacher
+          image: gcr.io/gke-release/csi-attacher
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
         - name: gce-pd-driver
-          image: REPLACEME/gcp-compute-persistent-disk-csi-driver
+          image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
           args:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"

deploy/kubernetes/base/node.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccountName: csi-node-sa
       containers:
         - name: csi-driver-registrar
-          image: REPLACEME/csi-node-driver-registrar
+          image: gcr.io/gke-release/csi-node-driver-registrar
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
@@ -37,7 +37,7 @@ spec:
         - name: gce-pd-driver
           securityContext:
             privileged: true
-          image: REPLACEME/gcp-compute-persistent-disk-csi-driver
+          image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
           args:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"

deploy/kubernetes/overlays/dev/kustomization.yaml

@@ -7,6 +7,6 @@ patches:
 - node_always_pull.yaml
 images:
 # Replace this with your private image names and tags
-- name: REPLACEME/gcp-compute-persistent-disk-csi-driver
+- name: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/REPLACEME/gcp-compute-persistent-disk-csi-driver
   newTag: "latest"

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

@@ -3,15 +3,15 @@ kind: Kustomization
 bases:
 - ../../base
 images:
-- name: REPLACEME/gcp-compute-persistent-disk-csi-driver
+- name: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
   newTag: "latest"
-- name: REPLACEME/csi-provisioner
+- name: gcr.io/gke-release/csi-provisioner
   newName: gcr.io/gke-release-staging/csi-provisioner
   newTag: "latest"
-- name: REPLACEME/csi-attacher
+- name: gcr.io/gke-release/csi-attacher
   newName: gcr.io/gke-release-staging/csi-attacher
   newTag: "latest"
-- name: REPLACEME/csi-node-driver-registrar
+- name: gcr.io/gke-release/csi-node-driver-registrar
   newName: gcr.io/gke-release-staging/csi-node-driver-registrar
   newTag: "latest"

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

@@ -3,15 +3,15 @@ kind: Kustomization
 bases:
 - ../../base
 images:
-- name: REPLACEME/gcp-compute-persistent-disk-csi-driver
+- name: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
   newTag: "v0.4.0-gke.0"
-- name: REPLACEME/csi-provisioner
+- name: gcr.io/gke-release/csi-provisioner
   newName: gcr.io/gke-release-staging/csi-provisioner
   newTag: "v1.1.0-gke.0"
-- name: REPLACEME/csi-attacher
+- name: gcr.io/gke-release/csi-attacher
   newName: gcr.io/gke-release-staging/csi-attacher
   newTag: "v1.1.0-gke.0"
-- name: REPLACEME/csi-node-driver-registrar
+- name: gcr.io/gke-release/csi-node-driver-registrar
   newName: gcr.io/gke-release-staging/csi-node-driver-registrar
   newTag: "v1.1.0-gke.0"

deploy/kubernetes/overlays/stable/kustomization.yaml

@@ -3,15 +3,15 @@ kind: Kustomization
 bases:
 - ../../base
 images:
-- name: REPLACEME/gcp-compute-persistent-disk-csi-driver
+- name: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
   newTag: "v0.4.0-gke.0"
-- name: REPLACEME/csi-provisioner
+- name: gcr.io/gke-release/csi-provisioner
   newName: gcr.io/gke-release/csi-provisioner
   newTag: "v1.1.0-gke.0"
-- name: REPLACEME/csi-attacher
+- name: gcr.io/gke-release/csi-attacher
   newName: gcr.io/gke-release/csi-attacher
   newTag: "v1.1.0-gke.0"
-- name: REPLACEME/csi-node-driver-registrar
+- name: gcr.io/gke-release/csi-node-driver-registrar
   newName: gcr.io/gke-release/csi-node-driver-registrar
   newTag: "v1.1.0-gke.0"

test/k8s-integration/main.go

@@ -57,7 +57,7 @@ var (
 )
 
 const (
-	pdImagePlaceholder = "REPLACEME/gcp-compute-persistent-disk-csi-driver"
+	pdImagePlaceholder = "gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver"
 	k8sBuildBinDir     = "_output/dockerized/bin/linux/amd64"
 )
 

test/run-k8s-integration-local.sh

@@ -11,16 +11,16 @@ ensure_var GCE_PD_SA_DIR
 
 make -C ${PKGDIR} test-k8s-integration
 
-${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=false \
---staging-image=${GCE_PD_CSI_STAGING_IMAGE} --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
---deploy-overlay-name=dev --storageclass-file=sc-standard.yaml \
---test-focus="External.Storage" --gce-zone="us-central1-b"
+# ${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=false \
+# --staging-image=${GCE_PD_CSI_STAGING_IMAGE} --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
+# --deploy-overlay-name=dev --storageclass-file=sc-standard.yaml \
+# --test-focus="External.Storage" --gce-zone="us-central1-b"
 
 # This version of the command does not build the driver or K8s, points to a
 # local K8s repo to get the e2e.test binary, and does not bring up or down the cluster
 #
-# ${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=false \
-# --staging-image=${GCE_PD_CSI_STAGING_IMAGE} --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
-# --deploy-overlay-name=dev --bringup-cluster=false --teardown-cluster=false --local-k8s-dir=$KTOP \
-# --storageclass-file=sc-standard.yaml --do-driver-build=false  --test-focus="External.Storage.*multiVolume" \
-# --gce-zone="us-central1-b"
+${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=false \
+--staging-image=${GCE_PD_CSI_STAGING_IMAGE} --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
+--deploy-overlay-name=dev --bringup-cluster=false --teardown-cluster=false --local-k8s-dir=$KTOP \
+--storageclass-file=sc-standard.yaml --do-driver-build=true  --test-focus="External.Storage" \
+--gce-zone="us-central1-b"