Skip to content

[PSAP-741] vendor: update openshift/api for NodeTuning capability#883

Merged
openshift-merge-robot merged 2 commits into
openshift:masterfrom
dagrayvid:update-openshift-api
Feb 14, 2023
Merged

[PSAP-741] vendor: update openshift/api for NodeTuning capability#883
openshift-merge-robot merged 2 commits into
openshift:masterfrom
dagrayvid:update-openshift-api

Conversation

@dagrayvid
Copy link
Copy Markdown
Contributor

This PR updates the openshift/api dependency version to bring in the new NodeTuning capability, and updates the unit tests to include this capability.

See PSAP-741 as well as the merged PR openshift/api#1373.

$ go get github.com/openshift/api@5ad311dde2264b659a256a17c27f1836fb50e85d
$ go mod tidy
$ go mod vendor
@petr-muller
Copy link
Copy Markdown
Member

/retest

2 similar comments
@dagrayvid
Copy link
Copy Markdown
Contributor Author

/retest

@dagrayvid
Copy link
Copy Markdown
Contributor Author

/retest

@petr-muller
Copy link
Copy Markdown
Member

/hold

This is suspicious and should be investigated. The e2e-agnostic-upgrade-out-of-change job fails consistently (all four runs here) on the following. This does not happen on other PRs so it's somehow likely it's really caused by the change.

{Cluster did not complete upgrade: timed out waiting for the condition: Working towards 4.13.0-0.ci.test-2023-01-09-214219-ci-op-xsft9vl1-initial: 4 of 831 done (0% complete)  }

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 11, 2023
@petr-muller
Copy link
Copy Markdown
Member

From CVO log:

I0111 18:40:47.628727       1 cvo.go:550] Error handling openshift-cluster-version/version: ClusterVersion.config.openshift.io "version" is invalid: status.capabilities.enabledCapabilities[3]: Unsupported value: "NodeTuning": supported values: "openshift-samples", "baremetal", "marketplace", "Console", "Insights", "Storage", "CSISnapshot"

@dagrayvid
Copy link
Copy Markdown
Contributor Author

Thanks @petr-muller for digging into that. Looking at past PRs for capability addition, it seems like this will never pass.
cc @wking

@petr-muller
Copy link
Copy Markdown
Member

Yeah that actually sounds plausible. We cannot upgrade from the CVO with the cap to CVO without it. Hopefully Trevor will confirm.

@wking
Copy link
Copy Markdown
Member

wking commented Jan 12, 2023

I rounded with @dagrayvid out of band. Summarizing:

And yes, once we are ready to go-ahead with this pull request, we can override upgrade-out-of-change, because adding a new cap is expected to be a one-way gate.

@dagrayvid
Copy link
Copy Markdown
Contributor Author

/retest

Now that the openshift/origin#27657 has merged

@dagrayvid
Copy link
Copy Markdown
Contributor Author

@wking, the e2e-aws-ovn test in on openshift/cluster-node-tuning-operator#524 is now passing, since we merged openshift/origin#27657.

Is there anything else we should be looking out for from the no-capabilities periodic, before merging this PR?

@dagrayvid
Copy link
Copy Markdown
Contributor Author

@petr-muller can you take another look at this PR now?

@dagrayvid
Copy link
Copy Markdown
Contributor Author

/unhold

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 9, 2023
@dagrayvid
Copy link
Copy Markdown
Contributor Author

@LalatenduMohanty @wking @petr-muller I believe this PR is ready to merge, PTAL.

Copy link
Copy Markdown
Member

@wking wking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@wking
Copy link
Copy Markdown
Member

wking commented Feb 14, 2023

This test will never pass on capability-bumps, because the CVO wants to implicitly enable the rollback-removed capability, but the cap is no longer part of the CRD enum:

/override ci/prow/e2e-agnostic-upgrade-out-of-change

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Feb 14, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 14, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dagrayvid, wking

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:

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 14, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 14, 2023

@wking: Overrode contexts on behalf of wking: ci/prow/e2e-agnostic-upgrade-out-of-change

Details

In response to this:

This test will never pass on capability-bumps, because the CVO wants to implicitly enable the rollback-removed capability, but the cap is no longer part of the CRD enum:

/override ci/prow/e2e-agnostic-upgrade-out-of-change

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
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 14, 2023

@dagrayvid: all tests passed!

Full PR test history. Your PR dashboard.

Details

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-merge-robot openshift-merge-robot merged commit 82a5d44 into openshift:master Feb 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants