Merge pull request #713 from jingxu97/feb/overlay

k8s-ci-robot · web-flow · commit 5e15e45c515c · 2021-02-18T10:12:52.000-08:00
Add Windows jobs for stable-1.18, 1.19 and master
diff --git a/deploy/kubernetes/images/stable-1-18/image.yaml b/deploy/kubernetes/images/stable-1-18/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"
 ---
diff --git a/deploy/kubernetes/images/stable-1-19/image.yaml b/deploy/kubernetes/images/stable-1-19/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"
 ---
diff --git a/deploy/kubernetes/images/stable-master/image.yaml b/deploy/kubernetes/images/stable-master/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"
 ---
diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-18/kustomization.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-18/kustomization.yaml
@@ -3,6 +3,6 @@ kind: Kustomization
 namespace:
   gce-pd-csi-driver
 resources:
-- ../../base
+- ../stable-1-18
 transformers:
 - ../../images/prow-gke-release-staging-rc-1-18
diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-19/kustomization.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-19/kustomization.yaml
@@ -3,6 +3,6 @@ kind: Kustomization
 namespace:
   gce-pd-csi-driver
 resources:
-- ../../base
+- ../stable-1-19
 transformers:
 - ../../images/prow-gke-release-staging-rc-1-19
diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc-master/kustomization.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc-master/kustomization.yaml
@@ -3,6 +3,6 @@ kind: Kustomization
 namespace:
   gce-pd-csi-driver
 resources:
-- ../../base
+- ../stable-master
 transformers:
 - ../../images/prow-gke-release-staging-rc-master
diff --git a/deploy/kubernetes/overlays/stable-1-18/kustomization.yaml b/deploy/kubernetes/overlays/stable-1-18/kustomization.yaml
@@ -3,9 +3,6 @@ kind: Kustomization
 namespace:
   gce-pd-csi-driver
 resources:
-- ../../base/controller
-- ../../base/node_linux
-patchesStrategicMerge:
-- no_win_roles.yaml
+- ../../base
 transformers:
 - ../../images/stable-1-18
diff --git a/deploy/kubernetes/overlays/stable-1-18/no_win_roles.yaml b/deploy/kubernetes/overlays/stable-1-18/no_win_roles.yaml
diff --git a/deploy/kubernetes/overlays/stable-1-19/kustomization.yaml b/deploy/kubernetes/overlays/stable-1-19/kustomization.yaml
@@ -3,9 +3,6 @@ kind: Kustomization
 namespace:
   gce-pd-csi-driver
 resources:
-- ../../base/controller
-- ../../base/node_linux
-patchesStrategicMerge:
-- no_win_roles.yaml
+- ../../base/
 transformers:
 - ../../images/stable-1-19
diff --git a/deploy/kubernetes/overlays/stable-1-19/no_win_roles.yaml b/deploy/kubernetes/overlays/stable-1-19/no_win_roles.yaml
diff --git a/deploy/kubernetes/overlays/stable-master/kustomization.yaml b/deploy/kubernetes/overlays/stable-master/kustomization.yaml
@@ -3,9 +3,6 @@ kind: Kustomization
 namespace:
   gce-pd-csi-driver
 resources:
-- ../../base/controller
-- ../../base/node_linux
-patchesStrategicMerge:
-- no_win_roles.yaml
+- ../../base
 transformers:
 - ../../images/stable-master
diff --git a/deploy/kubernetes/overlays/stable-master/no_win_roles.yaml b/deploy/kubernetes/overlays/stable-master/no_win_roles.yaml
diff --git a/test/run-k8s-windows-migration.sh b/test/run-k8s-windows-migration.sh
@@ -12,7 +12,7 @@ set -o errexit
 export GCE_PD_VERBOSITY=9
 readonly PKGDIR=${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
 
-readonly overlay_name="${GCE_PD_OVERLAY_NAME:-stable}"
+readonly overlay_name="${GCE_PD_OVERLAY_NAME:-stable-master}"
 readonly boskos_resource_type="${GCE_PD_BOSKOS_RESOURCE_TYPE:-gce-project}"
 readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
 readonly deployment_strategy=${DEPLOYMENT_STRATEGY:-gce}
diff --git a/test/run-windows-k8s-integration.sh b/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:-stable}"
+readonly overlay_name="${GCE_PD_OVERLAY_NAME:-stable-master}"
 readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
 readonly deployment_strategy=${DEPLOYMENT_STRATEGY:-gce}
 readonly test_version=${TEST_VERSION:-master}
