Bug 1697657: vendor: bump openshift/api and needed k8s deps #611

runcom · 2019-04-09T13:22:19Z

Signed-off-by: Antonio Murdaca [email protected]

- What I did

Bump openshift/api as per https://bugzilla.redhat.com/show_bug.cgi?id=1697657 and other k8s deps as needed by the openshift/api bump

- How to verify it

CI

- Description for the changelog

eparis · 2019-04-09T14:37:51Z

openshift/api#278

rphillips · 2019-04-09T16:27:04Z

To fix the unit tests we need to bump client-go as well.

Depends on: openshift/client-go#100

runcom · 2019-04-09T16:28:51Z

To fix the unit tests we need to bump client-go as well.

Depends on: openshift/client-go#100

@rphillips so I should wait on that to merge?

rphillips · 2019-04-09T16:29:45Z

@runcom yes, and we will need to regenerate the deps update on this PR after the client-go patch merges in.

runcom · 2019-04-09T16:43:17Z

To fix the unit tests we need to bump client-go as well.

actually, I don't think this is the case. The only units failing are related to the fact that the container_runtime controller reports the REAL error on failure, where the kubelet_config just silently ignores it see #603

In there, we talked about it, and right now, if something goes wrong the controller isn't throwing an error cause UpdateStatus succedes (again, the container runtime controller does the right thing by returning the actual error)

rphillips · 2019-04-09T16:48:18Z

I'm seeing this error in the build log:

# github.com/openshift/machine-config-operator/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake
vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_apiserver.go:110:48: too many arguments in call to testing.NewRootPatchSubresourceAction
	have (schema.GroupVersionResource, string, types.PatchType, []byte, []string...)
	want (schema.GroupVersionResource, string, []byte, ...string)
vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_authentication.go:110:48: too many arguments in call to testing.NewRootPatchSubresourceAction
	have (schema.GroupVersionResource, string, types.PatchType, []byte, []string...)
	want (schema.GroupVersionResource, string, []byte, ...string)
vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_build.go:99:48: too many arguments in call to testing.NewRootPatchSubresourceAction
	have (schema.GroupVersionResource, string, types.PatchType, []byte, []string...)
	want (schema.GroupVersionResource, string, []byte, ...string)
vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_clusteroperator.go:110:48: too many arguments in call to testing.NewRootPatchSubresourceAction
	have (schema.GroupVersionResource, string, types.PatchType, []byte, []string...)
	want (schema.GroupVersionResource, string, []byte, ...string)
vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_clusterversion.go:110:48: too many arguments in call to testing.NewRootPatchSubresourceAction
	have (schema.GroupVersionResource, string, types.PatchType, []byte, []string...)
	want (schema.GroupVersionResource, string, []byte, ...string)
vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_console.go:110:48: too many arguments in call to testing.NewRootPatchSubresourceAction
	have (schema.GroupVersionResource, string, types.PatchType, []byte, []string...)
	want (schema.GroupVersionResource, string, []byte, ...string)
vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_dns.go:110:48: too many arguments in call to testing.NewRootPatchSubresourceAction
	have (schema.GroupVersionResource, string, types.PatchType, []byte, []string...)
	want (schema.GroupVersionResource, string, []byte, ...string)
vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_featuregate.go:110:48: too many arguments in call to testing.NewRootPatchSubresourceAction
	have (schema.GroupVersionResource, string, types.PatchType, []byte, []string...)
	want (schema.GroupVersionResource, string, []byte, ...string)
vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_image.go:110:48: too many arguments in call to testing.NewRootPatchSubresourceAction
	have (schema.GroupVersionResource, string, types.PatchType, []byte, []string...)
	want (schema.GroupVersionResource, string, []byte, ...string)
vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_infrastructure.go:110:48: too many arguments in call to testing.NewRootPatchSubresourceAction
	have (schema.GroupVersionResource, string, types.PatchType, []byte, []string...)
	want (schema.GroupVersionResource, string, []byte, ...string)

runcom · 2019-04-09T16:51:40Z

I'm seeing this error in the build log:

yeah, but that doesn't relate to openshift/client-go#100 - I mean that PR is probably still required but bumping client-go locally just worked for me and then there's the unit error I mentioned above related to kubelet_config. I'm creating an issue to be more precise.

runcom · 2019-04-09T17:09:51Z

/retest

rphillips · 2019-04-09T19:13:49Z

Looks like we are dependent on a new k8s.io/client-go with this patch to bring in MergePatchType support.

runcom · 2019-04-09T19:21:40Z

Looks like we are dependent on a new k8s.io/client-go with this patch to bring in MergePatchType support.

oh nice, that would be perfect and fixes the units that are failing with container_runtime units.

Any eta on when that's gonna land in openshift/client-go?

abhinavdahiya · 2019-04-09T20:48:15Z

looking at the diff in Gopkg.lock which is updating each package, but the commit message being bump openshift/api

you probably want to run dep ensure -update github.com/openshift/api github.com/openshift/client-go compared to dep ensure -update

rphillips · 2019-04-09T20:55:03Z

@abhinavdahiya thanks for the tip, because I was trying a bunch of things with dep and failing.

diff --git a/Gopkg.toml b/Gopkg.toml
index ae550eab..d8cdd0e5 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -105,7 +105,7 @@ required = [
 
 [[constraint]]
   name = "k8s.io/api"
-  branch = "release-1.13"
+  branch = "release-1.14"
 
 [[constraint]]
   name = "k8s.io/apiextensions-apiserver"
@@ -113,7 +113,7 @@ required = [
 
 [[constraint]]
   name = "k8s.io/client-go"
-  version = "10.0.0"
+  version = "v11.0.0"
 
 [[constraint]]
   name = "k8s.io/code-generator"

[Note: v11.0.0 is not a typo, upstream added a 'v' in front of the version]

Then

dep ensure -v -update github.com/openshift/api github.com/openshift/client-go k8s.io/client-go

After doing these steps I got a successful make test.

runcom · 2019-04-09T22:13:09Z

alright, I just -updateon openshift/api and openshift/client-go and the kube deps that we need to correctly generate the code for 1.13 (not really going to use 1.14 code).

For the failing units, I'm trying to find a nice hack while we move to 1.14 as the patch to backport just for that is huge and won't be backported afaict.

runcom · 2019-04-09T22:38:55Z

ok, last commit adds a workaround till we upgrade to 1.14 (not soon likely) @rphillips ptal I'll add something similar for kubelet controller once #617 merges and I rebase this

runcom · 2019-04-10T11:16:21Z

/retest

runcom · 2019-04-10T13:42:40Z

Ok, this should be good to go now 🎉

rphillips · 2019-04-10T13:45:11Z

/lgtm

openshift-bot · 2019-04-12T15:38:28Z

/retest

Please review the full test history for this PR and help us cut down flakes.

eparis · 2019-04-12T18:31:13Z

no, you do not need to bump golang. it sohuld be fine.

runcom · 2019-04-12T19:25:05Z

no, you do not need to bump golang. it sohuld be fine.

alrighty, but I'll just leave it written here that we're bumping all our kube* deps to 1.13.4 then to bump openshift/api 😄

runcom · 2019-04-13T16:09:11Z

/retest

runcom · 2019-04-13T17:48:08Z

/retest

runcom · 2019-04-13T20:42:22Z

New changes are detected. LGTM label has been removed.

I've rebased this and added a commit which aligns our kube deps to 1.13.x which is the one we support in 4.1

@kikisdeliveryservice @cgwalters @LorbusChris ptal again pls

runcom · 2019-04-14T08:27:59Z

/retest

Signed-off-by: Antonio Murdaca <[email protected]>

we need this workaround to mock out patch calls in unit until openshift#611 (comment) which is probably going to be in kube 1.14 Signed-off-by: Antonio Murdaca <[email protected]>

Signed-off-by: Antonio Murdaca <[email protected]>

runcom · 2019-04-14T13:37:35Z

/retest

runcom · 2019-04-14T15:11:41Z

And finally green again

cgwalters · 2019-04-15T13:14:33Z

/lgtm

LorbusChris · 2019-04-15T13:16:53Z

/lgtm

openshift-ci-robot · 2019-04-15T13:17:08Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, kikisdeliveryservice, LorbusChris, rphillips, runcom

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [LorbusChris,cgwalters,kikisdeliveryservice,runcom]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

runcom · 2019-04-15T14:31:39Z

/retest

runcom · 2019-04-15T15:43:54Z

/retest

LorbusChris · 2019-04-15T18:41:02Z

/retest

openshift-bot · 2019-04-15T20:34:34Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2019-04-15T23:36:33Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2019-04-16T01:20:36Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Apr 9, 2019

openshift-ci-robot requested review from jlebon and kikisdeliveryservice April 9, 2019 13:22

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 9, 2019

runcom force-pushed the bump-oapi branch from d7e2465 to 8581cdf Compare April 9, 2019 16:53

runcom mentioned this pull request Apr 9, 2019

kubelet config controller isn't failing correctly #615

Closed

runcom mentioned this pull request Apr 9, 2019

kubeletconfig: Fix error propogation of status message #617

Merged

runcom changed the title ~~Bug 1697657: vendor: bump openshift/api~~ Bug 1697657: vendor: bump openshift/api and needed k8s deps Apr 9, 2019

runcom force-pushed the bump-oapi branch from 8581cdf to 89ae2dc Compare April 9, 2019 22:19

runcom force-pushed the bump-oapi branch from 6d36542 to 00a077c Compare April 10, 2019 09:38

openshift-ci-robot assigned rphillips Apr 10, 2019

runcom force-pushed the bump-oapi branch from 6112566 to 7a18dae Compare April 13, 2019 20:41

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Apr 13, 2019

runcom force-pushed the bump-oapi branch from 7a18dae to 6112566 Compare April 14, 2019 11:25

runcom added 3 commits April 14, 2019 13:34

vendor: bump openshift/api and needed k8s deps

bcdabc3

Signed-off-by: Antonio Murdaca <[email protected]>

pkg/controller: workaround for missing PatchType in fake client

f49331c

we need this workaround to mock out patch calls in unit until openshift#611 (comment) which is probably going to be in kube 1.14 Signed-off-by: Antonio Murdaca <[email protected]>

vendor: bump kube deps to 1.13.x

c688fae

Signed-off-by: Antonio Murdaca <[email protected]>

runcom force-pushed the bump-oapi branch from 08fa44d to c688fae Compare April 14, 2019 11:35

openshift-ci-robot assigned cgwalters Apr 15, 2019

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 15, 2019

openshift-ci-robot assigned LorbusChris Apr 15, 2019

openshift-merge-robot merged commit 2e48ac5 into openshift:master Apr 16, 2019

runcom deleted the bump-oapi branch April 16, 2019 08:25

Bug 1697657: vendor: bump openshift/api and needed k8s deps #611

Bug 1697657: vendor: bump openshift/api and needed k8s deps #611

Uh oh!

Conversation

runcom commented Apr 9, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eparis commented Apr 9, 2019

Uh oh!

rphillips commented Apr 9, 2019

Uh oh!

runcom commented Apr 9, 2019

Uh oh!

rphillips commented Apr 9, 2019

Uh oh!

runcom commented Apr 9, 2019

Uh oh!

rphillips commented Apr 9, 2019

Uh oh!

runcom commented Apr 9, 2019

Uh oh!

runcom commented Apr 9, 2019

Uh oh!

rphillips commented Apr 9, 2019

Uh oh!

runcom commented Apr 9, 2019

Uh oh!

abhinavdahiya commented Apr 9, 2019

Uh oh!

rphillips commented Apr 9, 2019

Uh oh!

runcom commented Apr 9, 2019

Uh oh!

runcom commented Apr 9, 2019

Uh oh!

runcom commented Apr 10, 2019

Uh oh!

runcom commented Apr 10, 2019

Uh oh!

rphillips commented Apr 10, 2019

Uh oh!

openshift-bot commented Apr 12, 2019

Uh oh!

eparis commented Apr 12, 2019

Uh oh!

runcom commented Apr 12, 2019

Uh oh!

runcom commented Apr 13, 2019

Uh oh!

runcom commented Apr 13, 2019

Uh oh!

runcom commented Apr 13, 2019

Uh oh!

runcom commented Apr 14, 2019

Uh oh!

runcom commented Apr 14, 2019

Uh oh!

runcom commented Apr 14, 2019

Uh oh!

cgwalters commented Apr 15, 2019

Uh oh!

LorbusChris commented Apr 15, 2019

Uh oh!

openshift-ci-robot commented Apr 15, 2019

Uh oh!

runcom commented Apr 15, 2019

Uh oh!

runcom commented Apr 15, 2019

Uh oh!

LorbusChris commented Apr 15, 2019

Uh oh!

openshift-bot commented Apr 15, 2019

Uh oh!

openshift-bot commented Apr 15, 2019

Uh oh!

openshift-bot commented Apr 16, 2019

Uh oh!

Reviewers

Assignees

Labels

runcom commented Apr 9, 2019 •

edited

Loading