Skip to content

CNF-9385: add ImageRegistry capability #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
openshift-merge-robot merged 2 commits into from
Aug 15, 2023
Merged

CNF-9385: add ImageRegistry capability #950

openshift-merge-robot merged 2 commits into from
Aug 15, 2023

Conversation

@qJkee
Copy link
Contributor

@qJkee qJkee commented Aug 2, 2023 •
edited
Loading

Bump openshift/api to bring new cluster capability ImageRegistry

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 2, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Aug 2, 2023 •
edited by openshift-ci bot
Loading

@qJkee: This pull request references CNF-5647 which is a valid jira issue.

Details

In response to this:

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 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 Aug 2, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 2, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@qJkee qJkee changed the title [WIP] CNF-5647: add ImageRegistry capability [WIP] CNF-9385: add ImageRegistry capability Aug 3, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Aug 3, 2023 •
edited by openshift-ci bot
Loading

@qJkee: This pull request references CNF-9385 which is a valid jira issue.

Details

In response to this:

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.

@qJkee
vendor: bump openshift/api
ba3aeb9 
go get -u github.com/openshift/api@master
go mod tidy
go mod vendor
git add -A go.* vendor
@qJkee qJkee marked this pull request as ready for review August 14, 2023 19:24
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Aug 14, 2023 •
edited by openshift-ci bot
Loading

@qJkee: This pull request references CNF-9385 which is a valid jira issue.

Details

In response to this:

Bump openshift/api to bring new cluster capability ImageRegistry

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 openshift-ci bot requested review from DavidHurta and wking August 14, 2023 19:25
@qJkee
update tests with new capabilities
e2ea65e 
update tests with new capabilities brought by
new version of openshift/api package
@qJkee qJkee changed the title [WIP] CNF-9385: add ImageRegistry capability CNF-9385: add ImageRegistry capability Aug 15, 2023
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 15, 2023
@petr-muller
Copy link
Member

petr-muller commented Aug 15, 2023

/test e2e-agnostic-ovn e2e-agnostic-operator

@petr-muller
Copy link
Member

petr-muller commented Aug 15, 2023

/cc

@openshift-ci openshift-ci bot requested a review from petr-muller August 15, 2023 12:44
wking
wking approved these changes Aug 15, 2023
View reviewed changes
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.

The upgrade-out-of-change job will never pass, as the incoming old CRD's restrictive status.capabilities.knownCapabilities enum rejects the CVO's attempt to write MachineAPI and the other new caps. Which blocks the CVO from setting other status properties, including the ones that point out that the release transition has completed.

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

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 15, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 15, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qJkee, 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 Aug 15, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 15, 2023

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

Details

In response to this:

The upgrade-out-of-change job will never pass, as the incoming old CRD's restrictive status.capabilities.knownCapabilities enum rejects the CVO's attempt to write MachineAPI and the other new caps. Which blocks the CVO from setting other status properties, including the ones that point out that the release transition has completed.

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

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
Contributor

openshift-ci bot commented Aug 15, 2023

@qJkee: 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 e9bfbe4 into openshift:master Aug 15, 2023
@wking wking mentioned this pull request Aug 15, 2023
Merged
@dgoodwin dgoodwin mentioned this pull request Aug 16, 2023
Closed
wking added a commit to wking/cluster-version-operator that referenced this pull request Oct 11, 2023
@wking
pkg/cvo/sync_worker: Always enable the DeploymentConfig capability
baf7ba7 
The capability is new in 4.14, via openshift/api@d557f9784b
(WRKLDS-728: Make Build and DeploymentConfig API optional through
capabilities, 2023-05-24, openshift/api#1462) and ba3aeb9 (vendor:
bump openshift/api, 2023-08-02, openshift#950).  But as pointed out in [1],
4.14 releases do not declare any manifests as linked to the new
capability:

  $ oc adm release extract --to manifests quay.io/openshift-release-dev/ocp-release:4.14.0-rc.5-x86_64
  Extracted release payload from digest sha256:042899f17f33259ed9f2cfc179930af283733455720f72ea3483fd1905f9b301 created at 2023-10-10T18:00:08Z
  $ grep -ohr 'capability.openshift.io/name:.*' manifests | sort | uniq
  capability.openshift.io/name: baremetal
  capability.openshift.io/name: Console
  capability.openshift.io/name: CSISnapshot
  capability.openshift.io/name: ImageRegistry
  capability.openshift.io/name: Insights
  capability.openshift.io/name: MachineAPI
  capability.openshift.io/name: marketplace
  capability.openshift.io/name: NodeTuning
  capability.openshift.io/name: openshift-samples
  capability.openshift.io/name: Storage

That means our existing logic to compare reconciled-manifest
requirements for detecting the need to implicitly enable capabilities
breaks down.  In this commit, I'm teaching the outgoing 4.13 CVO that
all 4.13 clusters have the DeploymentConfig capability enabled (even
if it is not declared by a ClusterVersion capability in 4.13), so that
capability needs to persist into 4.14 releases, to avoid surprising
admins by dropping functionality.

Folks who do want to drop DeploymentConfig functionality will need to
perform fresh installs with 4.14 or later, because capabilities cannot
be uninstalled [2].

[1]: https://issues.redhat.com/browse/OCPBUGS-20321
[2]: https://github.com/openshift/enhancements/blob/d2edd51b600c5490eaa3650aac3b45a0bff5b3d5/enhancements/installer/component-selection.md#capabilities-cannot-be-uninstalled
@wking wking mentioned this pull request Oct 11, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wking wking wking approved these changes

@DavidHurta DavidHurta Awaiting requested review from DavidHurta

@petr-muller petr-muller Awaiting requested review from petr-muller

Assignees

@wking wking

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@qJkee @openshift-ci-robot @petr-muller @wking @openshift-merge-robot