Skip to content

NO-ISSUE: Merge upstream#483

Merged
openshift-merge-bot[bot] merged 86 commits intoopenshift:mainfrom
honza:merge-upstream-2026-05-01
May 4, 2026
Merged

NO-ISSUE: Merge upstream#483
openshift-merge-bot[bot] merged 86 commits intoopenshift:mainfrom
honza:merge-upstream-2026-05-01

Conversation

@honza
Copy link
Copy Markdown
Member

@honza honza commented May 1, 2026

Summary by CodeRabbit

  • New Features

    • Added OCI image authentication support via secret reference
    • Added force flag for host detachment operations
  • Chores

    • Updated Go toolchain to 1.25.9
    • Upgraded Kubernetes dependencies to v0.35.4 and controller-runtime to v0.23.3
  • Bug Fixes

    • Improved OCI image URL detection with case-insensitive matching
  • Refactor

    • Consolidated reference type structure in host claim status

terror96 and others added 30 commits March 19, 2026 08:39
Prevent changes to a tracked configuration file and instead
construct the configuration file from a template file during
e2e tests. Do not track the configuration file.

Signed-off-by: Tero Kauppinen <tero.kauppinen@est.tech>
Remove unused verbs from kubebuilder RBAC markers to enforce least
privilege:
- secrets: remove delete
- events: remove get/list/watch
- namespaces: remove list/watch

Signed-off-by: Tuomo Tanskanen <tuomo.tanskanen@est.tech>
- Delete test/vbmctl/main.go and build-legacy-vbmctl target
- Switch E2E to use new vbmctl CLI with YAML config
- Add test/e2e/config/vbmctl.yaml for VM definitions
- Remove Network struct from BMC config since this is not used anymore

Signed-off-by: Lennart Jern <lennart.jern@est.tech>
Bumps [github.com/cert-manager/cert-manager](https://github.com/cert-manager/cert-manager) from 1.20.0 to 1.20.1.
- [Release notes](https://github.com/cert-manager/cert-manager/releases)
- [Changelog](https://github.com/cert-manager/cert-manager/blob/master/RELEASE.md)
- [Commits](cert-manager/cert-manager@v1.20.0...v1.20.1)

---
updated-dependencies:
- dependency-name: github.com/cert-manager/cert-manager
  dependency-version: 1.20.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/metal3-io/ironic-standalone-operator/api](https://github.com/metal3-io/ironic-standalone-operator) from 0.8.0 to 0.8.1.
- [Release notes](https://github.com/metal3-io/ironic-standalone-operator/releases)
- [Commits](metal3-io/ironic-standalone-operator@v0.8.0...v0.8.1)

---
updated-dependencies:
- dependency-name: github.com/metal3-io/ironic-standalone-operator/api
  dependency-version: 0.8.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Nuutti Hakala <nuutti.hakala@est.tech>
…l-templates

🌱 remove unneeded vbmctl template datatypes
…removal

🌱 Remove legacy vbmctl entrypoint and update E2E VM config
…s/test/main/github.com/cert-manager/cert-manager-1.20.1

🌱 Bump github.com/cert-manager/cert-manager from 1.20.0 to 1.20.1 in /test
…s/test/main/github.com/metal3-io/ironic-standalone-operator/api-0.8.1

🌱 Bump github.com/metal3-io/ironic-standalone-operator/api from 0.8.0 to 0.8.1 in /test
Bumps [github.com/metal3-io/ironic-standalone-operator/api](https://github.com/metal3-io/ironic-standalone-operator) from 0.8.0 to 0.8.1.
- [Release notes](https://github.com/metal3-io/ironic-standalone-operator/releases)
- [Commits](metal3-io/ironic-standalone-operator@v0.8.0...v0.8.1)

---
updated-dependencies:
- dependency-name: github.com/metal3-io/ironic-standalone-operator/api
  dependency-version: 0.8.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…-privileges

🐛 Remove unused RBAC permissions from controller ClusterRole
…s/main/github.com/metal3-io/ironic-standalone-operator/api-0.8.1

🌱 Bump github.com/metal3-io/ironic-standalone-operator/api from 0.8.0 to 0.8.1
Defines a package containing utility functions for unit testing both the
hostclaim_manager and the hostclaim_controller. Included only when the
right tag is set in Makefile.

Co-authored-by: Pierre Crégut <pierre.cregut@orange.com>
Co-authored-by: Laurent Roussarie <laurent.roussarie@orange.com>
Signed-off-by: Pierre Crégut <pierre.cregut@orange.com>
Adds a field to record the associated BareMetalHost in the
HostClaim status to avoid using a label for this purpose.

Signed-off-by: Pierre Crégut <pierre.cregut@orange.com>
Bumps [go.etcd.io/etcd/client/pkg/v3](https://github.com/etcd-io/etcd) from 3.6.9 to 3.6.10.
- [Release notes](https://github.com/etcd-io/etcd/releases)
- [Commits](etcd-io/etcd@v3.6.9...v3.6.10)

---
updated-dependencies:
- dependency-name: go.etcd.io/etcd/client/pkg/v3
  dependency-version: 3.6.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [libvirt.org/go/libvirt](https://gitlab.com/libvirt/libvirt-go-module) from 1.12001.0 to 1.12002.0.
- [Commits](https://gitlab.com/libvirt/libvirt-go-module/compare/v1.12001.0...v1.12002.0)

---
updated-dependencies:
- dependency-name: libvirt.org/go/libvirt
  dependency-version: 1.12002.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Add Makefile target `run-e2e-tests` to run E2E tests locally
and `ensure-e2e-environment` to install required components.

Update e2e documents.

Download files to the `tmp` directory instead of the home directory.

Signed-off-by: Siiri Kemppainen <siiri.kemppainen@est.tech>
Signed-off-by: Tero Kauppinen <tero.kauppinen@est.tech>
🌱 Add maketarget for ensuring docker is present for testing
Signed-off-by: smoshiur1237 <moshiur.rahman@est.tech>
🌱Bump go version used for building to 1.25.9
…s/main/go.etcd.io/etcd/client/pkg/v3-3.6.10

🌱 Bump go.etcd.io/etcd/client/pkg/v3 from 3.6.9 to 3.6.10
…s/test/main/libvirt.org/go/libvirt-1.12002.0

🌱 Bump libvirt.org/go/libvirt from 1.12001.0 to 1.12002.0 in /test
Signed-off-by: Nuutti Hakala <nuutti.hakala@est.tech>
Bumps the go_modules group with 1 update in the / directory: [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go).


Updates `go.opentelemetry.io/otel/sdk` from 1.40.0 to 1.43.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](open-telemetry/opentelemetry-go@v1.40.0...v1.43.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/otel/sdk
  dependency-version: 1.43.0
  dependency-type: indirect
  dependency-group: go_modules
...

Signed-off-by: dependabot[bot] <support@github.com>
Implementation of the choice logic of HostClaims
* Respect the hostDeployPolicy for choosing the BareMetalHost
* Respect annotations set by standard capm3 on BareMetalHosts

Uses the choice process and modify consumerRef of the BMH and
annotate the HostClaim to bind the two resources.

Modified version of code in baremetal/metal3machine_manager.go
from cluster-api-provider-metal3.

Most notable changes from reviews:
* Replace patching consumerRef with updating
* Use of status to store the associated BareMetalHost rather
  than a label.

Co-authored-by: Pierre Crégut <pierre.cregut@orange.com>
Co-authored-by: Laurent Roussarie <laurent.roussarie@orange.com>
Signed-off-by: Pierre Crégut <pierre.cregut@orange.com>
…-associate

✨ Adds Associate logic for HostClaim
Signed-off-by: smoshiur1237 <moshiur.rahman@est.tech>
🌱Add scheduled github worklow job for Fuzzing
…etwork

✨ Add libvirt network creation and deletion to vbmctl
metal3-io-bot and others added 8 commits April 28, 2026 15:55
…ci-auth

✨ Accept per-host pull secrets for external OCI registries
Signed-off-by: Dmitry Tantsur <dtantsur@protonmail.com>
…s/test/main/github.com/moby/moby/client-0.4.1

🌱 Bump github.com/moby/moby/client from 0.4.0 to 0.4.1 in /test
✨ Allow forced detachment of a host from Ironic
Signed-off-by: smoshiur1237 <moshiur.rahman@est.tech>
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 1, 2026

Walkthrough

The changes upgrade Go toolchain from 1.25.8 to 1.25.9, update Kubernetes dependencies (k8s.io/api/apimachinery v0.34.6 to v0.35.4, controller-runtime v0.22.5 to v0.23.3), add OCI authentication support to image configuration, introduce an ObjectReference type for resource references, and update Makefile rules and build tooling.

Changes

Cohort / File(s) Summary
Build Configuration & Tooling
Dockerfile, Makefile, .gitignore
Updates Go toolchain from 1.25.8 to 1.25.9 with digest pinning; extends Makefile with Ginkgo config overrides, help command formatting improvements, fuzz test quoting, new verify-e2e-prerequisites phony target, and clean target expansion; removes legacy build-legacy-vbmctl target; adds e2e test fixture to gitignore.
Dependency Management
apis/go.mod
Upgrades Kubernetes dependencies (k8s.io/api and k8s.io/apimachinery from v0.34.6 to v0.35.4) and sigs.k8s.io/controller-runtime (v0.22.5 to v0.23.3); updates indirect dependencies including logr, yaml, klog, and structured-merge-diff.
API Type Extensions
apis/metal3.io/v1alpha1/baremetalhost_types.go, apis/metal3.io/v1alpha1/hostclaim_types.go
Adds OCIAuthSecretName field to Image type for Docker config authentication; updates IsOCI() method with nil/empty URL handling and case-insensitive prefix matching; adds Force flag to DetachedAnnotationArguments; introduces generalized ObjectReference type replacing HardwareReference and adds bareMetalHost reference field to HostClaimStatus.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

🚥 Pre-merge checks | ✅ 11 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Title check ❓ Inconclusive The title 'NO-ISSUE: Merge upstream' is vague and non-descriptive, using generic terms that don't convey meaningful information about the specific changes in this changeset. Provide a more descriptive title that summarizes the main changes, such as 'Upgrade Go toolchain to 1.25.9 and update Kubernetes dependencies' or 'Update Go version, add OCI auth support, and refactor hardware reference types'.
✅ Passed checks (11 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
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 The pull request does not introduce or modify any Ginkgo test definitions. All changes are to non-test files, so no test names violate stability requirements.
Test Structure And Quality ✅ Passed Pull request contains no Ginkgo test code changes; only configuration and API type modifications are present.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests are present in this PR. Changes are limited to infrastructure updates, dependency upgrades, API type extensions, and .gitignore modifications.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests with multi-node assumptions were added in this PR.
Topology-Aware Scheduling Compatibility ✅ Passed PR changes are limited to build configuration, dependency updates, and API type definitions with no scheduling constraints or topology assumptions.
Ote Binary Stdout Contract ✅ Passed This pull request contains no OTE Binary Stdout Contract violations. The zap logger is properly initialized before logging occurs, and all logging is channeled through stderr by default.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR is a vendor/upstream merge with no new Ginkgo e2e tests added to test/e2e/ directory.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci openshift-ci Bot requested review from elfosardo and hroyrh May 1, 2026 11:40
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 1, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: honza

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 May 1, 2026
@mabulgu
Copy link
Copy Markdown

mabulgu commented May 1, 2026

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 1, 2026
@mabulgu
Copy link
Copy Markdown

mabulgu commented May 1, 2026

/retest

@hroyrh
Copy link
Copy Markdown

hroyrh commented May 4, 2026

/retest-required

@dtantsur
Copy link
Copy Markdown
Member

dtantsur commented May 4, 2026

/retitle NO-ISSUE: Merge upstream

@honza please don't forget ^^^

@openshift-ci openshift-ci Bot changed the title Merge upstream NO-ISSUE: Merge upstream May 4, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 4, 2026
@openshift-ci-robot
Copy link
Copy Markdown

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

Details

In response to this:

Summary by CodeRabbit

  • New Features

  • Added OCI image authentication support via secret reference

  • Added force flag for host detachment operations

  • Chores

  • Updated Go toolchain to 1.25.9

  • Upgraded Kubernetes dependencies to v0.35.4 and controller-runtime to v0.23.3

  • Bug Fixes

  • Improved OCI image URL detection with case-insensitive matching

  • Refactor

  • Consolidated reference type structure in host claim status

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.

@jadhaj
Copy link
Copy Markdown

jadhaj commented May 4, 2026

/verified later @jadhaj

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

@jadhaj: This PR has been marked to be verified later by @jadhaj.

Details

In response to this:

/verified later @jadhaj

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.

@honza
Copy link
Copy Markdown
Member Author

honza commented May 4, 2026

@dtantsur I thought we had a bunch of things that people were eager to get in and I hoped they'd add their favourite issue.

@dtantsur
Copy link
Copy Markdown
Member

dtantsur commented May 4, 2026

I thought we had a bunch of things that people were eager to get in and I hoped they'd add their favourite issue.

I'm still trying to make up my mind how we can track these syncs...

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 4, 2026

@honza: 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 7a00547 into openshift:main May 4, 2026
11 checks passed
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/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 verified-later

Projects

None yet

Development

Successfully merging this pull request may close these issues.