Skip to content

Commit cc2fea0

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1243 from sunnylovestiramisu/automated-cherry-pick-of-#1079-#1101-#1128-upstream-release-1.7
Automated cherry pick of #1079: Add provisionedIops for pd-extreme #1128: Change iops params directly convert string to int64
2 parents 8075e3d + f7ca8dd commit cc2fea0

File tree

1,040 files changed

+541997
-234495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,040 files changed

+541997
-234495
lines changed

‎README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,14 @@ See Github [Issues](https://github.com/kubernetes-sigs/gcp-compute-persistent-di
5858

5959
### CreateVolume Parameters
6060

61-
| Parameter | Values | Default | Description |
62-
|------------------|---------------------------|---------------|----------------------------------------------------------------------------------------------------|
63-
| type | Any PD type (see [GCP documentation](https://cloud.google.com/compute/docs/disks#disk-types)), eg `pd-ssd` `pd-balanced` | `pd-standard` | Type allows you to choose between standard Persistent Disks or Solid State Drive Persistent Disks |
64-
| replication-type | `none` OR `regional-pd` | `none` | Replication type allows you to choose between Zonal Persistent Disks or Regional Persistent Disks |
65-
| disk-encryption-kms-key | Fully qualified resource identifier for the key to use to encrypt new disks. | Empty string. | Encrypt disk using Customer Managed Encryption Key (CMEK). See [GKE Docs](https://cloud.google.com/kubernetes-engine/docs/how-to/using-cmek#create_a_cmek_protected_attached_disk) for details. |
66-
| labels | `key1=value1,key2=value2` | | Labels allow you to assign custom [GCE Disk labels](https://cloud.google.com/compute/docs/labeling-resources). |
61+
| Parameter | Values | Default | Description |
62+
|-----------------------------|---------------------------|---------------|----------------------------------------------------------------------------------------------------|
63+
| type | Any PD type (see [GCP documentation](https://cloud.google.com/compute/docs/disks#disk-types)), eg `pd-ssd` `pd-balanced` | `pd-standard` | Type allows you to choose between standard Persistent Disks or Solid State Drive Persistent Disks |
64+
| replication-type | `none` OR `regional-pd` | `none` | Replication type allows you to choose between Zonal Persistent Disks or Regional Persistent Disks |
65+
| disk-encryption-kms-key | Fully qualified resource identifier for the key to use to encrypt new disks. | Empty string. | Encrypt disk using Customer Managed Encryption Key (CMEK). See [GKE Docs](https://cloud.google.com/kubernetes-engine/docs/how-to/using-cmek#create_a_cmek_protected_attached_disk) for details. |
66+
| labels | `key1=value1,key2=value2` | | Labels allow you to assign custom [GCE Disk labels](https://cloud.google.com/compute/docs/labeling-resources). |
67+
| provisioned-iops-on-create | string (int64 format). Values typically between 10,000 and 120,000 | | Indicates how many IOPS to provision for the disk. See the [Extreme persistent disk documentation](https://cloud.google.com/compute/docs/disks/extreme-persistent-disk) for details, including valid ranges for IOPS. |
68+
6769

6870
### Topology
6971

‎go.mod

Lines changed: 54 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,76 +3,87 @@ module sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
33
go 1.17
44

55
require (
6-
cloud.google.com/go v0.65.0
7-
github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317
6+
cloud.google.com/go/compute/metadata v0.2.3
7+
cloud.google.com/go/kms v1.14.0
8+
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.0
89
github.com/container-storage-interface/spec v1.5.0
9-
github.com/golang/protobuf v1.5.2
10-
github.com/google/uuid v1.1.2
10+
github.com/golang/protobuf v1.5.3
11+
github.com/google/uuid v1.3.0
1112
github.com/kubernetes-csi/csi-proxy/client v1.0.0
1213
github.com/kubernetes-csi/csi-test/v4 v4.2.0
1314
github.com/onsi/ginkgo v1.14.2
1415
github.com/onsi/gomega v1.10.4
15-
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
16-
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
17-
google.golang.org/api v0.34.0
18-
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c
19-
google.golang.org/grpc v1.38.0
16+
golang.org/x/oauth2 v0.8.0
17+
golang.org/x/sys v0.8.0
18+
google.golang.org/api v0.126.0
19+
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc
20+
google.golang.org/grpc v1.55.0
21+
google.golang.org/protobuf v1.30.0
2022
gopkg.in/gcfg.v1 v1.2.3
21-
gopkg.in/warnings.v0 v0.1.2 // indirect
22-
k8s.io/apimachinery v0.22.0
23+
k8s.io/apimachinery v0.24.3
2324
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
24-
k8s.io/component-base v0.22.0
25-
k8s.io/klog/v2 v2.60.1
25+
k8s.io/cloud-provider v0.22.0
26+
k8s.io/component-base v0.24.2
27+
k8s.io/klog/v2 v2.80.1
2628
k8s.io/kubernetes v1.22.0
2729
k8s.io/mount-utils v0.22.0
28-
k8s.io/test-infra v0.0.0-20200115230622-70a5174aa78d
29-
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
30+
k8s.io/utils v0.0.0-20230711102312-30195339c3c7
31+
sigs.k8s.io/boskos v0.0.0-20230524062849-a7ef97ee445d
3032
)
3133

3234
require (
33-
github.com/Microsoft/go-winio v0.4.16 // indirect
35+
cloud.google.com/go/compute v1.19.3 // indirect
36+
cloud.google.com/go/iam v1.1.0 // indirect
37+
github.com/Microsoft/go-winio v0.5.1 // indirect
3438
github.com/beorn7/perks v1.0.1 // indirect
3539
github.com/blang/semver v3.5.1+incompatible // indirect
36-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
40+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3741
github.com/davecgh/go-spew v1.1.1 // indirect
38-
github.com/fsnotify/fsnotify v1.4.9 // indirect
39-
github.com/go-logr/logr v1.2.0 // indirect
42+
github.com/fsnotify/fsnotify v1.5.1 // indirect
43+
github.com/go-logr/logr v1.2.2 // indirect
4044
github.com/gogo/protobuf v1.3.2 // indirect
4145
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
42-
github.com/google/go-cmp v0.5.5 // indirect
43-
github.com/google/gofuzz v1.1.0 // indirect
44-
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
46+
github.com/google/go-cmp v0.5.9 // indirect
47+
github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea // indirect
48+
github.com/google/s2a-go v0.1.4 // indirect
49+
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
50+
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
4551
github.com/googleapis/gnostic v0.5.5 // indirect
46-
github.com/hashicorp/errwrap v1.0.0 // indirect
47-
github.com/hashicorp/go-multierror v1.0.0 // indirect
48-
github.com/imdario/mergo v0.3.8 // indirect
49-
github.com/json-iterator/go v1.1.11 // indirect
52+
github.com/hashicorp/errwrap v1.1.0 // indirect
53+
github.com/hashicorp/go-multierror v1.1.1 // indirect
54+
github.com/imdario/mergo v0.3.12 // indirect
55+
github.com/json-iterator/go v1.1.12 // indirect
5056
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
5157
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
52-
github.com/modern-go/reflect2 v1.0.1 // indirect
58+
github.com/modern-go/reflect2 v1.0.2 // indirect
5359
github.com/nxadm/tail v1.4.5 // indirect
5460
github.com/pkg/errors v0.9.1 // indirect
55-
github.com/prometheus/client_golang v1.11.1 // indirect
61+
github.com/prometheus/client_golang v1.12.1 // indirect
5662
github.com/prometheus/client_model v0.2.0 // indirect
57-
github.com/prometheus/common v0.26.0 // indirect
58-
github.com/prometheus/procfs v0.6.0 // indirect
59-
github.com/sirupsen/logrus v1.8.1 // indirect
63+
github.com/prometheus/common v0.32.1 // indirect
64+
github.com/prometheus/procfs v0.7.3 // indirect
65+
github.com/sirupsen/logrus v1.9.0 // indirect
6066
github.com/spf13/pflag v1.0.5 // indirect
61-
go.opencensus.io v0.22.4 // indirect
62-
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
63-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
64-
golang.org/x/text v0.3.6 // indirect
65-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
66-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
67-
google.golang.org/appengine v1.6.6 // indirect
68-
google.golang.org/protobuf v1.26.0 // indirect
67+
go.opencensus.io v0.24.0 // indirect
68+
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
69+
golang.org/x/crypto v0.9.0 // indirect
70+
golang.org/x/net v0.10.0 // indirect
71+
golang.org/x/term v0.8.0 // indirect
72+
golang.org/x/text v0.9.0 // indirect
73+
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
74+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
75+
google.golang.org/appengine v1.6.7 // indirect
76+
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
77+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
6978
gopkg.in/inf.v0 v0.9.1 // indirect
7079
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
80+
gopkg.in/warnings.v0 v0.1.2 // indirect
7181
gopkg.in/yaml.v2 v2.4.0 // indirect
72-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
73-
k8s.io/api v0.22.0 // indirect
74-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
75-
sigs.k8s.io/yaml v1.2.0 // indirect
82+
gopkg.in/yaml.v3 v3.0.1 // indirect
83+
k8s.io/api v0.24.2 // indirect
84+
k8s.io/test-infra v0.0.0-20220913174101-46ac1a6cf806 // indirect
85+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
86+
sigs.k8s.io/yaml v1.3.0 // indirect
7687
)
7788

7889
replace (

0 commit comments

Comments
 (0)