Skip to content

Commit 411e0d6

Browse files
sunnylovestiramisusunnylovestiramisu
committed
Resolve go.mod conflicts for Hyperdisk feature
1 parent 9099826 commit 411e0d6

File tree

901 files changed

+443358
-205681
lines changed

Some content is hidden

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

901 files changed

+443358
-205681
lines changed

‎go.mod

+28-22
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
module sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
22

3-
go 1.17
3+
go 1.19
44

55
require (
6-
cloud.google.com/go v0.65.0
7-
github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317
6+
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.0
87
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
8+
github.com/golang/protobuf v1.5.3
9+
github.com/google/uuid v1.3.0
1110
github.com/kubernetes-csi/csi-proxy/client v1.0.0
1211
github.com/kubernetes-csi/csi-test/v4 v4.2.0
1312
github.com/onsi/ginkgo v1.14.2
1413
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
14+
golang.org/x/oauth2 v0.7.0
15+
golang.org/x/sys v0.7.0
16+
google.golang.org/api v0.118.0
17+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
18+
google.golang.org/grpc v1.55.0
2019
gopkg.in/gcfg.v1 v1.2.3
2120
gopkg.in/warnings.v0 v0.1.2 // indirect
2221
k8s.io/apimachinery v0.22.0
@@ -30,23 +29,29 @@ require (
3029
)
3130

3231
require (
33-
google.golang.org/protobuf v1.26.0
34-
k8s.io/cloud-provider v0.22.0
32+
cloud.google.com/go/compute/metadata v0.2.3
33+
cloud.google.com/go/kms v1.10.2
34+
google.golang.org/protobuf v1.30.0
35+
k8s.io/cloud-provider v0.24.1
3536
)
3637

3738
require (
39+
cloud.google.com/go/compute v1.19.0 // indirect
40+
cloud.google.com/go/iam v0.13.0 // indirect
3841
github.com/Microsoft/go-winio v0.4.16 // indirect
3942
github.com/beorn7/perks v1.0.1 // indirect
4043
github.com/blang/semver v3.5.1+incompatible // indirect
41-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
44+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4245
github.com/davecgh/go-spew v1.1.1 // indirect
4346
github.com/fsnotify/fsnotify v1.4.9 // indirect
4447
github.com/go-logr/logr v1.2.0 // indirect
4548
github.com/gogo/protobuf v1.3.2 // indirect
4649
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
47-
github.com/google/go-cmp v0.5.5 // indirect
50+
github.com/google/go-cmp v0.5.9 // indirect
4851
github.com/google/gofuzz v1.1.0 // indirect
49-
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
52+
github.com/google/s2a-go v0.1.0 // indirect
53+
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
54+
github.com/googleapis/gax-go/v2 v2.8.0 // indirect
5055
github.com/googleapis/gnostic v0.5.5 // indirect
5156
github.com/hashicorp/errwrap v1.0.0 // indirect
5257
github.com/hashicorp/go-multierror v1.0.0 // indirect
@@ -63,17 +68,18 @@ require (
6368
github.com/prometheus/procfs v0.6.0 // indirect
6469
github.com/sirupsen/logrus v1.8.1 // indirect
6570
github.com/spf13/pflag v1.0.5 // indirect
66-
go.opencensus.io v0.22.4 // indirect
67-
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
68-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
69-
golang.org/x/text v0.3.6 // indirect
71+
go.opencensus.io v0.24.0 // indirect
72+
golang.org/x/crypto v0.7.0 // indirect
73+
golang.org/x/net v0.9.0 // indirect
74+
golang.org/x/term v0.7.0 // indirect
75+
golang.org/x/text v0.9.0 // indirect
7076
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
71-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
72-
google.golang.org/appengine v1.6.6 // indirect
77+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
78+
google.golang.org/appengine v1.6.7 // indirect
7379
gopkg.in/inf.v0 v0.9.1 // indirect
7480
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
7581
gopkg.in/yaml.v2 v2.4.0 // indirect
76-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
82+
gopkg.in/yaml.v3 v3.0.1 // indirect
7783
k8s.io/api v0.22.0 // indirect
7884
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
7985
sigs.k8s.io/yaml v1.2.0 // indirect

‎go.sum

+194-25
Large diffs are not rendered by default.

‎test/e2e/tests/single_zone_e2e_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141

4242
const (
4343
testNamePrefix = "gcepd-csi-e2e-"
44-
44+
4545
defaultSizeGb int64 = 5
4646
defaultRepdSizeGb int64 = 200
4747
defaultMwSizeGb int64 = 200

‎test/k8s-integration/main.go

-9
Original file line numberDiff line numberDiff line change
@@ -478,15 +478,6 @@ func handle() error {
478478
return fmt.Errorf("Unknown deployment strategy %s", testParams.deploymentStrategy)
479479
}
480480

481-
<<<<<<< HEAD
482-
=======
483-
skipDiskImageSnapshots := false
484-
if mustParseVersion(testParams.clusterVersion).lessThan(mustParseVersion("1.22.0")) {
485-
// Disk image cloning in only supported from 1.22 on.
486-
skipDiskImageSnapshots = true
487-
}
488-
489-
>>>>>>> Test pd-extreme k8s integration
490481
// Run the tests using the k8sSourceDir kubernetes
491482
if len(*storageClassFiles) != 0 {
492483
applicableStorageClassFiles := []string{}

‎vendor/cloud.google.com/go/LICENSE renamed to ‎vendor/cloud.google.com/go/compute/LICENSE

File renamed without changes.

‎vendor/cloud.google.com/go/compute/internal/version.go

+18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/cloud.google.com/go/compute/metadata/CHANGES.md

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/cloud.google.com/go/compute/metadata/LICENSE

+202
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/cloud.google.com/go/compute/metadata/README.md

+27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)