Rebase to kube 1.18 #226

damemi · 2020-03-16T14:17:32Z

No description provided.

damemi · 2020-03-16T14:17:59Z

/hold
this is currently a POC based on the prebase branches that have merged in library-go, api, and client-go

soltysh

Two nits, but you need to also fix the operator tests which currently fail compilation.

soltysh · 2020-03-16T15:58:17Z

go.mod

 	k8s.io/klog v1.0.0
 )

 replace github.com/jteeuwen/go-bindata => github.com/jteeuwen/go-bindata v3.0.8-0.20151023091102-a0ff2567cfb7+incompatible
+
+replace github.com/openshift/api => github.com/openshift/api v0.0.0-20200311151921-fdf269f98861


I'm surprised this is here, we should not have to replace those, it should pick the correct ones from library-go deps, so just update the ones in require directive.

soltysh · 2020-03-16T16:01:07Z

pkg/operator/configmetrics/configmetrics.go

@@ -48,3 +48,7 @@ func (m *configMetrics) Collect(ch chan<- prometheus.Metric) {
 		ch <- g
 	}
 }
+
+func (m *configMetrics) FQName() string {
+	return "cluster_master_schedulable"


Maybe worth making this a constant rather than repeating it in two places?

damemi · 2020-03-16T19:49:12Z

Currently pushed with the changes from openshift/library-go#748 in my fork of library-go, need that to get in to the prebase branch

damemi · 2020-03-16T22:19:29Z

/retest

damemi · 2020-03-17T03:02:25Z

/retest

ingvagabund · 2020-03-17T10:40:38Z

/retest

ingvagabund · 2020-03-17T12:01:02Z

/retest

damemi · 2020-03-17T13:47:33Z

/retest

damemi · 2020-03-17T15:24:50Z

/retest

damemi · 2020-03-17T17:09:22Z

/retest

ingvagabund · 2020-03-18T12:55:06Z

/retest

damemi · 2020-03-23T14:12:36Z

/hold cancel

damemi · 2020-03-23T14:40:31Z

/retest

damemi · 2020-03-23T15:45:20Z

/retest

damemi · 2020-03-23T16:34:04Z

/retest

soltysh

/lgtm
/approve

openshift-bot · 2020-03-24T06:38:16Z

/retest

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

openshift-bot · 2020-03-24T06:41:52Z

/retest

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

openshift-bot · 2020-03-24T07:47:05Z

/retest

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

openshift-bot · 2020-03-24T07:59:35Z

/retest

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

openshift-bot · 2020-03-24T09:04:43Z

/retest

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

openshift-bot · 2020-03-24T10:09:36Z

/retest

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

openshift-bot · 2020-03-24T10:23:07Z

/retest

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

openshift-bot · 2020-03-24T10:36:43Z

/retest

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

openshift-bot · 2020-03-24T11:32:22Z

/retest

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

openshift-bot · 2020-03-24T11:57:36Z

/retest

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

openshift-bot · 2020-03-24T13:02:32Z

/retest

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

openshift-bot · 2020-03-24T13:46:36Z

/retest

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

openshift-bot · 2020-03-24T14:07:10Z

/retest

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

openshift-bot · 2020-03-24T14:20:23Z

/retest

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

damemi · 2020-03-24T14:41:02Z

/hold

damemi · 2020-03-24T17:01:20Z

Reverted 630f2e5 to see if that's breaking tests

soltysh · 2020-03-24T17:37:38Z

Reverted 630f2e5 to see if that's breaking tests

That'd be surprising but let's see 🤷‍♂️

damemi · 2020-03-24T18:42:31Z

/retest
I think that switch to k8smetrics was breaking it. The cluster was failing with some weird logs around prometheus that pointed to the area where we register that metric.

damemi · 2020-03-24T18:43:01Z

/hold cancel
I think using the old metrics is still fine, but would like to switch at some point so we can inherit those methods

soltysh

/lgtm
/approve
/retest

openshift-ci-robot · 2020-03-25T12:11:24Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damemi, soltysh

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:

~~OWNERS~~ [damemi,soltysh]

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

openshift-bot · 2020-03-25T13:30:00Z

/retest

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

openshift-bot · 2020-03-25T15:01:00Z

/retest

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

openshift-bot · 2020-03-25T15:14:01Z

/retest

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

openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 16, 2020

openshift-ci-robot requested review from ingvagabund and soltysh March 16, 2020 14:18

soltysh requested changes Mar 16, 2020

View reviewed changes

damemi force-pushed the rebase-1.18 branch from bb12f6f to f6deb8f Compare March 16, 2020 20:01

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 19, 2020

damemi force-pushed the rebase-1.18 branch from f6deb8f to ebe8c33 Compare March 19, 2020 15:05

openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 19, 2020

damemi force-pushed the rebase-1.18 branch 2 times, most recently from aea3ac1 to 7e32d75 Compare March 19, 2020 20:20

damemi added 2 commits March 23, 2020 10:11

Rebase to kubernetes 1.18

0f2ae78

React to bump

8957f7a

damemi force-pushed the rebase-1.18 branch from 7e32d75 to 630f2e5 Compare March 23, 2020 14:11

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 23, 2020

soltysh approved these changes Mar 23, 2020

View reviewed changes

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 24, 2020

damemi force-pushed the rebase-1.18 branch from 630f2e5 to 8957f7a Compare March 24, 2020 17:01

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 24, 2020

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 24, 2020

soltysh approved these changes Mar 25, 2020

View reviewed changes

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 25, 2020

openshift-merge-robot merged commit 01caed9 into openshift:master Mar 25, 2020

Rebase to kube 1.18 #226

Rebase to kube 1.18 #226

Conversation

damemi commented Mar 16, 2020

damemi commented Mar 16, 2020

soltysh left a comment

Choose a reason for hiding this comment

soltysh Mar 16, 2020

Choose a reason for hiding this comment

soltysh Mar 16, 2020

Choose a reason for hiding this comment

damemi commented Mar 16, 2020

damemi commented Mar 16, 2020

damemi commented Mar 17, 2020

ingvagabund commented Mar 17, 2020

ingvagabund commented Mar 17, 2020

damemi commented Mar 17, 2020

damemi commented Mar 17, 2020

damemi commented Mar 17, 2020

ingvagabund commented Mar 18, 2020

damemi commented Mar 23, 2020

damemi commented Mar 23, 2020

damemi commented Mar 23, 2020

damemi commented Mar 23, 2020

soltysh left a comment

Choose a reason for hiding this comment

openshift-bot commented Mar 24, 2020

openshift-bot commented Mar 24, 2020

openshift-bot commented Mar 24, 2020

openshift-bot commented Mar 24, 2020

openshift-bot commented Mar 24, 2020

openshift-bot commented Mar 24, 2020

openshift-bot commented Mar 24, 2020

openshift-bot commented Mar 24, 2020

openshift-bot commented Mar 24, 2020

openshift-bot commented Mar 24, 2020

openshift-bot commented Mar 24, 2020

openshift-bot commented Mar 24, 2020

openshift-bot commented Mar 24, 2020

openshift-bot commented Mar 24, 2020

damemi commented Mar 24, 2020

damemi commented Mar 24, 2020

soltysh commented Mar 24, 2020

damemi commented Mar 24, 2020

damemi commented Mar 24, 2020

soltysh left a comment

Choose a reason for hiding this comment

openshift-ci-robot commented Mar 25, 2020

openshift-bot commented Mar 25, 2020

openshift-bot commented Mar 25, 2020

openshift-bot commented Mar 25, 2020