Skip to content

UPSTREAM-SYNC: Merge https://github.com/k-orc/openstack-resource-controller:release-2.0 into main#38

Merged
openshift-merge-bot[bot] merged 12 commits into
openshift:mainfrom
shiftstack:merge-bot-main
Jun 8, 2026
Merged

UPSTREAM-SYNC: Merge https://github.com/k-orc/openstack-resource-controller:release-2.0 into main#38
openshift-merge-bot[bot] merged 12 commits into
openshift:mainfrom
shiftstack:merge-bot-main

Conversation

@shiftstack-merge-bot

Copy link
Copy Markdown

No description provided.

dependabot Bot and others added 4 commits May 19, 2026 00:03
Bumps the all-github-actions group with 1 update: [actions/labeler](https://github.com/actions/labeler).


Updates `actions/labeler` from 6.0.1 to 6.1.0
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](actions/labeler@634933e...f27b608)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-version: 6.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-github-actions
...

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

Bumps the all-go-mod-patch-and-minor group with 2 updates in the / directory: [golang.org/x/text](https://github.com/golang/text) and [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery).


Updates `golang.org/x/text` from 0.36.0 to 0.37.0
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.36.0...v0.37.0)

Updates `k8s.io/apimachinery` from 0.34.7 to 0.34.8
- [Commits](kubernetes/apimachinery@v0.34.7...v0.34.8)

---
updated-dependencies:
- dependency-name: golang.org/x/text
  dependency-version: 0.37.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apimachinery
  dependency-version: 0.34.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…ease-2.0/all-github-actions-2cbc4c3382

🌱(deps): Bump actions/labeler from 6.0.1 to 6.1.0 in the all-github-actions group
…-2.0/all-go-mod-patch-and-minor-5b7c8bb2c1

🌱(deps): Bump the all-go-mod-patch-and-minor group across 1 directory with 2 updates
@openshift-ci openshift-ci Bot requested review from gryf and stephenfin May 21, 2026 15:09
@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 21, 2026
@openshift-ci

openshift-ci Bot commented May 21, 2026

Copy link
Copy Markdown

Hi @shiftstack-merge-bot[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

dependabot Bot and others added 2 commits May 25, 2026 20:33
… with 5 updates

Bumps the all-go-mod-patch-and-minor group with 5 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) | `2.28.3` | `2.29.0` |
| [github.com/onsi/gomega](https://github.com/onsi/gomega) | `1.40.0` | `1.41.0` |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.34.7` | `0.34.8` |
| [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.34.7` | `0.34.8` |
| [k8s.io/code-generator](https://github.com/kubernetes/code-generator) | `0.34.7` | `0.34.8` |



Updates `github.com/onsi/ginkgo/v2` from 2.28.3 to 2.29.0
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.28.3...v2.29.0)

Updates `github.com/onsi/gomega` from 1.40.0 to 1.41.0
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.40.0...v1.41.0)

Updates `k8s.io/api` from 0.34.7 to 0.34.8
- [Commits](kubernetes/api@v0.34.7...v0.34.8)

Updates `k8s.io/client-go` from 0.34.7 to 0.34.8
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.34.7...v0.34.8)

Updates `k8s.io/code-generator` from 0.34.7 to 0.34.8
- [Commits](kubernetes/code-generator@v0.34.7...v0.34.8)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-version: 2.29.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/gomega
  dependency-version: 1.41.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/api
  dependency-version: 0.34.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/client-go
  dependency-version: 0.34.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/code-generator
  dependency-version: 0.34.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…-2.0/all-go-mod-patch-and-minor-1bbd3f2405

🌱(deps): Bump the all-go-mod-patch-and-minor group across 1 directory with 5 updates
Bumps the all-github-actions group with 1 update: [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action).


Updates `docker/setup-buildx-action` from 4.0.0 to 4.1.0
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](docker/setup-buildx-action@4d04d5d...d7f5e7f)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-version: 4.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-github-actions
...

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

mandre commented Jun 3, 2026

Copy link
Copy Markdown
Member

/ok-to-test

@openshift-ci openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 3, 2026
mandre and others added 3 commits June 5, 2026 12:02
…ease-2.0/all-github-actions-23becc088c

🌱(deps): Bump docker/setup-buildx-action from 4.0.0 to 4.1.0 in the all-github-actions group
@mandre

mandre commented Jun 8, 2026

Copy link
Copy Markdown
Member

/override ci/prow/e2e-hypershift

@openshift-ci

openshift-ci Bot commented Jun 8, 2026

Copy link
Copy Markdown

@mandre: Overrode contexts on behalf of mandre: ci/prow/e2e-hypershift

Details

In response to this:

/override ci/prow/e2e-hypershift

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-ci

openshift-ci Bot commented Jun 8, 2026

Copy link
Copy Markdown

@shiftstack-merge-bot[bot]: 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.

@mandre mandre left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/lgtm
/approved

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 8, 2026
@mandre

mandre commented Jun 8, 2026

Copy link
Copy Markdown
Member

/approve
/verified by CI

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 8, 2026
@openshift-ci-robot

Copy link
Copy Markdown

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

Details

In response to this:

/approve
/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.

@openshift-ci

openshift-ci Bot commented Jun 8, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mandre

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 Jun 8, 2026
@mandre mandre changed the title Merge https://github.com/k-orc/openstack-resource-controller:release-2.0 into main UPSTREAM-SYNC: Merge https://github.com/k-orc/openstack-resource-controller:release-2.0 into main Jun 8, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jun 8, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@shiftstack-merge-bot[bot]: This pull request is an upstream sync and explicitly references no 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-merge-bot openshift-merge-bot Bot merged commit 77f1d50 into openshift:main Jun 8, 2026
10 checks passed
@stephenfin stephenfin deleted the merge-bot-main branch June 9, 2026 17:04
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-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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants