Skip to content

CNTRLPLANE-1314: Update openshift/oauth-server to latest Kubernetes 1.33 version - #197

Merged
openshift-merge-bot[bot] merged 4 commits into
openshift:masterfrom
sanchezl:master
Dec 1, 2025
Merged

CNTRLPLANE-1314: Update openshift/oauth-server to latest Kubernetes 1.33 version#197
openshift-merge-bot[bot] merged 4 commits into
openshift:masterfrom
sanchezl:master

Conversation

@sanchezl

@sanchezl sanchezl commented Aug 22, 2025

Copy link
Copy Markdown
Contributor

Bump kube and openshift dependencies.

@sanchezl

Copy link
Copy Markdown
Contributor Author

/hold for openshift/kubernetes-apiserver#67

@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 Aug 22, 2025
@openshift-ci
openshift-ci Bot requested review from ibihim and liouk August 22, 2025 03:13
@sanchezl sanchezl changed the title master CNTRLPLANE-1314: Update openshift/oauth-server to latest Kubernetes 1.33 version Aug 22, 2025
@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 22, 2025
@openshift-ci-robot

openshift-ci-robot commented Aug 22, 2025

Copy link
Copy Markdown
Contributor

@sanchezl: This pull request references CNTRLPLANE-1314 which is a valid jira issue.

Details

In response to this:

  • k8s133: update vendor
  • k8s133: update dependencies

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.

Comment thread pkg/server/grant/grant.go Outdated
Comment on lines +129 to +130
if err != nil || client == nil {
if err != nil || client == nil || reflect.ValueOf(client).Elem().IsZero() {

@sanchezl sanchezl Aug 24, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

  • The new generic client-go changes the behavior of Get to return a zero value instead of a nil.
  • The OAuthClient struct is non-comparable, so I had to resort to using the reflect package here.
  • This change is needed for tests that use the badClientRegistry, which IMO is an especially bad client registry.
    • It returns true, nil, nil which I do not think it is a valid result.
    • As I see it, it should always return a valid client when err == nil, and we should be expecting a NotFound error in the case where it is currently returning nil, nil.

In the end, I opted to perform the minimum needed to pass the test, more testing would be needed to fully refactor.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Further looking into it, this new behavior from the generic fake Get actually matches the actual Get behavior..

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I agree this isn't something that is supposed to happen. Can we change the two test cases to call badClientRegistry with non-nil errors instead? I'd prefer to see the change in the fake client behavior addressed with test-only changes.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I've changed the test case to match the expected behavior.

@sanchezl

Copy link
Copy Markdown
Contributor Author

/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 Aug 27, 2025
@openshift-ci-robot

openshift-ci-robot commented Aug 27, 2025

Copy link
Copy Markdown
Contributor

@sanchezl: This pull request references CNTRLPLANE-1314 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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot

openshift-ci-robot commented Aug 27, 2025

Copy link
Copy Markdown
Contributor

@sanchezl: This pull request references CNTRLPLANE-1314 which is a valid jira issue.

Details

In response to this:

Bump kube and openshift dependencies.

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.

@benluddy

Copy link
Copy Markdown

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 27, 2025
@sanchezl

Copy link
Copy Markdown
Contributor Author

/payload-with-prs 4.20 nightly informing #197 openshift/oauth-apiserver#139

@openshift-ci

openshift-ci Bot commented Aug 28, 2025

Copy link
Copy Markdown
Contributor

@sanchezl: trigger 67 job(s) of type informing for the nightly release of OCP 4.20

  • periodic-ci-openshift-release-master-nightly-4.20-e2e-agent-compact-fips
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-agent-ha-dualstack-conformance
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-agent-single-node-ipv6-conformance
  • periodic-ci-openshift-release-master-nightly-4.20-console-aws
  • periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.20-periodics-e2e-aws
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-csi
  • periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-cgroupsv2
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-fips
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-single-node
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-single-node-csi
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-single-node-serial
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-single-node-techpreview
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-single-node-techpreview-serial
  • periodic-ci-openshift-release-master-nightly-4.20-upgrade-from-stable-4.19-e2e-aws-upgrade-ovn-single-node
  • periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-upgrade-out-of-change
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-upi
  • periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.20-periodics-e2e-azure
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-azure-csi
  • periodic-ci-openshift-release-master-ci-4.20-e2e-azure-ovn
  • periodic-ci-openshift-release-master-ci-4.20-e2e-azure-ovn-serial
  • periodic-ci-openshift-release-master-ci-4.20-e2e-azure-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.20-e2e-azure-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-ci-4.20-e2e-azure-ovn-upgrade-out-of-change
  • periodic-ci-openshift-release-master-cnv-nightly-4.20-deploy-azure-kubevirt-ovn
  • periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.20-periodics-e2e-gcp
  • periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-gcp-ovn-csi
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-gcp-ovn-rt
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-gcp-ovn-serial
  • periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-ci-4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-hypershift-release-4.20-periodics-e2e-azure-kubevirt-ovn
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-dualstack
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-dualstack-techpreview
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-ipv6-techpreview
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-serial-ipv4
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-serial-virtualmedia-1of2
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-serial-virtualmedia-2of2
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-techpreview
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.20-upgrade-from-stable-4.19-e2e-metal-ipi-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-serial-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-serial-ovn-dualstack
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-upgrade-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.20-upgrade-from-stable-4.19-e2e-metal-ipi-upgrade-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.20-metal-ovn-single-node-recert-cluster-rename
  • periodic-ci-openshift-osde2e-main-nightly-4.20-osd-aws
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-osd-ccs-gcp
  • periodic-ci-openshift-osde2e-main-nightly-4.20-osd-gcp
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-proxy
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-single-node-live-iso
  • periodic-ci-openshift-eng-ocp-qe-perfscale-ci-main-aws-4.20-nightly-x86-payload-control-plane-6nodes
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-telco5g
  • periodic-ci-openshift-release-master-ci-4.20-upgrade-from-stable-4.19-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn-csi
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn-serial
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn-techpreview
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-ci-4.20-e2e-vsphere-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.20-upgrade-from-stable-4.19-e2e-vsphere-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn-upi
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn-upi-serial
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-static-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/207a7460-8433-11f0-9625-32a948b50521-0

@openshift-ci

openshift-ci Bot commented Aug 28, 2025

Copy link
Copy Markdown
Contributor

@sanchezl: This PR was included in a payload test run from #197
trigger 67 job(s) of type informing for the nightly release of OCP 4.20

  • periodic-ci-openshift-release-master-nightly-4.20-e2e-agent-compact-fips
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-agent-ha-dualstack-conformance
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-agent-single-node-ipv6-conformance
  • periodic-ci-openshift-release-master-nightly-4.20-console-aws
  • periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.20-periodics-e2e-aws
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-csi
  • periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-cgroupsv2
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-fips
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-single-node
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-single-node-csi
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-single-node-serial
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-single-node-techpreview
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-single-node-techpreview-serial
  • periodic-ci-openshift-release-master-nightly-4.20-upgrade-from-stable-4.19-e2e-aws-upgrade-ovn-single-node
  • periodic-ci-openshift-release-master-ci-4.20-e2e-aws-ovn-upgrade-out-of-change
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-upi
  • periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.20-periodics-e2e-azure
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-azure-csi
  • periodic-ci-openshift-release-master-ci-4.20-e2e-azure-ovn
  • periodic-ci-openshift-release-master-ci-4.20-e2e-azure-ovn-serial
  • periodic-ci-openshift-release-master-ci-4.20-e2e-azure-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.20-e2e-azure-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-ci-4.20-e2e-azure-ovn-upgrade-out-of-change
  • periodic-ci-openshift-release-master-cnv-nightly-4.20-deploy-azure-kubevirt-ovn
  • periodic-ci-openshift-cluster-control-plane-machine-set-operator-release-4.20-periodics-e2e-gcp
  • periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-gcp-ovn-csi
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-gcp-ovn-rt
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-gcp-ovn-serial
  • periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-ci-4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.20-e2e-gcp-ovn-upgrade
  • periodic-ci-openshift-hypershift-release-4.20-periodics-e2e-azure-kubevirt-ovn
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-dualstack
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-dualstack-techpreview
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-ipv6-techpreview
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-serial-ipv4
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-serial-virtualmedia-1of2
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-serial-virtualmedia-2of2
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-techpreview
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.20-upgrade-from-stable-4.19-e2e-metal-ipi-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-serial-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-serial-ovn-dualstack
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ipi-upgrade-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.20-upgrade-from-stable-4.19-e2e-metal-ipi-upgrade-ovn-ipv6
  • periodic-ci-openshift-release-master-nightly-4.20-metal-ovn-single-node-recert-cluster-rename
  • periodic-ci-openshift-osde2e-main-nightly-4.20-osd-aws
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-osd-ccs-gcp
  • periodic-ci-openshift-osde2e-main-nightly-4.20-osd-gcp
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-aws-ovn-proxy
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-single-node-live-iso
  • periodic-ci-openshift-eng-ocp-qe-perfscale-ci-main-aws-4.20-nightly-x86-payload-control-plane-6nodes
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-telco5g
  • periodic-ci-openshift-release-master-ci-4.20-upgrade-from-stable-4.19-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn-csi
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn-serial
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn-techpreview
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-ci-4.20-e2e-vsphere-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.20-upgrade-from-stable-4.19-e2e-vsphere-ovn-upgrade
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn-upi
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-ovn-upi-serial
  • periodic-ci-openshift-release-master-nightly-4.20-e2e-vsphere-static-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/207a7460-8433-11f0-9625-32a948b50521-0

@davegord

Copy link
Copy Markdown

/retest required

@openshift-ci

openshift-ci Bot commented Aug 28, 2025

Copy link
Copy Markdown
Contributor

@davegord: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

/test e2e-agnostic-upgrade
/test e2e-aws-serial
/test e2e-gcp
/test images
/test okd-scos-images
/test unit
/test verify
/test verify-deps

The following commands are available to trigger optional jobs:

/test okd-scos-e2e-aws-ovn

Use /test all to run all jobs.

Details

In response to this:

/retest required

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.

@davegord

Copy link
Copy Markdown

/retest-required

@sanchezl

Copy link
Copy Markdown
Contributor Author

/retest

@sanchezl

Copy link
Copy Markdown
Contributor Author

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci Bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Aug 29, 2025
@benluddy

Copy link
Copy Markdown

/retest

@benluddy

Copy link
Copy Markdown

/lgtm
/verified by CI

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 11, 2025
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@benluddy: This PR has been marked as verified by CI.

Details

In response to this:

/lgtm
/verified by CI

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.

@benluddy

Copy link
Copy Markdown

/assign @ibihim

@ibihim

ibihim commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

/approve

@openshift-ci

openshift-ci Bot commented Nov 13, 2025

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benluddy, ibihim, sanchezl

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 Nov 13, 2025
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 34b3502 and 2 for PR HEAD d903dae in total

@ibihim

ibihim commented Dec 1, 2025

Copy link
Copy Markdown
Contributor

/retest-required

Automated retry triggered by CI triage analysis.

Failure Analysis:

  • ci/prow/e2e-aws-serial failed due to 4-hour timeout during deprovision phase
  • All 231 e2e tests that ran completed successfully (0 failures)
  • The job exceeded time limit during infrastructure cleanup, not during test execution
  • Classification: Infrastructure issue (95% confidence)

This is a transient timing issue, not a code problem.

@openshift-ci

openshift-ci Bot commented Dec 1, 2025

Copy link
Copy Markdown
Contributor

@sanchezl: 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 bc11559 into openshift:master Dec 1, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants