Skip to content

Commit a93b479

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #266 from davidz627/feature/kustomizeFix
Fix Kustomize overlay dependencies so that Dev overlay replaces driver image successfully
2 parents 9df5fe3 + 0857457 commit a93b479

File tree

9 files changed

+29
-29
lines changed

9 files changed

+29
-29
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ARG TAG
2121
RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-X main.vendorVersion='"${TAG:-latest}"' -extldflags "-static"' -o bin/gce-pd-csi-driver ./cmd/
2222

2323
# Start from Google Debian base
24-
FROM gcr.io/google-containers/debian-base-amd64:0.4.0
24+
FROM gcr.io/google-containers/debian-base-amd64:v1.0.0
2525
COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver
2626

2727
# Install necessary dependencies

‎deploy/kubernetes/base/controller.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
serviceAccountName: csi-controller-sa
1717
containers:
1818
- name: csi-provisioner
19-
image: REPLACEME/csi-provisioner
19+
image: gcr.io/gke-release/csi-provisioner
2020
args:
2121
- "--v=5"
2222
- "--csi-address=/csi/csi.sock"
@@ -25,15 +25,15 @@ spec:
2525
- name: socket-dir
2626
mountPath: /csi
2727
- name: csi-attacher
28-
image: REPLACEME/csi-attacher
28+
image: gcr.io/gke-release/csi-attacher
2929
args:
3030
- "--v=5"
3131
- "--csi-address=/csi/csi.sock"
3232
volumeMounts:
3333
- name: socket-dir
3434
mountPath: /csi
3535
- name: gce-pd-driver
36-
image: REPLACEME/gcp-compute-persistent-disk-csi-driver
36+
image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
3737
args:
3838
- "--v=5"
3939
- "--endpoint=unix:/csi/csi.sock"

‎deploy/kubernetes/base/node.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
serviceAccountName: csi-node-sa
1616
containers:
1717
- name: csi-driver-registrar
18-
image: REPLACEME/csi-node-driver-registrar
18+
image: gcr.io/gke-release/csi-node-driver-registrar
1919
args:
2020
- "--v=5"
2121
- "--csi-address=/csi/csi.sock"
@@ -37,7 +37,7 @@ spec:
3737
- name: gce-pd-driver
3838
securityContext:
3939
privileged: true
40-
image: REPLACEME/gcp-compute-persistent-disk-csi-driver
40+
image: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
4141
args:
4242
- "--v=5"
4343
- "--endpoint=unix:/csi/csi.sock"

‎deploy/kubernetes/overlays/dev/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ patches:
77
- node_always_pull.yaml
88
images:
99
# Replace this with your private image names and tags
10-
- name: REPLACEME/gcp-compute-persistent-disk-csi-driver
10+
- name: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
1111
newName: gcr.io/REPLACEME/gcp-compute-persistent-disk-csi-driver
1212
newTag: "latest"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: Kustomization
33
bases:
44
- ../../base
55
images:
6-
- name: REPLACEME/gcp-compute-persistent-disk-csi-driver
6+
- name: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
77
newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
88
newTag: "latest"
9-
- name: REPLACEME/csi-provisioner
9+
- name: gcr.io/gke-release/csi-provisioner
1010
newName: gcr.io/gke-release-staging/csi-provisioner
1111
newTag: "latest"
12-
- name: REPLACEME/csi-attacher
12+
- name: gcr.io/gke-release/csi-attacher
1313
newName: gcr.io/gke-release-staging/csi-attacher
1414
newTag: "latest"
15-
- name: REPLACEME/csi-node-driver-registrar
15+
- name: gcr.io/gke-release/csi-node-driver-registrar
1616
newName: gcr.io/gke-release-staging/csi-node-driver-registrar
1717
newTag: "latest"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: Kustomization
33
bases:
44
- ../../base
55
images:
6-
- name: REPLACEME/gcp-compute-persistent-disk-csi-driver
6+
- name: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
77
newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
88
newTag: "v0.4.0-gke.0"
9-
- name: REPLACEME/csi-provisioner
9+
- name: gcr.io/gke-release/csi-provisioner
1010
newName: gcr.io/gke-release-staging/csi-provisioner
1111
newTag: "v1.1.0-gke.0"
12-
- name: REPLACEME/csi-attacher
12+
- name: gcr.io/gke-release/csi-attacher
1313
newName: gcr.io/gke-release-staging/csi-attacher
1414
newTag: "v1.1.0-gke.0"
15-
- name: REPLACEME/csi-node-driver-registrar
15+
- name: gcr.io/gke-release/csi-node-driver-registrar
1616
newName: gcr.io/gke-release-staging/csi-node-driver-registrar
1717
newTag: "v1.1.0-gke.0"

