Skip to content

Commit 7a715d0

Browse files
committed
Update docs/stable overlay to reference new release
Update docs and stable overlay to reference new release (1.1.0). Move leader election and volume in use patches to base overlay. Switch sidecar images to k8s.gcr.io/sig-storage/ and gcr.io/k8s-staging-sig-storage
1 parent 53e8abd commit 7a715d0

File tree

11 files changed

+42
-102
lines changed

11 files changed

+42
-102
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ lifecycle of Google Compute Engine Persistent Disks.
1212
## Project Status
1313

1414
Status: GA
15-
Latest stable image: `gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v1.0.1-gke.0`
15+
Latest stable image: `gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v1.1.0-gke.0`
1616

1717
### Test Status
1818

deploy/kubernetes/base/controller/controller.yaml

+9-8
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ spec:
2323
priorityClassName: csi-gce-pd-controller
2424
containers:
2525
- name: csi-provisioner
26-
image: gke.gcr.io/csi-provisioner
26+
image: k8s.gcr.io/sig-storage/csi-provisioner
2727
args:
2828
- "--v=5"
2929
- "--csi-address=/csi/csi.sock"
3030
- "--feature-gates=Topology=true"
3131
- "--metrics-address=:22011"
32-
- "--enable-leader-election"
33-
- "--leader-election-type=leases"
3432
- "--leader-election-namespace=$(PDCSI_NAMESPACE)"
3533
- "--timeout=250s"
3634
- "--extra-create-metadata"
37-
# - "--run-controller-service=false" # disable the controller service of the CSI driver
38-
# - "--run-node-service=false" # disable the node service of the CSI driver
35+
# - "--run-controller-service=false" # disable the controller service of the CSI driver
36+
# - "--run-node-service=false" # disable the node service of the CSI driver
37+
- "--leader-election"
38+
- "--default-fstype=ext4"
3939
env:
4040
- name: PDCSI_NAMESPACE
4141
valueFrom:
@@ -45,7 +45,7 @@ spec:
4545
- name: socket-dir
4646
mountPath: /csi
4747
- name: csi-attacher
48-
image: gke.gcr.io/csi-attacher
48+
image: k8s.gcr.io/sig-storage/csi-attacher
4949
args:
5050
- "--v=5"
5151
- "--csi-address=/csi/csi.sock"
@@ -62,13 +62,14 @@ spec:
6262
- name: socket-dir
6363
mountPath: /csi
6464
- name: csi-resizer
65-
image: gke.gcr.io/csi-resizer
65+
image: k8s.gcr.io/sig-storage/csi-resizer
6666
args:
6767
- "--v=5"
6868
- "--csi-address=/csi/csi.sock"
6969
- "--metrics-address=:22013"
7070
- "--leader-election"
7171
- "--leader-election-namespace=$(PDCSI_NAMESPACE)"
72+
- "--handle-volume-inuse-error=false"
7273
env:
7374
- name: PDCSI_NAMESPACE
7475
valueFrom:
@@ -78,7 +79,7 @@ spec:
7879
- name: socket-dir
7980
mountPath: /csi
8081
- name: csi-snapshotter
81-
image: gke.gcr.io/csi-snapshotter
82+
image: k8s.gcr.io/sig-storage/csi-snapshotter
8283
args:
8384
- "--v=5"
8485
- "--csi-address=/csi/csi.sock"

deploy/kubernetes/base/node_linux/node.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
kubernetes.io/os: linux
2424
containers:
2525
- name: csi-driver-registrar
26-
image: gke.gcr.io/csi-node-driver-registrar
26+
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar
2727
args:
2828
- "--v=5"
2929
- "--csi-address=/csi/csi.sock"

deploy/kubernetes/images/prow-gke-release-staging-head/image.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ kind: ImageTagTransformer
1212
metadata:
1313
name: imagetag-csi-provisioner-prow-head
1414
imageTag:
15-
name: gke.gcr.io/csi-provisioner
16-
newName: quay.io/k8scsi/csi-provisioner
15+
name: k8s.gcr.io/sig-storage/csi-provisioner
16+
newName: gcr.io/k8s-staging-sig-storage/csi-provisioner
1717
newTag: "canary"
1818

1919
---
@@ -22,8 +22,8 @@ kind: ImageTagTransformer
2222
metadata:
2323
name: imagetag-csi-attacher-prow-head
2424
imageTag:
25-
name: gke.gcr.io/csi-attacher
26-
newName: quay.io/k8scsi/csi-attacher
25+
name: k8s.gcr.io/sig-storage/csi-attacher
26+
newName: gcr.io/k8s-staging-sig-storage/csi-attacher
2727
newTag: "canary"
2828
---
2929

@@ -32,8 +32,8 @@ kind: ImageTagTransformer
3232
metadata:
3333
name: imagetag-csi-nodo-registrar-prow-head
3434
imageTag:
35-
name: gke.gcr.io/csi-node-driver-registrar
36-
newName: quay.io/k8scsi/csi-node-driver-registrar
35+
name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
36+
newName: gcr.io/k8s-staging-sig-storage/csi-node-driver-registrar
3737
newTag: "canary"
3838
---
3939

@@ -42,8 +42,8 @@ kind: ImageTagTransformer
4242
metadata:
4343
name: imagetag-csi-resizer-prow-head
4444
imageTag:
45-
name: gke.gcr.io/csi-resizer
46-
newName: quay.io/k8scsi/csi-resizer
45+
name: k8s.gcr.io/sig-storage/csi-resizer
46+
newName: gcr.io/k8s-staging-sig-storage/csi-resizer
4747
newTag: "canary"
4848
---
4949

@@ -52,6 +52,6 @@ kind: ImageTagTransformer
5252
metadata:
5353
name: imagetag-csi-snapshotter-prow-head
5454
imageTag:
55-
name: gke.gcr.io/csi-snapshotter
56-
newName: quay.io/k8scsi/csi-snapshotter
55+
name: k8s.gcr.io/sig-storage/csi-snapshotter
56+
newName: gcr.io/k8s-staging-sig-storage/csi-snapshotter
5757
newTag: "canary"

deploy/kubernetes/images/prow-gke-release-staging-rc/image.yaml

+10-15
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,26 @@ kind: ImageTagTransformer
33
metadata:
44
name: imagetag-csi-provisioner-prow-rc
55
imageTag:
6-
name: gke.gcr.io/csi-provisioner
7-
newName: gcr.io/gke-release-staging/csi-provisioner
8-
newTag: "v2.0.3-gke.0"
6+
name: k8s.gcr.io/sig-storage/csi-provisioner
7+
newTag: "v2.0.4"
98
---
109

1110
apiVersion: builtin
1211
kind: ImageTagTransformer
1312
metadata:
1413
name: imagetag-csi-attacher-prow-rc
1514
imageTag:
16-
name: gke.gcr.io/csi-attacher
17-
newName: gcr.io/gke-release-staging/csi-attacher
18-
newTag: "v3.0.1-gke.0"
15+
name: k8s.gcr.io/sig-storage/csi-attacher
16+
newTag: "v3.0.1"
1917
---
2018

2119
apiVersion: builtin
2220
kind: ImageTagTransformer
2321
metadata:
2422
name: imagetag-csi-resize-prow-rc
2523
imageTag:
26-
name: gke.gcr.io/csi-resizer
27-
newName: gcr.io/gke-release-staging/csi-resizer
28-
newTag: "v1.0.1-gke.0"
24+
name: k8s.gcr.io/sig-storage/csi-resizer
25+
newTag: "v1.0.1"
2926
---
3027

3128
apiVersion: builtin
@@ -43,18 +40,16 @@ kind: ImageTagTransformer
4340
metadata:
4441
name: imagetag-csi-node-registrar-prow-rc
4542
imageTag:
46-
name: gke.gcr.io/csi-node-driver-registrar
47-
newName: gcr.io/gke-release-staging/csi-node-driver-registrar
48-
newTag: "v1.3.0-gke.0"
43+
name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
44+
newTag: "v2.0.1"
4945
---
5046

5147
apiVersion: builtin
5248
kind: ImageTagTransformer
5349
metadata:
5450
name: imagetag-csi-snapshotter-prow-head
5551
imageTag:
56-
name: gke.gcr.io/csi-snapshotter
57-
newName: gcr.io/gke-release-staging/csi-snapshotter
58-
newTag: "v3.0.1-gke.0"
52+
name: k8s.gcr.io/sig-storage/csi-snapshotter
53+
newTag: "v3.0.1"
5954
---
6055

deploy/kubernetes/images/stable/image.yaml

+11-11
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,44 @@ kind: ImageTagTransformer
33
metadata:
44
name: imagetag-csi-provisioner
55
imageTag:
6-
name: gke.gcr.io/csi-provisioner
7-
newTag: "v1.6.0-gke.0"
6+
name: k8s.gcr.io/sig-storage/csi-provisioner
7+
newTag: "v2.0.4"
88

99
---
1010
apiVersion: builtin
1111
kind: ImageTagTransformer
1212
metadata:
1313
name: imagetag-csi-attacher
1414
imageTag:
15-
name: gke.gcr.io/csi-attacher
16-
newTag: "v2.2.0-gke.0"
15+
name: k8s.gcr.io/sig-storage/csi-attacher
16+
newTag: "v3.0.1"
1717
---
1818

1919
apiVersion: builtin
2020
kind: ImageTagTransformer
2121
metadata:
2222
name: imagetag-csi-resizer
2323
imageTag:
24-
name: gke.gcr.io/csi-resizer
25-
newTag: "v0.5.0-gke.0"
24+
name: k8s.gcr.io/sig-storage/csi-resizer
25+
newTag: "v1.0.1"
2626
---
2727

2828
apiVersion: builtin
2929
kind: ImageTagTransformer
3030
metadata:
3131
name: imagetag-csi-snapshotter
3232
imageTag:
33-
name: gke.gcr.io/csi-snapshotter
34-
newTag: "v2.1.1-gke.0"
33+
name: k8s.gcr.io/sig-storage/csi-snapshotter
34+
newTag: "v3.0.1"
3535
---
3636

3737
apiVersion: builtin
3838
kind: ImageTagTransformer
3939
metadata:
4040
name: imagetag-csi-node-registrar
4141
imageTag:
42-
name: gke.gcr.io/csi-node-driver-registrar
43-
newTag: "v1.3.0-gke.0"
42+
name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
43+
newTag: "v2.0.1"
4444
---
4545

4646
apiVersion: builtin
@@ -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.0.0-gke.0"
54+
newTag: "v1.1.0-gke.0"
5555
---

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

-13
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,3 @@ resources:
44
- ../stable
55
transformers:
66
- ../../images/prow-gke-release-staging-head
7-
patchesJson6902:
8-
- target:
9-
group: apps
10-
version: v1
11-
kind: Deployment
12-
name: csi-gce-pd-controller
13-
path: leader-election-flag.yaml
14-
- target:
15-
group: apps
16-
version: v1
17-
kind: Deployment
18-
name: csi-gce-pd-controller
19-
path: volume-inuse-error-handler.yaml

deploy/kubernetes/overlays/prow-gke-release-staging-head/leader-election-flag.yaml

-9
This file was deleted.

deploy/kubernetes/overlays/prow-gke-release-staging-head/volume-inuse-error-handler.yaml

-3
This file was deleted.

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

-7
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,3 @@ resources:
44
- ../stable
55
transformers:
66
- ../../images/prow-gke-release-staging-rc
7-
patchesJson6902:
8-
- target:
9-
group: apps
10-
version: v1
11-
kind: Deployment
12-
name: csi-gce-pd-controller
13-
path: sidecar-upgrade.yaml

deploy/kubernetes/overlays/prow-gke-release-staging-rc/sidecar-upgrade.yaml

-24
This file was deleted.

0 commit comments

Comments
 (0)