Skip to content

OCPBUGS-41111: config/v1/types_cluster_version: Add v4.17 and v4.18 capability sets#2022

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:masterfrom
wking:4.17-and-4.18-cluster-version-capability-sets
Sep 11, 2024
Merged

OCPBUGS-41111: config/v1/types_cluster_version: Add v4.17 and v4.18 capability sets#2022
openshift-merge-bot[bot] merged 1 commit intoopenshift:masterfrom
wking:4.17-and-4.18-cluster-version-capability-sets

Conversation

@wking
Copy link
Copy Markdown
Member

@wking wking commented Sep 10, 2024

These are both synonyms for v4.16, because there have not been capability-recommendation changes since that release. 4.17 is about to go Generally Available, which means v4.17 will always be a synonym for v4.16. v4.18 may or may not evolve before 4.18 goes GA. I think defining synonym capability sets is busywork that takes developer time without adding customer value, but OCPBUGS-41111 points out that so far every 4.y release has had a v4.y capability set string associated with it, and folks might find adjustments to that pattern surprising. I'm declaring sets for our next two 4.y here to continue the existing set-for-each-4.y pattern (and breaking the set-for-each-4.y-with-a-different-default pattern) to unblock 4.17's GA, but we may revisit this approach in the future with more lead time.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Sep 10, 2024

Hello @wking! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Sep 10, 2024
@openshift-ci-robot
Copy link
Copy Markdown

@wking: This pull request references Jira Issue OCPBUGS-41111, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.0) matches configured target version for branch (4.18.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @jiajliu

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

These are both synonyms for v4.16, because there have not been capability-recommendation changes since that release. 4.17 is about to go Generally Available, which means v4.17 will always be a synonym for v4.16. v4.18 may or may not evolve before 4.18 goes GA. I think defining synonym capability sets is busywork that takes developer time without adding customer value, but OCPBUGS-41111 points out that so far every 4.y release has had a v4.y capability set string associated with it, and folks might find adjustments to that pattern surprising. I'm declaring sets for our next two 4.y here to continue the existing set-for-each-4.y pattern (and breaking the set-for-each-4.y-with-a-different-default pattern) to unblock 4.17's GA, but we may revisit this approach in the future with more lead time.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot requested a review from jiajliu September 10, 2024 16:04
@openshift-ci openshift-ci Bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 10, 2024
wking added a commit to wking/openshift-api that referenced this pull request Sep 10, 2024
This is a synonym for v4.16, because there have not been
capability-recommendation changes since that release.  4.17 is about
to go Generally Available, which means v4.17 will always be a synonym
for v4.16.  I think defining synonym capability sets is busywork that
takes developer time without adding customer value, but [1] points out
that so far every 4.y release has had a v4.y capability set string
associated with it, and folks might find adjustments to that pattern
surprising.  I'm declaring the v4.17 set to continue the existing
set-for-each-4.y pattern (and breaking the
set-for-each-4.y-with-a-different-default pattern) to unblock 4.17's
GA, but we may revisit this approach in the future with more lead
time.  This commit backports (without v4.18) [2] to release-4.17.

[1]: https://issues.redhat.com/browse/OCPBUGS-41111
[2]: openshift#2022
wking added a commit to wking/openshift-api that referenced this pull request Sep 10, 2024
This is a synonym for v4.16, because there have not been
capability-recommendation changes since that release.  4.17 is about
to go Generally Available, which means v4.17 will always be a synonym
for v4.16.  I think defining synonym capability sets is busywork that
takes developer time without adding customer value, but [1] points out
that so far every 4.y release has had a v4.y capability set string
associated with it, and folks might find adjustments to that pattern
surprising.  I'm declaring the v4.17 set to continue the existing
set-for-each-4.y pattern (and breaking the
set-for-each-4.y-with-a-different-default pattern) to unblock 4.17's
GA, but we may revisit this approach in the future with more lead
time.  This commit backports (without v4.18) [2] to release-4.17.

[1]: https://issues.redhat.com/browse/OCPBUGS-41111
[2]: openshift#2022
These are both synonyms for v4.16, because there have not been
capability-recommendation changes since that release.  4.17 is about
to go Generally Available, which means v4.17 will always be a synonym
for v4.16.  v4.18 may or may not evolve before 4.18 goes GA.  I think
defining synonym capability sets is busywork that takes developer time
without adding customer value, but [1] points out that so far every
4.y release has had a v4.y capability set string associated with it,
and folks might find adjustments to that pattern surprising.  I'm
declaring sets for our next two 4.y here to continue the existing
set-for-each-4.y pattern (and breaking the
set-for-each-4.y-with-a-different-default pattern) to unblock 4.17's
GA, but we may revisit this approach in the future with more lead
time.

[1]: https://issues.redhat.com/browse/OCPBUGS-41111
@wking wking force-pushed the 4.17-and-4.18-cluster-version-capability-sets branch from eeb1bf2 to 67e03da Compare September 10, 2024 20:03
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Sep 10, 2024

@wking: 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-sigs/prow repository. I understand the commands that are listed here.

wking added a commit to wking/openshift-api that referenced this pull request Sep 10, 2024
This is a synonym for v4.16, because there have not been
capability-recommendation changes since that release.  4.17 is about
to go Generally Available, which means v4.17 will always be a synonym
for v4.16.  I think defining synonym capability sets is busywork that
takes developer time without adding customer value, but [1] points out
that so far every 4.y release has had a v4.y capability set string
associated with it, and folks might find adjustments to that pattern
surprising.  I'm declaring the v4.17 set to continue the existing
set-for-each-4.y pattern (and breaking the
set-for-each-4.y-with-a-different-default pattern) to unblock 4.17's
GA, but we may revisit this approach in the future with more lead
time.  This commit backports (without v4.18) [2] to release-4.17.

[1]: https://issues.redhat.com/browse/OCPBUGS-41111
[2]: openshift#2022
@deads2k
Copy link
Copy Markdown
Contributor

deads2k commented Sep 11, 2024

/lgtm
/approve

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

openshift-ci Bot commented Sep 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, 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 Sep 11, 2024
@openshift-merge-bot openshift-merge-bot Bot merged commit 3e5de94 into openshift:master Sep 11, 2024
@openshift-ci-robot
Copy link
Copy Markdown

@wking: Jira Issue OCPBUGS-41111: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-41111 has been moved to the MODIFIED state.

Details

In response to this:

These are both synonyms for v4.16, because there have not been capability-recommendation changes since that release. 4.17 is about to go Generally Available, which means v4.17 will always be a synonym for v4.16. v4.18 may or may not evolve before 4.18 goes GA. I think defining synonym capability sets is busywork that takes developer time without adding customer value, but OCPBUGS-41111 points out that so far every 4.y release has had a v4.y capability set string associated with it, and folks might find adjustments to that pattern surprising. I'm declaring sets for our next two 4.y here to continue the existing set-for-each-4.y pattern (and breaking the set-for-each-4.y-with-a-different-default pattern) to unblock 4.17's GA, but we may revisit this approach in the future with more lead time.

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 openshift-eng/jira-lifecycle-plugin repository.

@wking wking deleted the 4.17-and-4.18-cluster-version-capability-sets branch September 11, 2024 19:43
wking added a commit to wking/cluster-version-operator that referenced this pull request Sep 11, 2024
Catching up with [1].  Generated with:

  $ go get github.com/openshift/api@master
  $ go mod tidy
  $ go mod vendor
  $ git add -A go.* vendor

all using:

  $ go version
  go version go1.22.2 linux/amd64

[1]: openshift/api#2022
@openshift-bot
Copy link
Copy Markdown

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-config-api
This PR has been included in build ose-cluster-config-api-container-v4.18.0-202409112312.p0.g3e5de94.assembly.stream.el9.
All builds following this will include this PR.

wking added a commit to wking/oc that referenced this pull request Sep 12, 2024
Catching up with [1].  Generated with:

  $ go get github.com/openshift/api@master
  $ go mod tidy
  $ go mod vendor
  $ git add -A go.* vendor

all using:

  $ go version
  go version go1.22.2 linux/amd64

This addresses [2]:

  $ cat v4.17-basecap.yaml
  ---
  apiVersion: v1
  platform:
    gcp:
      foo: bar
  capabilities:
    baselineCapabilitySet: v4.17
  $ ./oc adm release extract --install-config v4.17-basecap.yaml --included --credentials-requests --from quay.io/openshift-release-dev/ocp-release:4.17.0-rc.1-x86_64 --to /tmp/test
  error: unrecognized baselineCapabilitySet "v4.17"

because pkg/cli/admin/release/extract_tools.go uses the vendored
openshift/api/config/v1 to unpack capabilities.

[1]: openshift/api#2022
[2]: https://issues.redhat.com/browse/OCPBUGS-41111
wking added a commit to wking/openshift-installer that referenced this pull request Sep 13, 2024
Catching up with [1].  Generated with:

  $ go get github.com/openshift/api@master
  $ go mod tidy
  $ go mod vendor
  $ go generate ./pkg/types/installconfig.go
  $ git add -A go.* vendor data/data/install.openshift.io_installconfigs.yaml

all using:

  $ go version
  go version go1.23.1 linux/amd64

This will allow users to use the new capability sets in their install-config YAML.

[1]: openshift/api#2022
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. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants