Skip to content

OCPBUGS-64813: Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.12 into main#372

Closed
shiftstack-merge-bot[bot] wants to merge 50 commits intoopenshift:mainfrom
shiftstack:merge-bot-main
Closed

OCPBUGS-64813: Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.12 into main#372
shiftstack-merge-bot[bot] wants to merge 50 commits intoopenshift:mainfrom
shiftstack:merge-bot-main

Conversation

@shiftstack-merge-bot
Copy link
Copy Markdown

No description provided.

dependabot Bot and others added 9 commits June 23, 2025 20:59
…es with 8 updates

Bumps the all-go-mod-patch-and-minor group with 4 updates in the / directory: [k8s.io/api](https://github.com/kubernetes/api), [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver), [sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api) and [sigs.k8s.io/cluster-api/test](https://github.com/kubernetes-sigs/cluster-api).
Bumps the all-go-mod-patch-and-minor group with 3 updates in the /hack/tools directory: [k8s.io/api](https://github.com/kubernetes/api), [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) and [sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api).


Updates `k8s.io/api` from 0.31.9 to 0.31.10
- [Commits](kubernetes/api@v0.31.9...v0.31.10)

Updates `k8s.io/apiextensions-apiserver` from 0.31.9 to 0.31.10
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.31.9...v0.31.10)

Updates `k8s.io/apimachinery` from 0.31.9 to 0.31.10
- [Commits](kubernetes/apimachinery@v0.31.9...v0.31.10)

Updates `k8s.io/client-go` from 0.31.9 to 0.31.10
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.31.9...v0.31.10)

Updates `k8s.io/code-generator` from 0.31.9 to 0.31.10
- [Commits](kubernetes/code-generator@v0.31.9...v0.31.10)

Updates `k8s.io/component-base` from 0.31.9 to 0.31.10
- [Commits](kubernetes/component-base@v0.31.9...v0.31.10)

Updates `sigs.k8s.io/cluster-api` from 1.9.8 to 1.9.9
- [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases)
- [Commits](kubernetes-sigs/cluster-api@v1.9.8...v1.9.9)

Updates `sigs.k8s.io/cluster-api/test` from 1.9.8 to 1.9.9
- [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases)
- [Commits](kubernetes-sigs/cluster-api@v1.9.8...v1.9.9)

Updates `k8s.io/api` from 0.31.9 to 0.31.10
- [Commits](kubernetes/api@v0.31.9...v0.31.10)

Updates `k8s.io/apiextensions-apiserver` from 0.31.9 to 0.31.10
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.31.9...v0.31.10)

Updates `k8s.io/apimachinery` from 0.31.9 to 0.31.10
- [Commits](kubernetes/apimachinery@v0.31.9...v0.31.10)

Updates `k8s.io/client-go` from 0.31.9 to 0.31.10
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.31.9...v0.31.10)

Updates `k8s.io/code-generator` from 0.31.9 to 0.31.10
- [Commits](kubernetes/code-generator@v0.31.9...v0.31.10)

Updates `k8s.io/component-base` from 0.31.9 to 0.31.10
- [Commits](kubernetes/component-base@v0.31.9...v0.31.10)

Updates `sigs.k8s.io/cluster-api` from 1.9.8 to 1.9.9
- [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases)
- [Commits](kubernetes-sigs/cluster-api@v1.9.8...v1.9.9)

---
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-version: 0.31.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-version: 0.31.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apimachinery
  dependency-version: 0.31.10
  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.31.10
  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.31.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/component-base
  dependency-version: 0.31.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/cluster-api
  dependency-version: 1.9.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/cluster-api/test
  dependency-version: 1.9.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/api
  dependency-version: 0.31.10
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-version: 0.31.10
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apimachinery
  dependency-version: 0.31.10
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/client-go
  dependency-version: 0.31.10
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/code-generator
  dependency-version: 0.31.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/component-base
  dependency-version: 0.31.10
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/cluster-api
  dependency-version: 1.9.9
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Templates needed to be updated for v1.32 as the API server has dropped
the cloud-provider flag. Note: Sysext-bakery URLs also need updates for
newer releases, but we need to keep the older URL for the versions we
test in the E2E suite.

Signed-off-by: Lennart Jern <lennart.jern@est.tech>
…ot/go_modules/release-0.12/all-go-mod-patch-and-minor-fbacaeab45

🌱(deps): Bump the all-go-mod-patch-and-minor group across 2 directories with 8 updates
Add ClusterClasses and image templates to the release artifacts.

Signed-off-by: Lennart Jern <lennart.jern@est.tech>
…ot/cherry-pick-2399-to-release-0.12

[release-0.12] 🌱 Release: Include ClusterClasses and Images templates
Signed-off-by: Lennart Jern <lennart.jern@est.tech>
…ot/cherry-pick-2531-to-release-0.12

[release-0.12] 🌱 Bump cloud-build image to support go 1.23
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Jun 26, 2025

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.

@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 Jun 26, 2025
@openshift-ci openshift-ci Bot requested review from gryf and mandre June 26, 2025 12:18
@gryf
Copy link
Copy Markdown
Member

gryf commented Jul 1, 2025

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 1, 2025
lentzi90 and others added 7 commits July 28, 2025 10:23
This addresses CVE-2025-22868
See https://pkg.go.dev/vuln/GO-2025-3488

Signed-off-by: Lennart Jern <lennart.jern@est.tech>
…es with 15 updates

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

| Package | From | To |
| --- | --- | --- |
| [github.com/onsi/gomega](https://github.com/onsi/gomega) | `1.37.0` | `1.38.0` |
| [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) | `1.22.0` | `1.23.0` |
| [github.com/spf13/pflag](https://github.com/spf13/pflag) | `1.0.6` | `1.0.7` |
| [golang.org/x/crypto](https://github.com/golang/crypto) | `0.39.0` | `0.40.0` |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.31.10` | `0.31.11` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.31.10` | `0.31.11` |
| [sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api) | `1.9.9` | `1.9.10` |
| [sigs.k8s.io/cluster-api/test](https://github.com/kubernetes-sigs/cluster-api) | `1.9.9` | `1.9.10` |
| [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml) | `1.4.0` | `1.6.0` |

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

| Package | From | To |
| --- | --- | --- |
| [github.com/onsi/gomega](https://github.com/onsi/gomega) | `1.37.0` | `1.38.0` |
| [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) | `1.22.0` | `1.23.0` |
| [github.com/spf13/pflag](https://github.com/spf13/pflag) | `1.0.6` | `1.0.7` |
| [golang.org/x/text](https://github.com/golang/text) | `0.26.0` | `0.27.0` |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.31.10` | `0.31.11` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.31.10` | `0.31.11` |
| [sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api) | `1.9.9` | `1.9.10` |
| [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml) | `1.4.0` | `1.6.0` |
| [sigs.k8s.io/kustomize/kustomize/v5](https://github.com/kubernetes-sigs/kustomize) | `5.6.0` | `5.7.1` |



Updates `github.com/onsi/gomega` from 1.37.0 to 1.38.0
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.37.0...v1.38.0)

Updates `github.com/prometheus/client_golang` from 1.22.0 to 1.23.0
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.22.0...v1.23.0)

Updates `github.com/spf13/pflag` from 1.0.6 to 1.0.7
- [Release notes](https://github.com/spf13/pflag/releases)
- [Commits](spf13/pflag@v1.0.6...v1.0.7)

Updates `golang.org/x/crypto` from 0.39.0 to 0.40.0
- [Commits](golang/crypto@v0.39.0...v0.40.0)

Updates `golang.org/x/text` from 0.26.0 to 0.27.0
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.26.0...v0.27.0)

Updates `k8s.io/api` from 0.31.10 to 0.31.11
- [Commits](kubernetes/api@v0.31.10...v0.31.11)

Updates `k8s.io/apiextensions-apiserver` from 0.31.10 to 0.31.11
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.31.10...v0.31.11)

Updates `k8s.io/apimachinery` from 0.31.10 to 0.31.11
- [Commits](kubernetes/apimachinery@v0.31.10...v0.31.11)

Updates `k8s.io/client-go` from 0.31.10 to 0.31.11
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.31.10...v0.31.11)

Updates `k8s.io/code-generator` from 0.31.10 to 0.31.11
- [Commits](kubernetes/code-generator@v0.31.10...v0.31.11)

Updates `k8s.io/component-base` from 0.31.10 to 0.31.11
- [Commits](kubernetes/component-base@v0.31.10...v0.31.11)

Updates `sigs.k8s.io/cluster-api` from 1.9.9 to 1.9.10
- [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases)
- [Commits](kubernetes-sigs/cluster-api@v1.9.9...v1.9.10)

Updates `sigs.k8s.io/cluster-api/test` from 1.9.9 to 1.9.10
- [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases)
- [Commits](kubernetes-sigs/cluster-api@v1.9.9...v1.9.10)

Updates `sigs.k8s.io/yaml` from 1.4.0 to 1.6.0
- [Release notes](https://github.com/kubernetes-sigs/yaml/releases)
- [Changelog](https://github.com/kubernetes-sigs/yaml/blob/master/RELEASE.md)
- [Commits](kubernetes-sigs/yaml@v1.4.0...v1.6.0)

Updates `k8s.io/code-generator` from 0.31.10 to 0.31.11
- [Commits](kubernetes/code-generator@v0.31.10...v0.31.11)

Updates `github.com/onsi/gomega` from 1.37.0 to 1.38.0
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.37.0...v1.38.0)

Updates `github.com/prometheus/client_golang` from 1.22.0 to 1.23.0
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.22.0...v1.23.0)

Updates `github.com/spf13/pflag` from 1.0.6 to 1.0.7
- [Release notes](https://github.com/spf13/pflag/releases)
- [Commits](spf13/pflag@v1.0.6...v1.0.7)

Updates `golang.org/x/text` from 0.26.0 to 0.27.0
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.26.0...v0.27.0)

Updates `k8s.io/api` from 0.31.10 to 0.31.11
- [Commits](kubernetes/api@v0.31.10...v0.31.11)

Updates `k8s.io/apiextensions-apiserver` from 0.31.10 to 0.31.11
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.31.10...v0.31.11)

Updates `k8s.io/apimachinery` from 0.31.10 to 0.31.11
- [Commits](kubernetes/apimachinery@v0.31.10...v0.31.11)

Updates `k8s.io/client-go` from 0.31.10 to 0.31.11
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.31.10...v0.31.11)

Updates `k8s.io/code-generator` from 0.31.10 to 0.31.11
- [Commits](kubernetes/code-generator@v0.31.10...v0.31.11)

Updates `k8s.io/component-base` from 0.31.10 to 0.31.11
- [Commits](kubernetes/component-base@v0.31.10...v0.31.11)

Updates `sigs.k8s.io/cluster-api` from 1.9.9 to 1.9.10
- [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases)
- [Commits](kubernetes-sigs/cluster-api@v1.9.9...v1.9.10)

Updates `sigs.k8s.io/yaml` from 1.4.0 to 1.6.0
- [Release notes](https://github.com/kubernetes-sigs/yaml/releases)
- [Changelog](https://github.com/kubernetes-sigs/yaml/blob/master/RELEASE.md)
- [Commits](kubernetes-sigs/yaml@v1.4.0...v1.6.0)

Updates `k8s.io/code-generator` from 0.31.10 to 0.31.11
- [Commits](kubernetes/code-generator@v0.31.10...v0.31.11)

Updates `sigs.k8s.io/kustomize/kustomize/v5` from 5.6.0 to 5.7.1
- [Release notes](https://github.com/kubernetes-sigs/kustomize/releases)
- [Commits](kubernetes-sigs/kustomize@kustomize/v5.6.0...kustomize/v5.7.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-version: 1.38.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/prometheus/client_golang
  dependency-version: 1.23.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/spf13/pflag
  dependency-version: 1.0.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: golang.org/x/crypto
  dependency-version: 0.40.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: golang.org/x/text
  dependency-version: 0.27.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.31.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-version: 0.31.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apimachinery
  dependency-version: 0.31.11
  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.31.11
  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.31.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/component-base
  dependency-version: 0.31.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/cluster-api
  dependency-version: 1.9.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/cluster-api/test
  dependency-version: 1.9.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/yaml
  dependency-version: 1.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/code-generator
  dependency-version: 0.31.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/gomega
  dependency-version: 1.38.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/prometheus/client_golang
  dependency-version: 1.23.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/spf13/pflag
  dependency-version: 1.0.7
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: golang.org/x/text
  dependency-version: 0.27.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/api
  dependency-version: 0.31.11
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-version: 0.31.11
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apimachinery
  dependency-version: 0.31.11
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/client-go
  dependency-version: 0.31.11
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/code-generator
  dependency-version: 0.31.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/component-base
  dependency-version: 0.31.11
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/cluster-api
  dependency-version: 1.9.10
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/yaml
  dependency-version: 1.6.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/code-generator
  dependency-version: 0.31.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/kustomize/kustomize/v5
  dependency-version: 5.7.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…ot/go_modules/release-0.12/all-go-mod-patch-and-minor-918a1e1175

🌱(deps): Bump the all-go-mod-patch-and-minor group across 2 directories with 15 updates
Signed-off-by: Lennart Jern <lennart.jern@est.tech>
…ot/cherry-pick-2609-to-release-0.12

[release-0.12] 🌱 E2E: Update Calico to v3.30.2
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 7, 2025
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Aug 7, 2025

New changes are detected. LGTM label has been removed.

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Aug 7, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from gryf. 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

dependabot Bot added 3 commits August 12, 2025 00:28
Bumps the all-github-actions group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [actions/cache](https://github.com/actions/cache).


Updates `actions/checkout` from 4.2.2 to 5.0.0
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@11bd719...08c6903)

Updates `actions/cache` from 4.2.3 to 4.2.4
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@5a3ec84...0400d5f)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-github-actions
- dependency-name: actions/cache
  dependency-version: 4.2.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-github-actions
...

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

Bumps the all-go-mod-patch-and-minor group with 1 update in the / directory: [golang.org/x/crypto](https://github.com/golang/crypto).
Bumps the all-go-mod-patch-and-minor group with 1 update in the /hack/tools directory: [golang.org/x/text](https://github.com/golang/text).


Updates `golang.org/x/crypto` from 0.40.0 to 0.41.0
- [Commits](golang/crypto@v0.40.0...v0.41.0)

Updates `golang.org/x/text` from 0.27.0 to 0.28.0
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.27.0...v0.28.0)

Updates `golang.org/x/text` from 0.27.0 to 0.28.0
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.27.0...v0.28.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.41.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: golang.org/x/text
  dependency-version: 0.28.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: golang.org/x/text
  dependency-version: 0.28.0
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
lentzi90 and others added 13 commits October 7, 2025 12:19
This is a manual backport.
This commit changes how we run and build codegen.
Instead of using a script inside the openapi-gen package, we now build and call the binary directly.
This avoids issues where the upstream package is incompatible with the go version we use.

Minor changes to generated code:
- api_violations.report: One additional violation detected by newer gengo
- zz_generated.openapi.go: Backslash escaping difference (cosmetic)

Signed-off-by: Lennart Jern <lennart.jern@est.tech>
…release-0.12

🌱 Refactor generate-codegen
…ot/github_actions/release-0.12/all-github-actions-608a5adaf1

🌱(deps): Bump the all-github-actions group across 1 directory with 2 updates
…ot/cherry-pick-2759-to-release-0.12

[release-0.12] 🌱 Remove mdbooth as a maintainer
Signed-off-by: Lennart Jern <lennart.jern@est.tech>
…ot/cherry-pick-2768-to-release-0.12

[release-0.12] 🌱 Add Moshiur as reviewer
Bumps the all-github-actions group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release).


Updates `softprops/action-gh-release` from 2.3.4 to 2.4.0
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](softprops/action-gh-release@62c96d0...aec2ec5)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-version: 2.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
…es with 9 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.25.2` | `2.26.0` |
| [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) | `1.23.0` | `1.23.2` |
| [github.com/spf13/pflag](https://github.com/spf13/pflag) | `1.0.9` | `1.0.10` |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.31.12` | `0.31.13` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.31.12` | `0.31.13` |

Bumps the all-go-mod-patch-and-minor group with 1 update in the /hack/tools directory: [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo).


Updates `github.com/onsi/ginkgo/v2` from 2.25.2 to 2.26.0
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.25.2...v2.26.0)

Updates `github.com/prometheus/client_golang` from 1.23.0 to 1.23.2
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.23.0...v1.23.2)

Updates `github.com/spf13/pflag` from 1.0.9 to 1.0.10
- [Release notes](https://github.com/spf13/pflag/releases)
- [Commits](spf13/pflag@v1.0.9...v1.0.10)

Updates `k8s.io/api` from 0.31.12 to 0.31.13
- [Commits](kubernetes/api@v0.31.12...v0.31.13)

Updates `k8s.io/apiextensions-apiserver` from 0.31.12 to 0.31.13
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.31.12...v0.31.13)

Updates `k8s.io/apimachinery` from 0.31.12 to 0.31.13
- [Commits](kubernetes/apimachinery@v0.31.12...v0.31.13)

Updates `k8s.io/client-go` from 0.31.12 to 0.31.13
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.31.12...v0.31.13)

Updates `k8s.io/code-generator` from 0.31.12 to 0.31.13
- [Commits](kubernetes/code-generator@v0.31.12...v0.31.13)

Updates `k8s.io/component-base` from 0.31.12 to 0.31.13
- [Commits](kubernetes/component-base@v0.31.12...v0.31.13)

Updates `github.com/onsi/ginkgo/v2` from 2.25.2 to 2.26.0
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.25.2...v2.26.0)

Updates `k8s.io/code-generator` from 0.31.12 to 0.31.13
- [Commits](kubernetes/code-generator@v0.31.12...v0.31.13)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-version: 2.26.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/prometheus/client_golang
  dependency-version: 1.23.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/spf13/pflag
  dependency-version: 1.0.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/api
  dependency-version: 0.31.13
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-version: 0.31.13
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apimachinery
  dependency-version: 0.31.13
  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.31.13
  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.31.13
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/component-base
  dependency-version: 0.31.13
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-version: 2.26.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/code-generator
  dependency-version: 0.31.13
  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>
…ot/github_actions/release-0.12/all-github-actions-5d84ec284b

🌱(deps): Bump softprops/action-gh-release from 2.3.4 to 2.4.0 in the all-github-actions group
…ot/go_modules/release-0.12/all-go-mod-patch-and-minor-ad69eaad20

🌱(deps): Bump the all-go-mod-patch-and-minor group across 2 directories with 9 updates
…ot/cherry-pick-2511-to-release-0.12

🐛 Allow changing DNSNameservers in subnet config for OpenstackCluster
@stephenfin
Copy link
Copy Markdown

/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 Oct 14, 2025
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Oct 14, 2025

@shiftstack-merge-bot[bot]: The following tests 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/test-openshift b25e1de link true /test test-openshift
ci/prow/test b25e1de link true /test test
ci/prow/verify b25e1de link true /test verify
ci/prow/e2e-hypershift b25e1de link true /test e2e-hypershift

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.

@stephenfin
Copy link
Copy Markdown

@openshift-ci openshift-ci Bot changed the title Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.12 into main OCPBUGS-64813: Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.12 into main Nov 7, 2025
@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 Nov 7, 2025
@openshift-ci-robot
Copy link
Copy Markdown

@shiftstack-merge-bot[bot]: This pull request references Jira Issue OCPBUGS-64813, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.21.0) matches configured target version for branch (4.21.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (itbrown@redhat.com), skipping review request.

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

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.

@stephenfin
Copy link
Copy Markdown

This should be based off release-0.13 now.

/hold

@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 Nov 7, 2025
@stephenfin
Copy link
Copy Markdown

/close

We are going to go with #387 instead.

@openshift-ci openshift-ci Bot closed this Dec 5, 2025
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Dec 5, 2025

@stephenfin: Closed this PR.

Details

In response to this:

/close

We are going to go with #387 instead.

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-robot
Copy link
Copy Markdown

@shiftstack-merge-bot[bot]: This pull request references Jira Issue OCPBUGS-64813. The bug has been updated to no longer refer to the pull request using the external bug tracker. All external bug links have been closed. The bug has been moved to the NEW state.

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.

@stephenfin stephenfin deleted the merge-bot-main branch December 5, 2025 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants