Merge pull request #701 from jingxu97/feb/stable

Move Windows deployment to stable overlay

Author: k8s-ci-robot

deploy/kubernetes/base/node_windows/node.yaml

@@ -6,11 +6,11 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: gcp-compute-persistent-disk-csi-driver-win
+      app: gcp-compute-persistent-disk-csi-driver
   template:
     metadata:
       labels:
-        app: gcp-compute-persistent-disk-csi-driver-win
+        app: gcp-compute-persistent-disk-csi-driver
     spec:
       # Host network must be used for interaction with Workload Identity in GKE
       # since it replaces GCE Metadata Server with GKE Metadata Server. Remove
@@ -24,7 +24,7 @@ spec:
         kubernetes.io/os: windows
       containers:
         - name: csi-driver-registrar
-          image: gke.gcr.io/k8s-staging-csi/csi-node-driver-registrar-win
+          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar
           args:
             - --v=5
             - --csi-address=unix://C:\\csi\\csi.sock
@@ -47,26 +47,20 @@ spec:
           args:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"
+            - "--run-controller-service=false"
           volumeMounts:
             - name: kubelet-dir
               mountPath: C:\var\lib\kubelet
               mountPropagation: "None"
             - name: plugin-dir
               mountPath: C:\csi
-            # TODO: check overlay and remove v1beta1 if it is safe
-            - name: csi-proxy-disk-v1beta1
-              mountPath: \\.\pipe\csi-proxy-disk-v1beta1
             - name: csi-proxy-volume-v1beta1
               mountPath: \\.\pipe\csi-proxy-volume-v1beta1
             - name: csi-proxy-filesystem-v1beta1
               mountPath: \\.\pipe\csi-proxy-filesystem-v1beta1
             - name: csi-proxy-disk-v1beta2
               mountPath: \\.\pipe\csi-proxy-disk-v1beta2
       volumes:
-      - name: csi-proxy-disk-v1beta1
-        hostPath:
-          path: \\.\pipe\csi-proxy-disk-v1beta1
-          type: ""
       - name: csi-proxy-disk-v1beta2
         hostPath:
           path: \\.\pipe\csi-proxy-disk-v1beta2

deploy/kubernetes/images/alpha/image.yaml

@@ -4,15 +4,13 @@ metadata:
   name: imagetag-gcepd-driver-alpha-win
 imageTag:
   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"
+  newTag: "v1.2.0-gke.8"
 ---
 
 apiVersion: builtin
 kind: ImageTagTransformer
 metadata:
   name: imagetag-node-registrar-win
 imageTag:
-  name: gke.gcr.io/k8s-staging-csi/csi-node-driver-registrar-win
-  newName: gcr.io/k8s-staging-csi/csi-node-driver-registrar
-  newTag: "amd64-windows-canary"
+  name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+  newTag: "v2.1.0"

deploy/kubernetes/images/stable/image.yaml

@@ -51,5 +51,5 @@ imageTag:
   name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
   # Don't change stable image without changing pdImagePlaceholder in
   # test/k8s-integration/main.go
-  newTag: "v1.2.0-gke.0"
+  newTag: "v1.2.0-gke.8"
 ---

deploy/kubernetes/overlays/stable/kustomization.yaml

@@ -3,7 +3,6 @@ kind: Kustomization
 namespace:
   gce-pd-csi-driver
 resources:
-- ../../base/controller
-- ../../base/node_linux
+- ../../base/
 transformers:
 - ../../images/stable

test/run-windows-k8s-integration.sh

@@ -10,7 +10,7 @@ set -o nounset
 set -o errexit
 
 readonly PKGDIR=${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
-readonly overlay_name="${GCE_PD_OVERLAY_NAME:-alpha}"
+readonly overlay_name="${GCE_PD_OVERLAY_NAME:-stable}"
 readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
 readonly deployment_strategy=${DEPLOYMENT_STRATEGY:-gce}
 readonly test_version=${TEST_VERSION:-master}