Skip to content

Commit cc0f542

Browse files
committed
Update dev overlay so that image overwrite can work
In current dev overlay, kustomization will not work well with image setting (overwriting) Modify the structure to fix it.
1 parent ac63d0f commit cc0f542

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

deploy/kubernetes/overlays/dev/kustomization.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
3-
resources:
4-
- ../alpha
53
patchesStrategicMerge:
64
- controller_always_pull.yaml
75
- node_always_pull.yaml
86
namespace: gce-pd-csi-driver
7+
resources:
8+
- ../../base/
9+
# Here dev overlay is using the same image as alpha
10+
transformers:
11+
- ../../images/alpha
912
# To change the dev image, add something like the following.
1013
#images:
1114
#- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- ../dev
4+
- ../../base/
5+
# Here noauth overlay is using the same image as alpha
6+
transformers:
7+
- ../../images/alpha
58
patchesStrategicMerge:
69
- noauth.yaml
710
namespace: gce-pd-csi-driver
11+
# To change the dev image, add something like the following.
12+
#images:
13+
#- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
14+
# newName: gcr.io/mattcary-gke-dev-owned/csi/gce-pd-driver
15+
# newTag: latest.

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:-dev}"
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)