Skip to content

Commit d5e7f0c

Browse files
amacaskillamacaskill
authored
Merge pull request #1869 from travisyx/revert-1861-automated-cherry-pick-of-#1826-#1836-#1838-#1841-upstream-release-1.15
Revert "Automated cherry pick of #1826: Add ControllerModifyVolume E2E tests#1836: Create documentation for ControllerModifyVolume and controller default#1838: Enable VolumeAttributesClass feature gate for CI runs#1841: Update logic to use SI for VACs"
2 parents caa3eae + 48fc6f4 commit d5e7f0c

File tree

16 files changed

+151
-331
lines changed

16 files changed

+151
-331
lines changed

‎deploy/kubernetes/base/controller/controller.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@ spec:
141141
args:
142142
- "--v=5"
143143
- "--endpoint=unix:/csi/csi.sock"
144-
- "--supports-dynamic-iops-provisioning=hyperdisk-balanced,hyperdisk-extreme"
145-
- "--supports-dynamic-throughput-provisioning=hyperdisk-balanced,hyperdisk-throughput,hyperdisk-ml"
146144
env:
147145
- name: GOOGLE_APPLICATION_CREDENTIALS
148146
value: "/etc/cloud-sa/cloud-sa.json"

‎deploy/kubernetes/images/prow-stable-sidecar-rc-master/image.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,39 @@ metadata:
77
name: imagetag-csi-provisioner-prow-rc
88
imageTag:
99
name: registry.k8s.io/sig-storage/csi-provisioner
10-
newTag: "v5.1.0"
10+
newTag: "v3.4.0"
1111
---
1212
apiVersion: builtin
1313
kind: ImageTagTransformer
1414
metadata:
1515
name: imagetag-csi-attacher-prow-rc
1616
imageTag:
1717
name: registry.k8s.io/sig-storage/csi-attacher
18-
newTag: "v4.4.3"
18+
newTag: "v4.2.0"
1919
---
2020
apiVersion: builtin
2121
kind: ImageTagTransformer
2222
metadata:
2323
name: imagetag-csi-resize-prow-rc
2424
imageTag:
2525
name: registry.k8s.io/sig-storage/csi-resizer
26-
newTag: "v1.11.1"
26+
newTag: "v1.7.0"
2727
---
2828
apiVersion: builtin
2929
kind: ImageTagTransformer
3030
metadata:
3131
name: imagetag-csi-snapshotter-prow-head
3232
imageTag:
3333
name: registry.k8s.io/sig-storage/csi-snapshotter
34-
newTag: "v6.3.3"
34+
newTag: "v6.1.0"
3535
---
3636
apiVersion: builtin
3737
kind: ImageTagTransformer
3838
metadata:
3939
name: imagetag-csi-node-registrar-prow-rc
4040
imageTag:
4141
name: registry.k8s.io/sig-storage/csi-node-driver-registrar
42-
newTag: "v2.9.3"
42+
newTag: "v2.7.0"
4343
---
4444
apiVersion: builtin
4545
kind: ImageTagTransformer
@@ -48,6 +48,6 @@ metadata:
4848
imageTag:
4949
name: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver
5050
newName: gcr.io/k8s-staging-cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver
51-
newTag: "v1.15.0-rc1"
51+
newTag: "v1.14.2-rc1"
5252
---
5353

‎deploy/kubernetes/overlays/dev/driver-args.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
- op: add
2+
path: /spec/template/spec/containers/0/args/-
3+
value: --supports-dynamic-throughput-provisioning=hyperdisk-balanced,hyperdisk-throughput,hyperdisk-ml
4+
5+
- op: add
6+
path: /spec/template/spec/containers/0/args/-
7+
value: --supports-dynamic-iops-provisioning=hyperdisk-balanced,hyperdisk-extreme

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

+8
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ resources:
99
# Here dev overlay is using the same image as alpha
1010
transformers:
1111
- ../../images/stable-master
12+
# Apply patches to support dynamic provisioning for hyperdisks
13+
patches:
14+
- path: ./driver-args.yaml
15+
target:
16+
group: apps
17+
version: v1
18+
kind: Deployment
19+
name: csi-gce-pd-controller
1220
# To change the dev image, add something like the following.
1321
#images:
1422
#- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver

‎docs/kubernetes/user-guides/volume-attributes-class.md

-41
This file was deleted.

‎examples/kubernetes/demo-vol-create.yaml

-59
This file was deleted.

‎examples/kubernetes/demo-vol-update.yaml

-12
This file was deleted.

‎examples/kubernetes/demo-vol-update.yml

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
apiVersion: storage.k8s.io/v1beta1
2+
kind: VolumeAttributesClass
3+
metadata:
4+
name: silver
5+
driverName: pd.csi.storage.gke.io
6+
parameters:
7+
throughput: "350"
8+
iops: "6000"
9+
---
10+
apiVersion: storage.k8s.io/v1beta1
11+
kind: VolumeAttributesClass
12+
metadata:
13+
name: gold
14+
driverName: pd.csi.storage.gke.io
15+
parameters:
16+
throughput: "550"
17+
iops: "15000"
18+
---
19+
apiVersion: storage.k8s.io/v1
20+
kind: StorageClass
21+
metadata:
22+
name: balanced
23+
provisioner: pd.csi.storage.gke.io
24+
allowVolumeExpansion: true
25+
volumeBindingMode: WaitForFirstConsumer
26+
parameters:
27+
type: hyperdisk-balanced
28+
provisioned-throughput-on-create: "300Mi"
29+
provisioned-iops-on-create: "5000"
30+
---
31+
apiVersion: storage.k8s.io/v1
32+
kind: StorageClass
33+
metadata:
34+
name: throughput-optimized
35+
provisioner: pd.csi.storage.gke.io
36+
volumeBindingMode: WaitForFirstConsumer
37+
allowVolumeExpansion: true
38+
parameters:
39+
type: hyperdisk-balanced
40+
provisioned-throughput-on-create: "500Mi"
41+
provisioned-iops-on-create: "10000"
42+
43+
---
44+
apiVersion: v1
45+
kind: PersistentVolumeClaim
46+
metadata:
47+
name: balanced-pvc
48+
spec:
49+
volumeAttributesClassName: silver
50+
storageClassName: balanced
51+
accessModes:
52+
- ReadWriteOnce
53+
resources:
54+
requests:
55+
storage: 256Gi
56+
---
57+
apiVersion: v1
58+
kind: PersistentVolumeClaim
59+
metadata:
60+
name: throughput-optimized-pvc
61+
spec:
62+
volumeAttributesClassName: silver
63+
storageClassName: throughput-optimized
64+
accessModes:
65+
- ReadWriteOnce
66+
resources:
67+
requests:
68+
storage: 256Gi
69+
---
70+
kind: Pod
71+
apiVersion: v1
72+
metadata:
73+
name: pod-demo
74+
spec:
75+
volumes:
76+
- name: pvc-demo-vol
77+
persistentVolumeClaim:
78+
claimName: balanced-pvc
79+
- name: data-vol
80+
persistentVolumeClaim:
81+
claimName: throughput-optimized-pvc
82+
containers:
83+
- name: pod-demo
84+
image: nginx:latest
85+
resources:
86+
limits:
87+
cpu: 10m
88+
memory: 80Mi
89+
requests:
90+
cpu: 10m
91+
memory: 80Mi
92+
ports:
93+
- containerPort: 80
94+
name: "http-server"
95+
volumeMounts:
96+
- mountPath: "/usr/share/nginx/html"
97+
name: pvc-demo-vol
98+
- mountPath: "/data"
99+
name: data-vol

‎pkg/common/parameters.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ func ExtractModifyVolumeParameters(parameters map[string]string) (ModifyVolumePa
343343
}
344344
modifyVolumeParams.IOPS = &iops
345345
case "throughput":
346-
throughput, err := ConvertMiStringToInt64(value)
346+
throughput, err := ConvertStringToInt64(value)
347347
if err != nil {
348348
return ModifyVolumeParameters{}, fmt.Errorf("parameters contain invalid throughput parameter: %w", err)
349349
}

‎pkg/common/parameters_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ func TestSnapshotParameters(t *testing.T) {
485485
func TestExtractModifyVolumeParameters(t *testing.T) {
486486
parameters := map[string]string{
487487
"iops": "1000",
488-
"throughput": "500Mi",
488+
"throughput": "500",
489489
}
490490

491491
iops := int64(1000)

‎pkg/gce-pd-csi-driver/controller_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -1789,7 +1789,7 @@ func TestCreateVolumeWithVolumeAttributeClassParameters(t *testing.T) {
17891789
},
17901790
},
17911791
},
1792-
MutableParameters: map[string]string{"iops": "20000", "throughput": "600Mi"},
1792+
MutableParameters: map[string]string{"iops": "20000", "throughput": "600"},
17931793
},
17941794
expIops: 20000,
17951795
expThroughput: 600,
@@ -1822,7 +1822,7 @@ func TestCreateVolumeWithVolumeAttributeClassParameters(t *testing.T) {
18221822
},
18231823
},
18241824
},
1825-
MutableParameters: map[string]string{"iops": "20000", "throughput": "600Mi"},
1825+
MutableParameters: map[string]string{"iops": "20000", "throughput": "600"},
18261826
},
18271827
expIops: 0,
18281828
expThroughput: 0,
@@ -1890,7 +1890,7 @@ func TestVolumeModifyOperation(t *testing.T) {
18901890
name: "Update volume with valid parameters",
18911891
req: &csi.ControllerModifyVolumeRequest{
18921892
VolumeId: testVolumeID,
1893-
MutableParameters: map[string]string{"iops": "20000", "throughput": "600Mi"},
1893+
MutableParameters: map[string]string{"iops": "20000", "throughput": "600"},
18941894
},
18951895
diskType: "hyperdisk-balanced",
18961896
params: &common.DiskParameters{
@@ -1906,7 +1906,7 @@ func TestVolumeModifyOperation(t *testing.T) {
19061906
name: "Update volume with invalid parameters",
19071907
req: &csi.ControllerModifyVolumeRequest{
19081908
VolumeId: testVolumeID,
1909-
MutableParameters: map[string]string{"iops": "0", "throughput": "0Mi"},
1909+
MutableParameters: map[string]string{"iops": "0", "throughput": "0"},
19101910
},
19111911
diskType: "hyperdisk-balanced",
19121912
params: &common.DiskParameters{
@@ -1922,7 +1922,7 @@ func TestVolumeModifyOperation(t *testing.T) {
19221922
name: "Update volume with valid parameters but invalid disk type",
19231923
req: &csi.ControllerModifyVolumeRequest{
19241924
VolumeId: testVolumeID,
1925-
MutableParameters: map[string]string{"iops": "20000", "throughput": "600Mi"},
1925+
MutableParameters: map[string]string{"iops": "20000", "throughput": "600"},
19261926
},
19271927
diskType: "pd-ssd",
19281928
params: &common.DiskParameters{
@@ -2053,7 +2053,7 @@ func TestVolumeModifyErrorHandling(t *testing.T) {
20532053
},
20542054
},
20552055
modifyReq: &csi.ControllerModifyVolumeRequest{
2056-
MutableParameters: map[string]string{"iops": "3001", "throughput": "151Mi"},
2056+
MutableParameters: map[string]string{"iops": "3001", "throughput": "151"},
20572057
},
20582058
modifyVolumeErrors: map[*meta.Key]error{
20592059
meta.ZonalKey(name, "us-central1-a"): &googleapi.Error{
@@ -2089,7 +2089,7 @@ func TestVolumeModifyErrorHandling(t *testing.T) {
20892089
},
20902090
},
20912091
modifyReq: &csi.ControllerModifyVolumeRequest{
2092-
MutableParameters: map[string]string{"iops": "10000", "throughput": "2400Mi"},
2092+
MutableParameters: map[string]string{"iops": "10000", "throughput": "2400"},
20932093
},
20942094
modifyVolumeErrors: map[*meta.Key]error{
20952095
meta.ZonalKey(name, "us-central1-a"): &googleapi.Error{Code: int(codes.InvalidArgument), Message: "InvalidArgument"},

0 commit comments

Comments
 (0)