Skip to content

Commit 5e15e45

Browse files
authored
Merge pull request #713 from jingxu97/feb/overlay
Add Windows jobs for stable-1.18, 1.19 and master
2 parents 8dbeb48 + ea6cf3f commit 5e15e45

File tree

14 files changed

+11
-71
lines changed

14 files changed

+11
-71
lines changed

deploy/kubernetes/images/stable-1-18/image.yaml

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

deploy/kubernetes/images/stable-1-19/image.yaml

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

deploy/kubernetes/images/stable-master/image.yaml

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ kind: Kustomization
33
namespace:
44
gce-pd-csi-driver
55
resources:
6-
- ../../base
6+
- ../stable-1-18
77
transformers:
88
- ../../images/prow-gke-release-staging-rc-1-18

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ kind: Kustomization
33
namespace:
44
gce-pd-csi-driver
55
resources:
6-
- ../../base
6+
- ../stable-1-19
77
transformers:
88
- ../../images/prow-gke-release-staging-rc-1-19

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ kind: Kustomization
33
namespace:
44
gce-pd-csi-driver
55
resources:
6-
- ../../base
6+
- ../stable-master
77
transformers:
88
- ../../images/prow-gke-release-staging-rc-master

deploy/kubernetes/overlays/stable-1-18/kustomization.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ kind: Kustomization
33
namespace:
44
gce-pd-csi-driver
55
resources:
6-
- ../../base/controller
7-
- ../../base/node_linux
8-
patchesStrategicMerge:
9-
- no_win_roles.yaml
6+
- ../../base
107
transformers:
118
- ../../images/stable-1-18

deploy/kubernetes/overlays/stable-1-18/no_win_roles.yaml

-17
This file was deleted.

deploy/kubernetes/overlays/stable-1-19/kustomization.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ kind: Kustomization
33
namespace:
44
gce-pd-csi-driver
55
resources:
6-
- ../../base/controller
7-
- ../../base/node_linux
8-
patchesStrategicMerge:
9-
- no_win_roles.yaml
6+
- ../../base/
107
transformers:
118
- ../../images/stable-1-19

deploy/kubernetes/overlays/stable-1-19/no_win_roles.yaml

-17
This file was deleted.

deploy/kubernetes/overlays/stable-master/kustomization.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ kind: Kustomization
33
namespace:
44
gce-pd-csi-driver
55
resources:
6-
- ../../base/controller
7-
- ../../base/node_linux
8-
patchesStrategicMerge:
9-
- no_win_roles.yaml
6+
- ../../base
107
transformers:
118
- ../../images/stable-master

deploy/kubernetes/overlays/stable-master/no_win_roles.yaml

-17
This file was deleted.

test/run-k8s-windows-migration.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set -o errexit
1212
export GCE_PD_VERBOSITY=9
1313
readonly PKGDIR=${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
1414

15-
readonly overlay_name="${GCE_PD_OVERLAY_NAME:-stable}"
15+
readonly overlay_name="${GCE_PD_OVERLAY_NAME:-stable-master}"
1616
readonly boskos_resource_type="${GCE_PD_BOSKOS_RESOURCE_TYPE:-gce-project}"
1717
readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
1818
readonly deployment_strategy=${DEPLOYMENT_STRATEGY:-gce}

test/run-windows-k8s-integration.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -o nounset
1010
set -o errexit
1111

1212
readonly PKGDIR=${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
13-
readonly overlay_name="${GCE_PD_OVERLAY_NAME:-stable}"
13+
readonly overlay_name="${GCE_PD_OVERLAY_NAME:-stable-master}"
1414
readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
1515
readonly deployment_strategy=${DEPLOYMENT_STRATEGY:-gce}
1616
readonly test_version=${TEST_VERSION:-master}

0 commit comments

Comments
 (0)