Skip to content

NO-JIRA: correct issues found while rebasing bump(api,client-go)#30659

Open
sanchezl wants to merge 2 commits intoopenshift:mainfrom
sanchezl:cluster-image-policy-rename
Open

NO-JIRA: correct issues found while rebasing bump(api,client-go)#30659
sanchezl wants to merge 2 commits intoopenshift:mainfrom
sanchezl:cluster-image-policy-rename

Conversation

@sanchezl
Copy link
Copy Markdown
Contributor

@sanchezl sanchezl commented Jan 7, 2026

Summary

While rebasing the bump(api,client-go) PR, I noticed a couple of discrepancies that needed fixing:

  • test/e2e/upgrade/monitor.go: configv1.Update is no longer directly comparable (e.g., == or reflect.DeepEqual) after the API bump. Replaced reflect.DeepEqual with field-by-field comparison of the fields that identify the update target (Architecture, Version, Image).
  • test/extended/util/configv1shim.go: InsightsDataGathers() was incorrectly checking c.v1Kinds["APIServer"] and panicking with an "APIServer not implemented" message. Corrected both to reference "InsightsDataGather".

@openshift-ci-robot
Copy link
Copy Markdown

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: automatic mode

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 7, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@sanchezl: This pull request explicitly references no jira issue.

Details

In response to this:

  • proof: temp deps
  • proof: update vendor
  • fix: update to ImageSigstoreVerificationPolicy and adjust related types
  • fix: correct InsightsDataGather check in ConfigV1ClientShim

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 review from deads2k and sjenning January 7, 2026 16:04
@openshift-ci openshift-ci Bot added the vendor-update Touching vendor dir or related files label Jan 7, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 7, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: sanchezl
Once this PR has been reviewed and has the lgtm label, please assign deads2k for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@sanchezl
Copy link
Copy Markdown
Contributor Author

sanchezl commented Jan 7, 2026

/hold for openshift/machine-config-operator#5500

@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 7, 2026
@sanchezl sanchezl force-pushed the cluster-image-policy-rename branch from d640f04 to 298529e Compare January 9, 2026 05:43
@sanchezl
Copy link
Copy Markdown
Contributor Author

sanchezl commented Jan 9, 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 Jan 9, 2026
@openshift-ci-robot
Copy link
Copy Markdown

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 13, 2026
@sanchezl sanchezl force-pushed the cluster-image-policy-rename branch from 298529e to a9b70a0 Compare January 19, 2026 19:31
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 19, 2026
@openshift-ci-robot
Copy link
Copy Markdown

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-ovn-upgrade-rollback
/test e2e-metal-ovn-two-node-fencing

@sanchezl
Copy link
Copy Markdown
Contributor Author

/retest-required

@sanchezl sanchezl force-pushed the cluster-image-policy-rename branch from a9b70a0 to 057618a Compare March 16, 2026 15:37
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Mar 16, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 945125a8-c759-4716-80c6-100d1027fb38

📥 Commits

Reviewing files that changed from the base of the PR and between 057618a and e0befec.

📒 Files selected for processing (2)
  • test/e2e/upgrade/monitor.go
  • test/extended/util/configv1shim.go
🚧 Files skipped from review as they are similar to previous changes (1)
  • test/e2e/upgrade/monitor.go

Walkthrough

Two test utility files are updated: one refactors version comparison logic to check specific fields instead of deep equality, and another corrects the feature guard condition for InsightsDataGather support detection.

Changes

Cohort / File(s) Summary
Version comparison refactoring
test/e2e/upgrade/monitor.go
Replaces DeepEqual-based comparison of cv.Spec.DesiredUpdate with explicit field-by-field comparison of Architecture, Version, and Image fields, plus nil-check. Changes observed-change detection logic to consider only identifying fields when generation advances.
Feature guard condition correction
test/extended/util/configv1shim.go
Corrects the guard condition in InsightsDataGathers() method from checking v1Kinds["APIServer"] to v1Kinds["InsightsDataGather"], aligning the panic trigger with the actual feature being checked.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
📝 Coding Plan
  • Generate coding plan for human review comments

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 golangci-lint (2.11.3)

Error: can't load config: unsupported version of the configuration: "" See https://golangci-lint.run/docs/product/migration-guide for migration instructions
The command is terminated due to an error: can't load config: unsupported version of the configuration: "" See https://golangci-lint.run/docs/product/migration-guide for migration instructions


Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 16, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 16, 2026

@sanchezl: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-metal-ovn-two-node-fencing a9b70a0 link false /test e2e-metal-ovn-two-node-fencing

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.

@sanchezl sanchezl force-pushed the cluster-image-policy-rename branch from 057618a to e0befec Compare March 16, 2026 15:53
@sanchezl sanchezl changed the title NO-JIRA: bump client-go fix: correct issues found while rebasing bump(api,client-go) Mar 16, 2026
@sanchezl sanchezl changed the title fix: correct issues found while rebasing bump(api,client-go) NO-JIRA: correct issues found while rebasing bump(api,client-go) Mar 16, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@sanchezl: This pull request explicitly references no jira issue.

Details

In response to this:

Summary

While rebasing the bump(api,client-go) PR, I noticed a couple of discrepancies that needed fixing:

  • test/e2e/upgrade/monitor.go: configv1.Update is no longer directly comparable (e.g., == or reflect.DeepEqual) after the API bump. Replaced reflect.DeepEqual with field-by-field comparison of the fields that identify the update target (Architecture, Version, Image).
  • test/extended/util/configv1shim.go: InsightsDataGathers() was incorrectly checking c.v1Kinds["APIServer"] and panicking with an "APIServer not implemented" message. Corrected both to reference "InsightsDataGather".

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-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 16, 2026
@openshift-ci-robot
Copy link
Copy Markdown

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-ovn-upgrade-rollback

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. vendor-update Touching vendor dir or related files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants