Bug 1955418: manifests: Shift FlowSchema to level 50 #582

wking · 2021-04-30T05:12:16Z

(like #581, but against the correct release-4.7, instead of #581's master)

This moves us behind the Kube API-server, like some other FlowSchema:

$ oc adm release extract --to manifests quay.io/openshift-release-dev/ocp-release:4.7.9-x86_64
$ ls manifests/*kube-apiserver*deployment*
manifests/0000_20_kube-apiserver-operator_06_deployment.yaml
$ grep -4r FlowSchema manifests | grep apiVersion | sort
manifests/0000_12_etcd-operator_10_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1
manifests/0000_20_kube-apiserver-operator_08_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1
manifests/0000_20_kube-apiserver-operator_08_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1
manifests/0000_30_openshift-apiserver-operator_09_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1
manifests/0000_30_openshift-apiserver-operator_09_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1
manifests/0000_30_openshift-apiserver-operator_09_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1
manifests/0000_50_cluster-authentication-operator_09_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1
manifests/0000_50_cluster-authentication-operator_09_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1
manifests/0000_50_cluster-authentication-operator_09_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1
manifests/0000_50_cluster-authentication-operator_09_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1
manifests/0000_50_cluster-openshift-controller-manager-operator_10_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1

That fixes a 4.7 v1alpha1 manifest vs. 4.8 v1beta1-only API-server on 4.8 -> 4.7 rollbacks.

We could also bump to v1beta1 like master/4.8's 7f76a91 (#516), but I don't think we need to, and as you can see in the grep there are lots of other v1alpha1 FlowSchema in 4.7, so I'm leaving that off for now.

This moves us behind the Kube API-server, like some other FlowSchema: $ oc adm release extract --to manifests quay.io/openshift-release-dev/ocp-release:4.7.9-x86_64 $ ls manifests/*kube-apiserver*deployment* manifests/0000_20_kube-apiserver-operator_06_deployment.yaml $ grep -4r FlowSchema manifests | grep apiVersion | sort manifests/0000_12_etcd-operator_10_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1 manifests/0000_20_kube-apiserver-operator_08_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1 manifests/0000_20_kube-apiserver-operator_08_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1 manifests/0000_30_openshift-apiserver-operator_09_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1 manifests/0000_30_openshift-apiserver-operator_09_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1 manifests/0000_30_openshift-apiserver-operator_09_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1 manifests/0000_50_cluster-authentication-operator_09_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1 manifests/0000_50_cluster-authentication-operator_09_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1 manifests/0000_50_cluster-authentication-operator_09_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1 manifests/0000_50_cluster-authentication-operator_09_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1 manifests/0000_50_cluster-openshift-controller-manager-operator_10_flowschema.yaml-apiVersion: flowcontrol.apiserver.k8s.io/v1alpha1 That fixes a 4.7 v1alpha1 manifest vs. 4.8 v1beta1-only API-server on 4.8 -> 4.7 rollbacks [1]. We could also bump to v1beta1 like master/4.8's 7f76a91 (switch to v1beta1 for the p&f APIs, 2021-01-06, openshift#516), but I don't think we need to, and as you can see in the grep there are lots of other v1alpha1 FlowSchema in 4.7, so I'm leaving that off for now. [1]: https://bugzilla.redhat.com/show_bug.cgi?id=1955414

openshift-ci-robot · 2021-04-30T05:12:21Z

@wking: This pull request references Bugzilla bug 1955418, which is invalid:

expected dependent Bugzilla bug 1955414 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is MODIFIED instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1955418: manifests: Shift FlowSchema to level 50

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.

hexfusion · 2021-04-30T10:25:53Z

/lgtm
/approve

/retest

openshift-ci-robot · 2021-04-30T10:26:06Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hexfusion, 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:

~~OWNERS~~ [hexfusion]

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

openshift-bot · 2021-04-30T10:38:30Z

/retest

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

openshift-bot · 2021-04-30T11:30:31Z

/retest

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

openshift-bot · 2021-04-30T11:43:39Z

/retest

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

openshift-bot · 2021-04-30T11:57:50Z

/retest

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

openshift-bot · 2021-04-30T12:09:33Z

/retest

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

openshift-bot · 2021-04-30T12:22:30Z

/retest

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

openshift-bot · 2021-04-30T12:35:37Z

/retest

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

openshift-bot · 2021-04-30T12:48:37Z

/retest

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

openshift-bot · 2021-04-30T13:01:31Z

/retest

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

openshift-bot · 2021-04-30T13:14:34Z

/retest

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

openshift-bot · 2021-04-30T13:27:34Z

/retest

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

openshift-bot · 2021-04-30T13:40:32Z

/retest

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

openshift-bot · 2021-04-30T13:53:36Z

/retest

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

openshift-bot · 2021-04-30T14:06:31Z

/retest

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

openshift-bot · 2021-04-30T14:19:33Z

/retest

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

openshift-bot · 2021-04-30T14:32:30Z

/retest

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

openshift-bot · 2021-04-30T14:47:34Z

/retest

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

openshift-bot · 2021-04-30T14:57:31Z

/retest

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

openshift-bot · 2021-04-30T15:09:31Z

/retest

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

openshift-bot · 2021-04-30T18:09:31Z

/retest

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

openshift-bot · 2021-04-30T18:21:32Z

/retest

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

openshift-bot · 2021-04-30T20:33:31Z

/retest

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

openshift-bot · 2021-04-30T20:57:29Z

/retest

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

openshift-bot · 2021-04-30T21:45:29Z

/retest

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

openshift-bot · 2021-04-30T22:09:30Z

/retest

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

openshift-bot · 2021-04-30T22:57:30Z

/retest

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

openshift-bot · 2021-04-30T23:09:29Z

/retest

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

openshift-bot · 2021-04-30T23:57:28Z

/retest

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

openshift-bot · 2021-05-01T01:00:35Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-05-01T01:00:41Z

@openshift-bot: This pull request references Bugzilla bug 1955418, which is invalid:

expected dependent Bugzilla bug 1955414 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

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 · 2021-05-01T01:26:36Z

/hold

Enough of the CI jobs have passed for this to merge, once QE verifies that 4.8->4.8 rollbacks are working and the patch-manager approves the cherry-pick. No need to keep retesting while we wait on those.

wking · 2021-05-24T19:43:04Z

/bugzilla refresh

openshift-ci · 2021-05-24T19:43:10Z

@wking: This pull request references Bugzilla bug 1955418, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.z) matches configured target release for branch (4.7.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1955414 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 1955414 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
bug has dependents

Requesting review from QA contact:
/cc @geliu2016

In response to this:

/bugzilla refresh

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 · 2021-05-24T19:43:11Z

@openshift-ci[bot]: GitHub didn't allow me to request PR reviews from the following users: geliu2016.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

@wking: This pull request references Bugzilla bug 1955418, which is valid.

6 validation(s) were run on this bug

bug is open, matching expected state (open)

bug target release (4.7.z) matches configured target release for branch (4.7.z)

bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

dependent bug Bugzilla bug 1955414 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))

dependent Bugzilla bug 1955414 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0

bug has dependents

Requesting review from QA contact:
/cc @geliu2016

In response to this:

/bugzilla refresh

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.

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.

hexfusion · 2021-05-27T13:20:19Z

/hold cancel

hexfusion · 2021-05-27T14:13:00Z

/skip

openshift-bot · 2021-05-27T14:14:48Z

/retest

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

hexfusion · 2021-05-27T14:15:20Z

/override ci/prow/e2e-gcp-five-control-plane-replicas

not supported in 4.7 failure was interrupt after 2m

openshift-ci · 2021-05-27T14:18:47Z

@hexfusion: Overrode contexts on behalf of hexfusion: ci/prow/e2e-gcp-five-control-plane-replicas

In response to this:

/override ci/prow/e2e-gcp-five-control-plane-replicas

not supported in 4.7

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 · 2021-05-27T22:00:15Z

@wking: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws-disruptive-ovn	`b570e4b`	link	`/test e2e-aws-disruptive-ovn`

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

openshift-bot · 2021-05-28T00:55:45Z

/retest

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

openshift-ci · 2021-05-28T02:48:46Z

@wking: All pull requests linked via external trackers have merged:

openshift/cluster-etcd-operator#582

Bugzilla bug 1955418 has been moved to the MODIFIED state.

In response to this:

Bug 1955418: manifests: Shift FlowSchema to level 50

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/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Apr 30, 2021

openshift-ci-robot requested review from marun and retroflexer April 30, 2021 05:12

openshift-ci-robot assigned hexfusion Apr 30, 2021

openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 30, 2021

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

openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels May 24, 2021

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 27, 2021

sdodson added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 27, 2021

openshift-merge-robot merged commit afb5e8d into openshift:release-4.7 May 28, 2021

wking deleted the flow-schema-for-rollbacks branch May 28, 2021 02:53

Bug 1955418: manifests: Shift FlowSchema to level 50 #582

Bug 1955418: manifests: Shift FlowSchema to level 50 #582

Conversation

wking commented Apr 30, 2021

openshift-ci-robot commented Apr 30, 2021

hexfusion commented Apr 30, 2021

openshift-ci-robot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented Apr 30, 2021

openshift-bot commented May 1, 2021

openshift-ci-robot commented May 1, 2021

wking commented May 1, 2021

wking commented May 24, 2021

openshift-ci bot commented May 24, 2021

openshift-ci bot commented May 24, 2021

hexfusion commented May 27, 2021

hexfusion commented May 27, 2021

openshift-bot commented May 27, 2021

hexfusion commented May 27, 2021 • edited

openshift-ci bot commented May 27, 2021

openshift-ci bot commented May 27, 2021 • edited

openshift-bot commented May 28, 2021

openshift-ci bot commented May 28, 2021

hexfusion commented May 27, 2021 •

edited

openshift-ci bot commented May 27, 2021 •

edited