‎deploy/kubernetes/overlays/stable/kustomization.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: Kustomization
33
bases:
44
- ../../base
55
images:
6-
- name: REPLACEME/gcp-compute-persistent-disk-csi-driver
6+
- name: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
77
newName: gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver
88
newTag: "v0.4.0-gke.0"
9-
- name: REPLACEME/csi-provisioner
9+
- name: gcr.io/gke-release/csi-provisioner
1010
newName: gcr.io/gke-release/csi-provisioner
1111
newTag: "v1.1.0-gke.0"
12-
- name: REPLACEME/csi-attacher
12+
- name: gcr.io/gke-release/csi-attacher
1313
newName: gcr.io/gke-release/csi-attacher
1414
newTag: "v1.1.0-gke.0"
15-
- name: REPLACEME/csi-node-driver-registrar
15+
- name: gcr.io/gke-release/csi-node-driver-registrar
1616
newName: gcr.io/gke-release/csi-node-driver-registrar
1717
newTag: "v1.1.0-gke.0"

‎test/k8s-integration/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var (
5757
)
5858

5959
const (
60-
pdImagePlaceholder = "REPLACEME/gcp-compute-persistent-disk-csi-driver"
60+
pdImagePlaceholder = "gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver"
6161
k8sBuildBinDir = "_output/dockerized/bin/linux/amd64"
6262
)
6363

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ ensure_var GCE_PD_SA_DIR
1111

1212
make -C ${PKGDIR} test-k8s-integration
1313

14-
${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=false \
15-
--staging-image=${GCE_PD_CSI_STAGING_IMAGE} --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
16-
--deploy-overlay-name=dev --storageclass-file=sc-standard.yaml \
17-
--test-focus="External.Storage" --gce-zone="us-central1-b"
14+
# ${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=false \
15+
# --staging-image=${GCE_PD_CSI_STAGING_IMAGE} --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
16+
# --deploy-overlay-name=dev --storageclass-file=sc-standard.yaml \
17+
# --test-focus="External.Storage" --gce-zone="us-central1-b"
1818

1919
# This version of the command does not build the driver or K8s, points to a
2020
# local K8s repo to get the e2e.test binary, and does not bring up or down the cluster
2121
#
22-
# ${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=false \
23-
# --staging-image=${GCE_PD_CSI_STAGING_IMAGE} --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
24-
# --deploy-overlay-name=dev --bringup-cluster=false --teardown-cluster=false --local-k8s-dir=$KTOP \
25-
# --storageclass-file=sc-standard.yaml --do-driver-build=false --test-focus="External.Storage.*multiVolume" \
26-
# --gce-zone="us-central1-b"
22+
${PKGDIR}/bin/k8s-integration-test --kube-version=master --run-in-prow=false \
23+
--staging-image=${GCE_PD_CSI_STAGING_IMAGE} --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
24+
--deploy-overlay-name=dev --bringup-cluster=false --teardown-cluster=false --local-k8s-dir=$KTOP \
25+
--storageclass-file=sc-standard.yaml --do-driver-build=true --test-focus="External.Storage" \
26+
--gce-zone="us-central1-b"

0 commit comments

Comments
 (0)