Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.11 into release-4.18 #371
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![shiftstack-merge-bot[bot]](https://avatars.githubusercontent.com/u/48560946?s=60&v=4){kind=small}
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.2.2 to 2.3.2 - [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@da05d55...72f2c25) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-version: 2.3.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-github-actions ... Signed-off-by: dependabot[bot] <[email protected]>
…ot/github_actions/release-0.11/all-github-actions-6bbbf9925a 🌱(deps): Bump softprops/action-gh-release from 2.2.2 to 2.3.2 in the all-github-actions group
This addresses three vulnerabilities in the standard library: - GO-2025-3751 - GO-2025-3750 - GO-2025-3749 Signed-off-by: Lennart Jern <[email protected]>
…0.11-go-bump 🌱 Bump go to 1.23.10
shiftstack-merge-bot-cloner
bot
force-pushed
the
merge-bot-release-4.18
branch
from
6ba641d to
2147ea9
Compare
openshift-ci
bot
added
the
needs-ok-to-test
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
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 Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. 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. |
|
/hold nothing interesting |
openshift-ci
bot
added
the
do-not-merge/hold
…es with 6 updates Bumps the all-go-mod-patch-and-minor group with 2 updates in the / directory: [k8s.io/api](https://github.com/kubernetes/api) and [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver). Bumps the all-go-mod-patch-and-minor group with 2 updates in the /hack/tools directory: [k8s.io/api](https://github.com/kubernetes/api) and [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver). Bumps the all-go-mod-patch-and-minor group with 2 updates in the /orc directory: [k8s.io/api](https://github.com/kubernetes/api) and [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver). Updates `k8s.io/api` from 0.30.13 to 0.30.14 - [Commits](kubernetes/api@v0.30.13...v0.30.14) Updates `k8s.io/apiextensions-apiserver` from 0.30.13 to 0.30.14 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.30.13...v0.30.14) Updates `k8s.io/apimachinery` from 0.30.13 to 0.30.14 - [Commits](kubernetes/apimachinery@v0.30.13...v0.30.14) Updates `k8s.io/client-go` from 0.30.13 to 0.30.14 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.30.13...v0.30.14) Updates `k8s.io/component-base` from 0.30.13 to 0.30.14 - [Commits](kubernetes/component-base@v0.30.13...v0.30.14) Updates `k8s.io/api` from 0.31.9 to 0.31.10 - [Commits](kubernetes/api@v0.30.13...v0.30.14) 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.30.13...v0.30.14) Updates `k8s.io/apimachinery` from 0.31.9 to 0.31.10 - [Commits](kubernetes/apimachinery@v0.30.13...v0.30.14) 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.30.13...v0.30.14) Updates `k8s.io/component-base` from 0.31.9 to 0.31.10 - [Commits](kubernetes/component-base@v0.30.13...v0.30.14) 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/api` from 0.30.13 to 0.30.14 - [Commits](kubernetes/api@v0.30.13...v0.30.14) Updates `k8s.io/apiextensions-apiserver` from 0.30.13 to 0.30.14 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.30.13...v0.30.14) Updates `k8s.io/apimachinery` from 0.30.13 to 0.30.14 - [Commits](kubernetes/apimachinery@v0.30.13...v0.30.14) Updates `k8s.io/client-go` from 0.30.13 to 0.30.14 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.30.13...v0.30.14) Updates `k8s.io/component-base` from 0.30.13 to 0.30.14 - [Commits](kubernetes/component-base@v0.30.13...v0.30.14) --- updated-dependencies: - dependency-name: k8s.io/api dependency-version: 0.30.14 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.30.14 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.30.14 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.30.14 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.30.14 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/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: 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/api dependency-version: 0.30.14 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.30.14 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.30.14 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.30.14 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.30.14 dependency-type: indirect update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…ot/go_modules/release-0.11/all-go-mod-patch-and-minor-0aa8b0caa1 🌱(deps): Bump the all-go-mod-patch-and-minor group across 3 directories with 6 updates
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 <[email protected]>
…ot/cherry-pick-2602-to-release-0.11 [release-0.11] 🌱 Update templates
shiftstack-merge-bot-cloner
bot
force-pushed
the
merge-bot-release-4.18
branch
from
2147ea9 to
28254ec
Compare
…es with 9 updates Bumps the all-go-mod-patch-and-minor group with 2 updates in the / directory: [github.com/spf13/pflag](https://github.com/spf13/pflag) and [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml). Bumps the all-go-mod-patch-and-minor group with 5 updates in the /hack/tools directory: | Package | From | To | | --- | --- | --- | | [github.com/spf13/pflag](https://github.com/spf13/pflag) | `1.0.6` | `1.0.7` | | [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/yaml](https://github.com/kubernetes-sigs/yaml) | `1.4.0` | `1.5.0` | | [sigs.k8s.io/kustomize/kustomize/v5](https://github.com/kubernetes-sigs/kustomize) | `5.6.0` | `5.7.0` | Bumps the all-go-mod-patch-and-minor group with 2 updates in the /orc directory: [github.com/spf13/pflag](https://github.com/spf13/pflag) and [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml). 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 `sigs.k8s.io/yaml` from 1.4.0 to 1.5.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.5.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 `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/component-base` from 0.31.10 to 0.31.11 - [Commits](kubernetes/component-base@v0.31.10...v0.31.11) Updates `sigs.k8s.io/yaml` from 1.4.0 to 1.5.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.5.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.0 - [Release notes](https://github.com/kubernetes-sigs/kustomize/releases) - [Commits](kubernetes-sigs/kustomize@kustomize/v5.6.0...kustomize/v5.7.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/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 `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 `sigs.k8s.io/yaml` from 1.4.0 to 1.5.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.5.0) --- updated-dependencies: - 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: sigs.k8s.io/yaml dependency-version: 1.5.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: indirect update-type: version-update:semver-patch 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/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/yaml dependency-version: 1.5.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.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: 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: 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: sigs.k8s.io/yaml dependency-version: 1.5.0 dependency-type: indirect update-type: version-update:semver-minor dependency-group: all-go-mod-patch-and-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Trivy picks up a CVE that would require a go version bump to fix properly. Govulncheck also sees the same but concludes that it does not affect us. (Run with -show verbose to see it.) Adding to the ignore list hence. Signed-off-by: Lennart Jern <[email protected]>
…re-release-0.11 🌱 Ignore irrelevant CVE-2025-22868
shiftstack-merge-bot-cloner
bot
force-pushed
the
merge-bot-release-4.18
branch
from
28254ec to
cb29e49
Compare
…ot/go_modules/release-0.11/all-go-mod-patch-and-minor-374588d034 🌱(deps): Bump the all-go-mod-patch-and-minor group across 3 directories with 9 updates
Signed-off-by: Lennart Jern <[email protected]>
…ot/cherry-pick-2642-to-release-0.11 [release-0.11] 🌱 E2E: Update Calico to v3.30.2
shiftstack-merge-bot-cloner
bot
force-pushed
the
merge-bot-release-4.18
branch
from
cb29e49 to
b62b1da
Compare
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] <[email protected]>
…ot/github_actions/release-0.11/all-github-actions-74995dd163 🌱(deps): Bump the all-github-actions group with 2 updates
…es with 2 updates Bumps the all-go-mod-patch-and-minor group with 1 update in the / directory: [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml). Bumps the all-go-mod-patch-and-minor group with 2 updates in the /hack/tools directory: [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml) and [sigs.k8s.io/kustomize/kustomize/v5](https://github.com/kubernetes-sigs/kustomize). Bumps the all-go-mod-patch-and-minor group with 1 update in the /orc directory: [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml). Updates `sigs.k8s.io/yaml` from 1.5.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.5.0...v1.6.0) Updates `sigs.k8s.io/yaml` from 1.5.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.5.0...v1.6.0) Updates `sigs.k8s.io/kustomize/kustomize/v5` from 5.7.0 to 5.7.1 - [Release notes](https://github.com/kubernetes-sigs/kustomize/releases) - [Commits](kubernetes-sigs/kustomize@kustomize/v5.7.0...kustomize/v5.7.1) Updates `sigs.k8s.io/yaml` from 1.5.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.5.0...v1.6.0) --- updated-dependencies: - 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: 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: sigs.k8s.io/kustomize/kustomize/v5 dependency-version: 5.7.1 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: indirect update-type: version-update:semver-minor dependency-group: all-go-mod-patch-and-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…ot/go_modules/release-0.11/all-go-mod-patch-and-minor-b9c7192143 🌱(deps): Bump sigs.k8s.io/kustomize/kustomize/v5 and sigs.k8s.io/yaml
shiftstack-merge-bot-cloner
bot
force-pushed
the
merge-bot-release-4.18
branch
from
b62b1da to
ce85985
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.