Skip to content

Commit c8aa168

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #714 from saikat-royc/overlays
Switch the integration scripts and deploy driver scripts default overlays
2 parents 5e15e45 + bf5f092 commit c8aa168

File tree

8 files changed

+25
-22
lines changed

8 files changed

+25
-22
lines changed

‎deploy/kubernetes/README.md

+17-14
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,21 @@
44

55
The current structure for kustomization is as follows. Note that Windows support is currently an alpha feature.
66

7-
* `base`: it contains the setup that is common to different driver versions.
8-
* `controller_setup`: includes cluster setup and controller yaml files.
7+
* `base`: It contains the setup that is common to different driver versions.
8+
* `controller_setup`: Includes cluster setup and controller yaml files.
99
* `node_setup`:
10-
* Linux: includes node yaml file and related setting that is only applicable for Linux.
11-
* Windows: includes node yaml file and related setting that is only applicable for Windows.
12-
* `images`: it has a list of images for different versions.
13-
* `stable`: image list of a stable driver release. Currently only has image list for Linux stable version.
14-
* `alpha`: image list containing features in development, in addition to images in stable. It also includes Windows images.
15-
* `dev`: based on alpha, and also contains the developer's image for use in driver development.
16-
* `prow-gke-release-xxx`: image list used for Prow tests. Currently only Linux is supported.
17-
* `overlays`: it has the version-specific setup. Each overlay corresponds to image lists with the matching name.
18-
* `stable`: contains deployment specs of a stable driver release. Currently only Linux is supported.
19-
* `alpha`: contains deployment specs for features in development. Both Linux and Windows are supported.
20-
* `dev`: based on alpha, and also contains the developer's specs for use in driver development.
21-
* `prow-gke-release-xxx`: based on stable, and contains specs for Prow tests. Currently only Linux is supported.
10+
* Linux: Includes node yaml file and related setting that is only applicable for Linux.
11+
* Windows: Includes node yaml file and related setting that is only applicable for Windows.
12+
* `images`: It has a list of images for different versions.
13+
* `stable-master`: Image list of a stable driver for latest k8s master.
14+
* `alpha`: Image list containing features in development, in addition to images in `stable-master`. It also includes Windows images.
15+
* `prow-gke-release-xxx`: Image list used for Prow tests.
16+
* `overlays`: It has the k8s minor version-specific driver manifest bundle.
17+
* `stable-master`: Contains deployment specs of a stable driver for k8s master.
18+
* `stable-{k8s-minor}`: Contains deployment specs of a stable driver for given k8s minor version release.
19+
* `alpha`: Contains deployment specs for features in development. Both Linux and Windows are supported.
20+
* `dev`: Based on alpha, and also contains the developer's specs for use in driver development.
21+
* `prow-gke-release-staging-rc-master`: Used for prow tests. Contains deployment specs of a driver for latest k8s master.
22+
* `prow-gke-release-staging-rc-{k8s-minor}`: Used for prow tests. Contains deployment specs of a driver for given k8s minor version release.
23+
* `prow-gke-release-staging-rc-head`: Used for prow tests. Contains deployment specs of a driver with latest sidecar images, for latest k8s master.
24+
* `stable`, `prow-gke-release-staging-rc`: Soon to be removed!

‎deploy/kubernetes/delete-driver.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
#
66
# Args:
77
# GCE_PD_DRIVER_VERSION: The kustomize overlay to deploy (located under
8-
# deploy/kubernetes/overlays). Can be one of {stable, dev}
8+
# deploy/kubernetes/overlays).
99

1010
set -o nounset
1111
set -o errexit
1212

1313
readonly NAMESPACE="${GCE_PD_DRIVER_NAMESPACE:-gce-pd-csi-driver}"
14-
readonly DEPLOY_VERSION="${GCE_PD_DRIVER_VERSION:-stable}"
14+
readonly DEPLOY_VERSION="${GCE_PD_DRIVER_VERSION:-stable-master}"
1515
readonly PKGDIR="${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver"
1616
source "${PKGDIR}/deploy/common.sh"
1717

‎deploy/kubernetes/deploy-driver.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -o errexit
1818
set -x
1919

2020
readonly NAMESPACE="${GCE_PD_DRIVER_NAMESPACE:-gce-pd-csi-driver}"
21-
readonly DEPLOY_VERSION="${GCE_PD_DRIVER_VERSION:-stable}"
21+
readonly DEPLOY_VERSION="${GCE_PD_DRIVER_VERSION:-stable-master}"
2222
readonly PKGDIR="${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver"
2323
source "${PKGDIR}/deploy/common.sh"
2424

‎deploy/kubernetes/images/alpha/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
namespace:
22
gce-pd-csi-driver
33
resources:
4-
- ../stable/
4+
- ../stable-master/
55
- image.yaml

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- ../stable
4+
- ../stable-master
55
transformers:
66
- ../../images/prow-gke-release-staging-head

‎test/run-k8s-integration-ci.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 boskos_resource_type="${GCE_PD_BOSKOS_RESOURCE_TYPE:-gce-project}"
1515
readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
1616
readonly deployment_strategy=${DEPLOYMENT_STRATEGY:-gce}

‎test/run-k8s-integration-migration.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export GCE_PD_VERBOSITY=9
1313

1414
readonly PKGDIR=${GOPATH}/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
1515

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

‎test/run-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 boskos_resource_type="${GCE_PD_BOSKOS_RESOURCE_TYPE:-gce-project}"
1515
readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
1616
readonly deployment_strategy=${DEPLOYMENT_STRATEGY:-gce}

0 commit comments

Comments
 (0)