Skip to content

OCPBUGS-77061: Vendor Downstream CAPO#170

Open
danchild wants to merge 1 commit into
openshift:mainfrom
shiftstack:chore/replace-vendored-upstream-capo
Open

OCPBUGS-77061: Vendor Downstream CAPO#170
danchild wants to merge 1 commit into
openshift:mainfrom
shiftstack:chore/replace-vendored-upstream-capo

Conversation

@danchild

@danchild danchild commented Jun 10, 2026

Copy link
Copy Markdown
Member

Replace vendored upstream CAPO with downstream CAPO

The fix to OCPBUGS-77061 has been made to downstream CAPO and merged into release-0.90 openshift/cluster-api-provider-openstack/pull/421; so, the patch must now be applied to MAPO.

Summary by CodeRabbit

  • Chores
    • Updated cluster API provider module dependencies.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 10, 2026
@openshift-ci-robot

openshift-ci-robot commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

@danchild: This pull request references OSASINFRA-4329 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

TODO

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.

@coderabbitai

coderabbitai Bot commented Jun 10, 2026

Copy link
Copy Markdown

Walkthrough

This PR adds a module replace directive in go.mod that redirects the Cluster API Provider OpenStack dependency from the upstream sigs.k8s.io module to the OpenShift fork at a pinned commit version.

Changes

Dependency Replacement

Layer / File(s) Summary
Cluster API Provider OpenStack replacement
go.mod
A replace directive is added to point sigs.k8s.io/cluster-api-provider-openstack to github.com/openshift/cluster-api-provider-openstack at version v0.9.1-0.20260608151417-e831b17e5462.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes


Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

❌ Failed checks (1 error, 1 warning)

Check name Status Explanation Resolution
Ote Binary Stdout Contract ❌ Error PR adds fmt.Println to stdout (line 118) and lacks klog stderr redirection. klog.SetOutput(os.Stderr) or klog.LogToStderr(true) not called before klog.InitFlags() at line 114. Add klog.SetOutput(os.Stderr) before klog.InitFlags(nil) at line 114; redirect fmt.Println version output to os.Stderr to prevent stdout JSON corruption.
Test Structure And Quality ⚠️ Warning Ginkgo test in controller_test.go has missing timeouts on Eventually call (line 147) and lacks assertion messages on multiple Expect() statements, violating requirements #3 and #4. Add timeout parameter to Eventually on line 147 and add meaningful failure messages to all Expect() calls using the second parameter (e.g., Expect(err).NotTo(HaveOccurred(), "failed to create namespace")).
✅ Passed checks (13 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed All Ginkgo test names are stable and deterministic. Test declarations use only static strings with no dynamic content like fmt.Sprintf, concatenation, pod/namespace names, timestamps, or UUIDs.
Microshift Test Compatibility ✅ Passed No Ginkgo e2e tests are added in this PR. The change is a go.mod dependency update only, with no test files modified or added.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR contains no new Ginkgo e2e tests. It only modifies go.mod to change a dependency directive. The SNO compatibility check does not apply.
Topology-Aware Scheduling Compatibility ✅ Passed This PR only modifies go.mod to add a replace directive, vendoring in dependencies. No deployment manifests, operator code, or controllers with scheduling constraints are added or modified.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No IPv6 or disconnected network issues. PR adds unit tests (not e2e) with Ginkgo patterns that use mocked services, no hardcoded IPs, no external connectivity.
No-Weak-Crypto ✅ Passed No weak cryptography (MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB) or non-constant-time secret comparisons found in source code.
Container-Privileges ✅ Passed PR contains no container/K8s manifests defining security contexts; changes are limited to go.mod dependency management and source code, not deployment configs.
No-Sensitive-Data-In-Logs ✅ Passed No sensitive data logging detected. All log statements reviewed contain only safe metadata; tokens/secrets are stored in Kubernetes Secrets, not logged.
Title check ✅ Passed The title 'OCPBUGS-77061: Vendor Downstream CAPO' clearly summarizes the main change: vendoring a downstream version of CAPO. The change in go.mod adds a replace directive for cluster-api-provider-openstack to use a downstream fork, which directly aligns with the title.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@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 Jun 10, 2026
@openshift-ci

openshift-ci Bot commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

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

@openshift-ci

openshift-ci Bot commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: danchild
Once this PR has been reviewed and has the lgtm label, please assign gryf 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

Signed-off-by: Dan Childers <dchilder@redhat.com>
@danchild danchild force-pushed the chore/replace-vendored-upstream-capo branch from efa5fc9 to d0ab8cf Compare June 10, 2026 13:40
@danchild

Copy link
Copy Markdown
Member Author

/assign @stephenfin

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@go.mod`:
- Line 123: The replace directive "replace
sigs.k8s.io/cluster-api-provider-openstack =>
github.com/openshift/cluster-api-provider-openstack
v0.9.1-0.20260608151417-e831b17e5462" downgrades the OpenStack provider and uses
a pseudo-version without justification; update go.mod and project docs to either
pin to a tagged, supported release of
github.com/openshift/cluster-api-provider-openstack (avoid pseudo-versions) or
remove the replace and explain the rationale for the downgrade, and add
supply-chain evidence: record the CVE/osv.dev results, license compatibility
check, SBOM/provenance and signing proof, and a short risk/impact statement
describing expected behavior changes from replacing
sigs.k8s.io/cluster-api-provider-openstack with the downstream fork.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 30d637ab-72b7-4b93-8829-cc9e2ef11642

📥 Commits

Reviewing files that changed from the base of the PR and between 8a8c354 and efa5fc9.

⛔ Files ignored due to path filters (4)
  • go.sum is excluded by !**/*.sum
  • vendor/modules.txt is excluded by !**/vendor/**, !vendor/**
  • vendor/sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/networking/port.go is excluded by !**/vendor/**, !vendor/**
  • vendor/sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/networking/service.go is excluded by !**/vendor/**, !vendor/**
📒 Files selected for processing (1)
  • go.mod

Comment thread go.mod
@danchild danchild marked this pull request as ready for review June 10, 2026 13:49
@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 Jun 10, 2026
@openshift-ci openshift-ci Bot requested review from gryf and stephenfin June 10, 2026 13:50
@danchild danchild changed the title OSASINFRA-4329: Vendor Downstream CAPO OCPBUGS-77061: Vendor Downstream CAPO Jun 10, 2026
@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 Jun 10, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@danchild: This pull request references Jira Issue OCPBUGS-77061, which is invalid:

  • expected the bug to target the "5.0.0" version, but no target version was set
  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED instead

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.

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

Details

In response to this:

Replace vendored upstream CAPO with downstream CAPO

The fix to OSASINFRA-4329 has been made to downstream CAPO and merged into release-0.90 openshift/cluster-api-provider-openstack/pull/421; so, the patch must now be applied to MAPO.

Summary by CodeRabbit

  • Chores
  • Updated cluster API provider module 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.

@ekuris-redhat

Copy link
Copy Markdown

/test e2e-openstack

2 similar comments
@danchild

Copy link
Copy Markdown
Member Author

/test e2e-openstack

@ekuris-redhat

Copy link
Copy Markdown

/test e2e-openstack

@openshift-ci

openshift-ci Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

@danchild: 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-openstack d0ab8cf link true /test e2e-openstack

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.

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

Labels

jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants