Skip to content

Commit b533c40

Browse files
authored
Merge pull request #407 from davidz627/feature/resizer
Bump resizer to v0.3.0
2 parents 01a3ba2 + 7ac6434 commit b533c40

File tree

9 files changed

+70
-68
lines changed

9 files changed

+70
-68
lines changed

README.md

+12-10
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ This plugin is compatible with CSI versions [v1.1.0](https://github.com/containe
3232

3333
### Kubernetes Compatibility
3434

35-
| GCE PD CSI Driver\Kubernetes Version | 1.10.5 - 1.11 | 1.12 | 1.13 | 1.14 | 1.15+|
36-
|--------------------------------------|---------------|------|------|------|------|
37-
| v0.1.x.alpha | yes | no | no | no | no |
38-
| v0.2.x (alpha) | no | yes | no | no | no |
39-
| v0.3.x (beta) | no | no | yes | yes | yes |
40-
| v0.4.x (beta) | no | no | yes | yes | yes |
41-
| v0.5.x (beta) | no | no | no | yes | yes |
42-
| v0.6.x (beta) | no | no | no | yes | yes |
43-
| dev | no | no | no | yes | yes |
35+
| GCE PD CSI Driver\Kubernetes Version | 1.10.5 - 1.11 | 1.12 | 1.13 | 1.14 | 1.15 | 1.16+ |
36+
|--------------------------------------|---------------|------|------|------|------|-------|
37+
| v0.1.x.alpha | yes | no | no | no | no | no |
38+
| v0.2.x (alpha) | no | yes | no | no | no | no |
39+
| v0.3.x (beta) | no | no | yes | yes | yes | yes |
40+
| v0.4.x (beta) | no | no | yes | yes | yes | yes |
41+
| v0.5.x (beta) | no | no | no | yes | yes | yes |
42+
| v0.6.x (beta) | no | no | no | yes | yes | yes |
43+
| dev | no | no | no | no | no | yes |
4444

4545
### Known Issues
4646

@@ -67,7 +67,9 @@ that represents availability by zone.
6767
|-----------------|-------|-------------------------------|------------------------------|--------------------|--------------------|
6868
| Topology | Beta | 1.14 | 1.14 | v0.5.0 | Stable |
6969
| Snapshots | Alpha | 1.13 | Any | v0.3.0 | Alpha |
70-
| Resize (Expand) | Alpha | 1.14 | 1.14 | dev | Alpha |
70+
| Resize (Expand) | Alpha | 1.14 | 1.14 | v0.6.0 | Alpha |
71+
| Resize (Expand) | Beta | 1.16 | 1.16 | dev | Stable |
72+
7173

7274
### Future Features
7375

deploy/kubernetes/base/controller.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@ spec:
3333
volumeMounts:
3434
- name: socket-dir
3535
mountPath: /csi
36+
- name: csi-resizer
37+
image: gke.gcr.io/csi-resizer
38+
args:
39+
- "--v=5"
40+
- "--csi-address=/csi/csi.sock"
41+
volumeMounts:
42+
- name: socket-dir
43+
mountPath: /csi
3644
- name: gce-pd-driver
3745
# Don't change base image without changing pdImagePlaceholder in
3846
# test/k8s-integration/main.go

deploy/kubernetes/base/setup-cluster.yaml

+34
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,37 @@ metadata:
104104
value: 900001000
105105
globalDefault: false
106106
description: "This priority class should be used for the GCE PD CSI driver node deployment only."
107+
108+
---
109+
110+
# Resizer must be able to work with PVCs, PVs, SCs.
111+
kind: ClusterRole
112+
apiVersion: rbac.authorization.k8s.io/v1
113+
metadata:
114+
name: csi-gce-pd-resizer-role
115+
rules:
116+
- apiGroups: [""]
117+
resources: ["persistentvolumes"]
118+
verbs: ["get", "list", "watch", "update", "patch"]
119+
- apiGroups: [""]
120+
resources: ["persistentvolumeclaims"]
121+
verbs: ["get", "list", "watch"]
122+
- apiGroups: [""]
123+
resources: ["persistentvolumeclaims/status"]
124+
verbs: ["update", "patch"]
125+
- apiGroups: [""]
126+
resources: ["events"]
127+
verbs: ["list", "watch", "create", "update", "patch"]
128+
129+
---
130+
kind: ClusterRoleBinding
131+
apiVersion: rbac.authorization.k8s.io/v1
132+
metadata:
133+
name: csi-gce-pd-resizer-binding
134+
subjects:
135+
- kind: ServiceAccount
136+
name: csi-gce-pd-controller-sa
137+
roleRef:
138+
kind: ClusterRole
139+
name: csi-gce-pd-resizer-role
140+
apiGroup: rbac.authorization.k8s.io

deploy/kubernetes/overlays/alpha/controller_add_resizer.yaml

-17
This file was deleted.

deploy/kubernetes/overlays/alpha/kustomization.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ bases:
44
- ../stable
55
patches:
66
- controller_add_snapshotter.yaml
7-
- controller_add_resizer.yaml
87
patchesJson6902:
98
- target:
109
group: rbac.authorization.k8s.io
@@ -14,8 +13,6 @@ patchesJson6902:
1413
path: rbac_add_snapshots_to_provisioner.yaml
1514
resources:
1615
- rbac_add_snapshotter.yaml
17-
- rbac_add_resizer.yaml
18-
1916
# Reapplying namespace transformer to include newly added RBAC rules.
2017
namespace:
2118
gce-pd-csi-driver

deploy/kubernetes/overlays/alpha/rbac_add_resizer.yaml

-31
This file was deleted.

deploy/kubernetes/overlays/stable/kustomization.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@ images:
1717
- name: gke.gcr.io/csi-node-driver-registrar
1818
newName: gke.gcr.io/csi-node-driver-registrar
1919
newTag: "v1.2.0-gke.0"
20+
- name: gke.gcr.io/csi-resizer
21+
newName: gke.gcr.io/csi-resizer
22+
newTag: "v0.3.0-gke.0"

docs/kubernetes/user-guides/resize.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Kubernetes Resize User Guide (Alpha)
1+
# Kubernetes Resize User Guide
22

3-
>**Attention:** Volume Resize is an alpha feature. Make sure you have enabled it in Kubernetes API server using `--feature-gates=ExpandCSIVolumes=true` flag.
3+
>**Attention:** Volume Resize is a Kubernetes Beta feature enabled by default in 1.16+.
44
>**Attention:** Volume Resize is only available in the driver version v0.6.0+
55
66
### Install Driver with alpha resize feature
@@ -18,7 +18,7 @@ $ ./deploy/setup-project.sh
1818

1919
```
2020
$ GCE_PD_SA_DIR=/my/safe/credentials/directory # Directory to get the service account key
21-
$ GCE_PD_DRIVER_VERSION=alpha # Driver version to deploy
21+
$ GCE_PD_DRIVER_VERSION=stable # Driver version to deploy
2222
$ ./deploy/kubernetes/deploy-driver.sh
2323
```
2424

test/k8s-integration/config/test-config-template.in

+10-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,19 @@ DriverInfo:
1313
# ntfs: NTFS only available on Windows
1414
Capabilities:
1515
persistence: true
16-
multipods: true
16+
block: true
1717
fsGroup: true
1818
exec: true
19-
block: true
19+
# snapshotDataSource:
20+
# pvcDataSource:
21+
multipods: true
22+
# RWX:
23+
controllerExpansion: true
24+
nodeExpansion: true
25+
# volumeLimits: # PD Supports volume limits but test is very slow
26+
# singleNodeVolume:
2027
topology: true
21-
# dataSource: true
22-
# RWX: true
28+
# dataSource:
2329
SupportedMountOption:
2430
debug:
2531
nouid32:

0 commit comments

Comments
 (0)