Skip to content

Commit 975107d

Browse files
authored
Merge pull request #123 from sunnylovestiramisu/module-update-master
Update dependency go modules for k8s v1.26.0
2 parents de15363 + 2690c64 commit 975107d

File tree

748 files changed

+83841
-25555
lines changed

Some content is hidden

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

748 files changed

+83841
-25555
lines changed

connection/connection_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -461,12 +461,13 @@ func verifyMetricsError(t *testing.T, err error, metricToIgnore string) error {
461461
return err
462462
}
463463

464-
wantArr := strings.Split(err.Error(), "want:")
464+
wantArr := strings.Split(err.Error(), "want")
465465
if len(wantArr) != 2 {
466466
return err
467467
}
468468

469469
want = strings.TrimSpace(wantArr[1])
470+
want = strings.ReplaceAll(want, "+++ got:", "")
470471

471472
if matchErr := metrics.VerifyMetricsMatch(want, got, metricToIgnore); matchErr != nil {
472473
t.Errorf("%v", matchErr)

go.mod

+25-26
Original file line numberDiff line numberDiff line change
@@ -3,61 +3,60 @@ module github.com/kubernetes-csi/csi-lib-utils
33
go 1.18
44

55
require (
6-
github.com/container-storage-interface/spec v1.5.0
6+
github.com/container-storage-interface/spec v1.7.0
77
github.com/golang/protobuf v1.5.2
8-
github.com/stretchr/testify v1.7.0
9-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b
10-
google.golang.org/grpc v1.47.0
11-
k8s.io/api v0.25.0
12-
k8s.io/client-go v0.25.0
13-
k8s.io/component-base v0.25.0
14-
k8s.io/klog/v2 v2.70.1
8+
github.com/stretchr/testify v1.8.0
9+
golang.org/x/net v0.4.0
10+
google.golang.org/grpc v1.49.0
11+
k8s.io/api v0.26.0
12+
k8s.io/client-go v0.26.0
13+
k8s.io/component-base v0.26.0
14+
k8s.io/klog/v2 v2.80.1
1515
)
1616

1717
require (
18-
github.com/PuerkitoBio/purell v1.1.1 // indirect
19-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2018
github.com/beorn7/perks v1.0.1 // indirect
2119
github.com/blang/semver/v4 v4.0.0 // indirect
2220
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2321
github.com/davecgh/go-spew v1.1.1 // indirect
24-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
22+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
2523
github.com/go-logr/logr v1.2.3 // indirect
2624
github.com/go-openapi/jsonpointer v0.19.5 // indirect
27-
github.com/go-openapi/jsonreference v0.19.5 // indirect
25+
github.com/go-openapi/jsonreference v0.20.0 // indirect
2826
github.com/go-openapi/swag v0.19.14 // indirect
2927
github.com/gogo/protobuf v1.3.2 // indirect
3028
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3129
github.com/google/gnostic v0.5.7-v3refs // indirect
30+
github.com/google/go-cmp v0.5.9 // indirect
3231
github.com/google/gofuzz v1.1.0 // indirect
3332
github.com/josharian/intern v1.0.0 // indirect
3433
github.com/json-iterator/go v1.1.12 // indirect
3534
github.com/mailru/easyjson v0.7.6 // indirect
36-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
35+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
3736
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3837
github.com/modern-go/reflect2 v1.0.2 // indirect
3938
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4039
github.com/pmezard/go-difflib v1.0.0 // indirect
41-
github.com/prometheus/client_golang v1.12.1 // indirect
42-
github.com/prometheus/client_model v0.2.0 // indirect
43-
github.com/prometheus/common v0.32.1 // indirect
44-
github.com/prometheus/procfs v0.7.3 // indirect
40+
github.com/prometheus/client_golang v1.14.0 // indirect
41+
github.com/prometheus/client_model v0.3.0 // indirect
42+
github.com/prometheus/common v0.37.0 // indirect
43+
github.com/prometheus/procfs v0.8.0 // indirect
4544
github.com/spf13/pflag v1.0.5 // indirect
46-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
47-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
48-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
49-
golang.org/x/text v0.3.7 // indirect
45+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
46+
golang.org/x/sys v0.3.0 // indirect
47+
golang.org/x/term v0.3.0 // indirect
48+
golang.org/x/text v0.5.0 // indirect
5049
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
5150
google.golang.org/appengine v1.6.7 // indirect
5251
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
53-
google.golang.org/protobuf v1.28.0 // indirect
52+
google.golang.org/protobuf v1.28.1 // indirect
5453
gopkg.in/inf.v0 v0.9.1 // indirect
5554
gopkg.in/yaml.v2 v2.4.0 // indirect
5655
gopkg.in/yaml.v3 v3.0.1 // indirect
57-
k8s.io/apimachinery v0.25.0 // indirect
58-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
59-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
56+
k8s.io/apimachinery v0.26.0 // indirect
57+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
58+
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
6059
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
6160
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
62-
sigs.k8s.io/yaml v1.2.0 // indirect
61+
sigs.k8s.io/yaml v1.3.0 // indirect
6362
)

go.sum

+60-52
Large diffs are not rendered by default.

vendor/github.com/PuerkitoBio/purell/.gitignore

-5
This file was deleted.

vendor/github.com/PuerkitoBio/purell/.travis.yml

-12
This file was deleted.

vendor/github.com/PuerkitoBio/purell/LICENSE

-12
This file was deleted.

vendor/github.com/PuerkitoBio/purell/README.md

-188
This file was deleted.

0 commit comments

Comments
 (0)