Skip to content

Conversation

@jottofar
Copy link
Contributor

@jottofar jottofar commented Mar 22, 2022

This PR adds support for the following per the. Post-install, an admin can change a capability to enable it but cannot disable a previously enabled capability. This PR changes CVO to override any admin attempt to disable a previously enabled capability and reports any such action through a newly added condition showing these "tainted-in" capabilities. These "tainted-in" capabilities will remain enabled and will be reported as such in the status.

Supporting this new logic requires that capability filtering be moved from payload load time to payload apply time in a similar fashion to how overrides are handled.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 22, 2022
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 22, 2022
@jottofar jottofar force-pushed the ota-572 branch 2 times, most recently from 2755007 to edbfc53 Compare March 22, 2022 15:33
@jottofar
Copy link
Contributor Author

/retitle WIP: capability: disallow disabling, add enabling capabilities

@openshift-ci openshift-ci bot changed the title WIP: capability: disallow disabling previousily enabled capability WIP: capability: disallow disabling, add enabling capabilities Mar 22, 2022
@jottofar
Copy link
Contributor Author

/test e2e-agnostic

@jottofar jottofar force-pushed the ota-572 branch 4 times, most recently from 90820b1 to 926f63e Compare March 24, 2022 19:33
@jottofar
Copy link
Contributor Author

/test unit

@jottofar
Copy link
Contributor Author

/retest

1 similar comment
@jottofar
Copy link
Contributor Author

/retest

@jottofar jottofar force-pushed the ota-572 branch 5 times, most recently from 8b88c36 to 94c43de Compare March 29, 2022 15:47
@jottofar
Copy link
Contributor Author

/retest

@jottofar
Copy link
Contributor Author

This will take care of reconciling enabled capabilities (from the install time), isn't it?

Correct. Saving it off before it's overwritten by

work.Capabilities = capability.SetCapabilities(config, priorCaps)

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

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 31, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 31, 2022

[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

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

/retest-required

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

@wking
Copy link
Member

wking commented Apr 1, 2022

MCD TargetDown is unrelated.

/override ci/prow/e2e-agnostic-upgrade

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 1, 2022

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

Details

In response to this:

MCD TargetDown is unrelated.

/override ci/prow/e2e-agnostic-upgrade

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-merge-robot openshift-merge-robot merged commit 16916ca into openshift:master Apr 1, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 1, 2022

@jottofar: 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.

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.

5 participants