Bump client-go and library-go to current 4.6 tips #406
Conversation
openshift-ci-robot
added
do-not-merge/work-in-progress
|
@wking: This pull request references Bugzilla bug 1855577, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker. 3 validation(s) were run on this bug
In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
openshift-ci-robot
added
the
bugzilla/valid-bug
openshift-ci-robot
added
the
approved
|
/close preceded by #408 |
|
/close |
|
@LalatenduMohanty: Closed this PR. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
@wking: This pull request references Bugzilla bug 1855577. The bug has been updated to no longer refer to the pull request using the external bug tracker. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
openshift-ci-robot
removed
the
bugzilla/valid-bug
|
@wking: This pull request references Bugzilla bug 1855577, which is invalid:
Comment In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
openshift-ci-robot
added
bugzilla/invalid-bug
openshift-ci-robot
removed
the
needs-rebase
|
Reopened and rebased on the master to update our dependencies and remove the #408 pinning. Diff is huge, but the first commit is the automated vendor bump, and the second is me massaging so many call signatures to add Because it's sort of in the spirit of #410: /assign @jottofar |
wking
changed the title
openshift-ci-robot
removed
the
do-not-merge/work-in-progress
wking
changed the title
openshift-ci-robot
removed
bugzilla/severity-medium
|
@wking: No Bugzilla bug is referenced in the title of this pull request. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
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, openshift#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
wking
force-pushed
the
bump-go-text
branch
4 times, most recently
from
d542f71
to
939013f
Compare
Catching up with the vendored client library bump.
There are a handful of context.TODO() where I have to wrap a modern
function to fit into a legacy lister interface like:
$ grep ^func vendor/github.com/openshift/client-go/config/listers/config/v1/clusterversion.go
func NewClusterVersionLister(indexer cache.Indexer) ClusterVersionLister {
func (s *clusterVersionLister) List(selector labels.Selector) (ret []*v1.ClusterVersion, err error) {
func (s *clusterVersionLister) Get(name string) (*v1.ClusterVersion, error) {
I imagine we'll be able to drop the TODO and
dummyContextOperatorGetter and such in some future vendor bump.
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jottofar, wking The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
4 similar comments
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
Last three e2e failures are split between /override ci/prow/e2e |
|
@wking: Overrode contexts on behalf of wking: ci/prow/e2e In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Catching up with the vendored client library bump.
There are a handful of context.TODO() where I have to wrap a modern
function to fit into a legacy lister interface like:
$ grep ^func vendor/github.com/openshift/client-go/config/listers/config/v1/clusterversion.go
func NewClusterVersionLister(indexer cache.Indexer) ClusterVersionLister {
func (s *clusterVersionLister) List(selector labels.Selector) (ret []*v1.ClusterVersion, err error) {
func (s *clusterVersionLister) Get(name string) (*v1.ClusterVersion, error) {
I imagine we'll be able to drop the TODO and
dummyContextOperatorGetter and such in some future vendor bump.
Cherry-picked from a2c3e27 (openshift#406). Conflicts:
* lib/resourcebuilder/apps.go
* pkg/autoupdate/autoupdate.go
* pkg/cvo/cvo.go
* pkg/start/start.go
* pkg/start/start_integration_test.go
Builds on #405; you may want to review that first.
Pulling in openshift/client-go@83993cebb5aee53 and openshift/library-go@cc498c355c9998. Generated with:
using:
The client-go bump in turn addresses the golang.org/x/text v0.3.3 to address CVE-2020-14040.
WIP is because I still need things like
Contextarguments to keep up with the Kube-client API, which has been pulled from v0.17.1 to v0.18.3. Will get to that in a follow-up commit, and then pull the WIP from this PR.