Skip to content

[release-4.21] OCPBUGS-74373: Remove restriction of unmanaged x-k8s.io#30718

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.21from
openshift-cherrypick-robot:cherry-pick-30658-to-release-4.21
May 13, 2026
Merged

[release-4.21] OCPBUGS-74373: Remove restriction of unmanaged x-k8s.io#30718
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.21from
openshift-cherrypick-robot:cherry-pick-30658-to-release-4.21

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown

This is an automated cherry-pick of #30658

/assign rikatz

Previously, cluster-ingress-operator would manage and block any
    updates to CRDs that were from group gateway.networking.x-k8s.io.

    After some analysis we identified that OSSM/Istio does filter these
    resources in case it does not have a flag to enable alpha APIs, which means
    it is safe to allow users to deploy these CRDs.

    This way, this change removes any restriction on x-k8s.io group,
    and removes any further reconciliation from CIO on x-k8s.io group.

Signed-off-by: Ricardo Pchevuzinske Katz <katz@redhat.com>
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jan 22, 2026

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: NE-2376

Details

In response to this:

This is an automated cherry-pick of #30658

/assign rikatz

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.

@rikatz
Copy link
Copy Markdown
Member

rikatz commented Jan 22, 2026

/lgtm
/approve
/cc @Miciah

@openshift-ci openshift-ci Bot requested a review from Miciah January 22, 2026 22:10
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jan 22, 2026
@Miciah
Copy link
Copy Markdown
Contributor

Miciah commented Jan 22, 2026

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 22, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Miciah, openshift-cherrypick-robot, rikatz

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 Jan 22, 2026
@Miciah
Copy link
Copy Markdown
Contributor

Miciah commented Jan 22, 2026

This is a low-risk backport. It changes tests to loosen restrictions on creating Gateway API CRDs in the x-k8s.io group, which the platform does not install and which our gateway controller would ignore if they were installed.

/label backport-risk-assessed

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 22, 2026

@Miciah: Can not set label backport-risk-assessed: Must be member in one of these teams: [openshift-patch-managers openshift-release-oversight openshift-staff-engineers openshift-sustaining-engineers]

Details

In response to this:

This is a low-risk backport. It changes tests to loosen restrictions on creating Gateway API CRDs in the x-k8s.io group, which the platform does not install and which our gateway controller would ignore if they were installed.

/label backport-risk-assessed

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.

@Miciah
Copy link
Copy Markdown
Contributor

Miciah commented Jan 22, 2026

@knobunc, can you add the "backport-risk-assessed" and "jira/valid-bug" labels?

@Miciah
Copy link
Copy Markdown
Contributor

Miciah commented Jan 22, 2026

We will also need the same labels on #30717 and #30719.

@knobunc
Copy link
Copy Markdown
Contributor

knobunc commented Jan 23, 2026

/label cherry-pick-approved

@openshift-ci openshift-ci Bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 23, 2026
@knobunc
Copy link
Copy Markdown
Contributor

knobunc commented Jan 23, 2026

/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 23, 2026
@rikatz
Copy link
Copy Markdown
Member

rikatz commented Jan 23, 2026

/retitle [release-4.21] OCPBUGS-74373: Remove restriction of unmanaged x-k8s.io

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jan 23, 2026
@rikatz
Copy link
Copy Markdown
Member

rikatz commented Jan 23, 2026

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown

@rikatz: This pull request references Jira Issue OCPBUGS-74373, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected Jira Issue OCPBUGS-74373 to depend on a bug targeting a version in 4.22.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

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

Details

In response to this:

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

@rikatz
Copy link
Copy Markdown
Member

rikatz commented Jan 23, 2026

/hold

@Miciah will wait to open a parent bug for this backport, we can discuss this on Monday morning.

@knobunc thanks for the approval!

@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 23, 2026
@rikatz
Copy link
Copy Markdown
Member

rikatz commented Jan 30, 2026

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown

@rikatz: This pull request references Jira Issue OCPBUGS-74373, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

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

Details

In response to this:

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

@rikatz
Copy link
Copy Markdown
Member

rikatz commented Jan 30, 2026

/jira refresh
@Miciah I have marked the release note as not required, unless you feel this should be considered a bug

@openshift-ci-robot openshift-ci-robot added jira/severity-low Referenced Jira bug's severity is low 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. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 30, 2026
@openshift-ci-robot
Copy link
Copy Markdown

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.21.0) matches configured target version for branch (4.21.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-74693 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-74693 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
  • bug has dependents
Details

In response to this:

/jira refresh
@Miciah I have marked the release note as not required, unless you feel this should be considered a bug

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

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci Bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label May 1, 2026
@rhamini3
Copy link
Copy Markdown
Contributor

marking bug as verified since all e2e origin tests pass and CRD annotation does not show experimental

 oc get crds gatewayclasses.gateway.networking.k8s.io -ojsonpath={.metadata.annotations}
{"api-approved.kubernetes.io":"https://github.com/kubernetes-sigs/gateway-api/pull/3328","gateway.networking.k8s.io/bundle-version":"v1.3.0","gateway.networking.k8s.io/channel":"standard"}%                 iamin@iamin-mac openshift-tests-private % oc get crds gateways.gateway.networking.k8s.io -ojsonpath={.metadata.annotations}
{"api-approved.kubernetes.io":"https://github.com/kubernetes-sigs/gateway-api/pull/3328","gateway.networking.k8s.io/bundle-version":"v1.3.0","gateway.networking.k8s.io/channel":"standard"}%                 iamin@iamin-mac openshift-tests-private % oc get crds grpcroutes.gateway.networking.k8s.io -ojsonpath={.metadata.annotations}
{"api-approved.kubernetes.io":"https://github.com/kubernetes-sigs/gateway-api/pull/3328","gateway.networking.k8s.io/bundle-version":"v1.3.0","gateway.networking.k8s.io/channel":"standard"}%                 iamin@iamin-mac openshift-tests-private % oc get crds httproutes.gateway.networking.k8s.io -ojsonpath={.metadata.annotations} 
{"api-approved.kubernetes.io":"https://github.com/kubernetes-sigs/gateway-api/pull/3328","gateway.networking.k8s.io/bundle-version":"v1.3.0","gateway.networking.k8s.io/channel":"standard"}%                 iamin@iamin-mac openshift-tests-private % oc get crds referencegrants.gateway.networking.k8s.io -ojsonpath={.metadata.annotations}
{"api-approved.kubernetes.io":"https://github.com/kubernetes-sigs/gateway-api/pull/3328","gateway.networking.k8s.io/bundle-version":"v1.3.0","gateway.networking.k8s.io/channel":"standard"}% 

/verified by @rhamini3

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label May 12, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@rhamini3: This PR has been marked as verified by @rhamini3.

Details

In response to this:

marking bug as verified since all e2e origin tests pass and CRD annotation does not show experimental

oc get crds gatewayclasses.gateway.networking.k8s.io -ojsonpath={.metadata.annotations}
{"api-approved.kubernetes.io":"https://github.com/kubernetes-sigs/gateway-api/pull/3328","gateway.networking.k8s.io/bundle-version":"v1.3.0","gateway.networking.k8s.io/channel":"standard"}%                 iamin@iamin-mac openshift-tests-private % oc get crds gateways.gateway.networking.k8s.io -ojsonpath={.metadata.annotations}
{"api-approved.kubernetes.io":"https://github.com/kubernetes-sigs/gateway-api/pull/3328","gateway.networking.k8s.io/bundle-version":"v1.3.0","gateway.networking.k8s.io/channel":"standard"}%                 iamin@iamin-mac openshift-tests-private % oc get crds grpcroutes.gateway.networking.k8s.io -ojsonpath={.metadata.annotations}
{"api-approved.kubernetes.io":"https://github.com/kubernetes-sigs/gateway-api/pull/3328","gateway.networking.k8s.io/bundle-version":"v1.3.0","gateway.networking.k8s.io/channel":"standard"}%                 iamin@iamin-mac openshift-tests-private % oc get crds httproutes.gateway.networking.k8s.io -ojsonpath={.metadata.annotations} 
{"api-approved.kubernetes.io":"https://github.com/kubernetes-sigs/gateway-api/pull/3328","gateway.networking.k8s.io/bundle-version":"v1.3.0","gateway.networking.k8s.io/channel":"standard"}%                 iamin@iamin-mac openshift-tests-private % oc get crds referencegrants.gateway.networking.k8s.io -ojsonpath={.metadata.annotations}
{"api-approved.kubernetes.io":"https://github.com/kubernetes-sigs/gateway-api/pull/3328","gateway.networking.k8s.io/bundle-version":"v1.3.0","gateway.networking.k8s.io/channel":"standard"}% 

/verified by @rhamini3

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.

@rikatz
Copy link
Copy Markdown
Member

rikatz commented May 12, 2026

/remove-lifecycle stale
side note for myself: implement on CIO once this gets merged

@openshift-ci openshift-ci Bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label May 12, 2026
@rikatz
Copy link
Copy Markdown
Member

rikatz commented May 12, 2026

/cherry-pick release-4.20

@openshift-cherrypick-robot
Copy link
Copy Markdown
Author

@rikatz: once the present PR merges, I will cherry-pick it on top of release-4.20 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.20

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.

@rikatz
Copy link
Copy Markdown
Member

rikatz commented May 13, 2026

/hold cancel

@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 May 13, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 13, 2026

@openshift-cherrypick-robot: 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.

@openshift-merge-bot openshift-merge-bot Bot merged commit 3fe3e5f into openshift:release-4.21 May 13, 2026
9 checks passed
@openshift-ci-robot
Copy link
Copy Markdown

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-74373
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-74373 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

This is an automated cherry-pick of #30658

/assign rikatz

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-cherrypick-robot
Copy link
Copy Markdown
Author

@rikatz: new pull request created: #31167

Details

In response to this:

/cherry-pick release-4.20

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.

@openshift-merge-robot
Copy link
Copy Markdown
Contributor

Fix included in release 4.21.0-0.nightly-2026-05-13-171201

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-low Referenced Jira bug's severity is low 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.