Skip to content

Commit fb84815

Browse files
committed
vendor: Bump client-go and library-go to current 4.6 tips
Pulling in [1,2]. Generated with: $ emacs go.mod # removing the golang.org/x/text replace $ go get -u github.com/openshift/client-go@83993cebb5aee533bf2f2dded2d87b9e32835f4a go: github.com/openshift/client-go 83993cebb5aee533bf2f2dded2d87b9e32835f4a => v0.0.0-20200623090625-83993cebb5ae $ go get -u github.com/openshift/library-go@cc498c355c99983057e9e01f3abcceb40ca5c298 go: github.com/openshift/library-go cc498c355c99983057e9e01f3abcceb40ca5c298 => v0.0.0-20200709151624-cc498c355c99 $ go mod tidy $ go mod vendor $ git add -A go.* vendor using: $ go version go version go1.14.4 linux/amd64 This pulls in the client-go bump which in turn addresses the golang.org/x/text v0.3.3 to address CVE-2020-14040 [3]. $ grep '# golang.org/x/text' vendor/modules.txt # golang.org/x/text v0.3.3 We'd previously addressed the CVE with the explicit 'replace' from 2021b86 (Bug 1855577: Updating the golang.org/x/text version to v0.3.3, 2020-07-15, #408), but it's more elegant to not have to have explicit overrides for our indirect dependencies. [1]: openshift/client-go@83993ce [2]: openshift/library-go@cc498c3 [3]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-14040
1 parent a49fef5 commit fb84815

File tree

810 files changed

+36060
-97646
lines changed

Some content is hidden

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

810 files changed

+36060
-97646
lines changed

go.mod

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,34 @@ module github.com/openshift/cluster-version-operator
22

33
go 1.13
44

5-
replace golang.org/x/text => golang.org/x/text v0.3.3
6-
75
require (
86
github.com/blang/semver/v4 v4.0.0
97
github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292
108
github.com/davecgh/go-spew v1.1.1
119
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
1210
github.com/ghodss/yaml v1.0.0
1311
github.com/golang/groupcache v0.0.0-20191002201903-404acd9df4cc // indirect
14-
github.com/google/go-cmp v0.3.1 // indirect
1512
github.com/google/uuid v1.1.1
1613
github.com/googleapis/gnostic v0.3.1 // indirect
1714
github.com/hashicorp/golang-lru v0.5.3 // indirect
1815
github.com/imdario/mergo v0.3.8 // indirect
19-
github.com/openshift/api v0.0.0-20200210091934-a0e53e94816b
20-
github.com/openshift/client-go v0.0.0-20200116152001-92a2713fa240
21-
github.com/openshift/library-go v0.0.0-20200303185131-81598fff9efa
16+
github.com/openshift/api v0.0.0-20200623075207-eb651a5bb0ad
17+
github.com/openshift/client-go v0.0.0-20200623090625-83993cebb5ae
18+
github.com/openshift/library-go v0.0.0-20200709151624-cc498c355c99
2219
github.com/pkg/errors v0.8.1
2320
github.com/prometheus/client_golang v1.1.0
24-
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
21+
github.com/prometheus/client_model v0.2.0
2522
github.com/prometheus/common v0.7.0 // indirect
2623
github.com/prometheus/procfs v0.0.5 // indirect
2724
github.com/spf13/cobra v0.0.5
28-
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
29-
golang.org/x/sys v0.0.0-20191003212358-c178f38b412c // indirect
25+
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
3026
golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0
3127
google.golang.org/appengine v1.6.4 // indirect
32-
k8s.io/api v0.17.3
33-
k8s.io/apiextensions-apiserver v0.17.1
34-
k8s.io/apimachinery v0.17.3
35-
k8s.io/client-go v0.17.3
28+
k8s.io/api v0.18.4
29+
k8s.io/apiextensions-apiserver v0.18.3
30+
k8s.io/apimachinery v0.18.4
31+
k8s.io/client-go v0.18.3
3632
k8s.io/klog v1.0.0
37-
k8s.io/kube-aggregator v0.17.1
38-
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
33+
k8s.io/kube-aggregator v0.18.3
34+
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
3935
)

go.sum

Lines changed: 73 additions & 71 deletions
Large diffs are not rendered by default.

vendor/github.com/json-iterator/go/README.md

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/json-iterator/go/any_str.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/json-iterator/go/config.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/json-iterator/go/iter_object.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/json-iterator/go/reflect_extension.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/json-iterator/go/reflect_map.go

Lines changed: 47 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/json-iterator/go/reflect_optional.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)