Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.12 into main #362
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}
Fixes this bad error message format: I0317 13:20:19.512088 1 openstackserver_controller.go:109] "OpenStackServer %s/%s linked to a Cluster that is paused. Won't reconcile" controllerGroup="infrastructure.cluster.x-k8s.io" controllerKind="OpenStackServer" OpenStackServer="sylva-system/management-cluster-cp-f7843e31d7-rbv5c" namespace="sylva-system" name="management-cluster-cp-f7843e31d7-rbv5c" reconcileID="a0e2f500-ae75-47af-bc3b-85bb9ae4b59b" sylva-system="management-cluster-cp-f7843e31d7-rbv5c" We in fact don't need the "%s/%s" and also the additional paramters aren't needed because the logger is derived from "scope" and already logging the server name and namespace.
Co-authored-by: Alexandre Vilain <[email protected]>
…ot/cherry-pick-2482-to-release-0.12 [release-0.12] OpenStackServer controller: minor log message fix
…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). Updates `k8s.io/api` from 0.31.6 to 0.31.7 - [Commits](kubernetes/api@v0.31.6...v0.31.7) Updates `k8s.io/apiextensions-apiserver` from 0.31.6 to 0.31.7 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.31.6...v0.31.7) Updates `k8s.io/apimachinery` from 0.31.6 to 0.31.7 - [Commits](kubernetes/apimachinery@v0.31.6...v0.31.7) Updates `k8s.io/client-go` from 0.31.6 to 0.31.7 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.31.6...v0.31.7) Updates `k8s.io/code-generator` from 0.31.6 to 0.31.7 - [Commits](kubernetes/code-generator@v0.31.6...v0.31.7) Updates `k8s.io/component-base` from 0.31.6 to 0.31.7 - [Commits](kubernetes/component-base@v0.31.6...v0.31.7) Updates `k8s.io/api` from 0.31.6 to 0.31.7 - [Commits](kubernetes/api@v0.31.6...v0.31.7) Updates `k8s.io/apiextensions-apiserver` from 0.31.6 to 0.31.7 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.31.6...v0.31.7) Updates `k8s.io/apimachinery` from 0.31.6 to 0.31.7 - [Commits](kubernetes/apimachinery@v0.31.6...v0.31.7) Updates `k8s.io/client-go` from 0.31.6 to 0.31.7 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.31.6...v0.31.7) Updates `k8s.io/code-generator` from 0.31.6 to 0.31.7 - [Commits](kubernetes/code-generator@v0.31.6...v0.31.7) Updates `k8s.io/component-base` from 0.31.6 to 0.31.7 - [Commits](kubernetes/component-base@v0.31.6...v0.31.7) --- updated-dependencies: - dependency-name: k8s.io/api 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-type: direct:production update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor - dependency-name: k8s.io/apimachinery 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-type: direct:production update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor - dependency-name: k8s.io/code-generator 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-type: direct:production update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor - dependency-name: k8s.io/api dependency-type: indirect update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor - dependency-name: k8s.io/apiextensions-apiserver dependency-type: indirect update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor - dependency-name: k8s.io/apimachinery dependency-type: indirect update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor - dependency-name: k8s.io/client-go dependency-type: indirect update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor - dependency-name: k8s.io/code-generator 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-type: indirect update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…ot/cherry-pick-2257-to-release-0.12 [release-0.12] Do not delete bastion floating ip if set in spec
…ot/go_modules/release-0.12/all-go-mod-patch-and-minor-314be691b7 🌱(deps): bump the all-go-mod-patch-and-minor group across 2 directories with 6 updates
Bumps the all-github-actions group with 2 updates: [actions/setup-go](https://github.com/actions/setup-go) and [actions/cache](https://github.com/actions/cache). Updates `actions/setup-go` from 5.3.0 to 5.4.0 - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@f111f33...0aaccfd) Updates `actions/cache` from 4.2.2 to 4.2.3 - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@d4323d4...5a3ec84) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-github-actions - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-github-actions ... Signed-off-by: dependabot[bot] <[email protected]>
…es with 4 updates Bumps the all-go-mod-patch-and-minor group with 4 updates in the / directory: [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo), [github.com/onsi/gomega](https://github.com/onsi/gomega), [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: [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo), [github.com/onsi/gomega](https://github.com/onsi/gomega) and [sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api). Updates `github.com/onsi/ginkgo/v2` from 2.23.0 to 2.23.3 - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.23.0...v2.23.3) Updates `github.com/onsi/gomega` from 1.36.2 to 1.36.3 - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.36.2...v1.36.3) Updates `sigs.k8s.io/cluster-api` from 1.9.5 to 1.9.6 - [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases) - [Commits](kubernetes-sigs/cluster-api@v1.9.5...v1.9.6) Updates `sigs.k8s.io/cluster-api/test` from 1.9.5 to 1.9.6 - [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases) - [Commits](kubernetes-sigs/cluster-api@v1.9.5...v1.9.6) Updates `github.com/onsi/ginkgo/v2` from 2.23.0 to 2.23.3 - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.23.0...v2.23.3) Updates `github.com/onsi/gomega` from 1.36.2 to 1.36.3 - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.36.2...v1.36.3) Updates `sigs.k8s.io/cluster-api` from 1.9.5 to 1.9.6 - [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases) - [Commits](kubernetes-sigs/cluster-api@v1.9.5...v1.9.6) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 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-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-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-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-type: direct:production update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor - dependency-name: github.com/onsi/gomega 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-type: indirect update-type: version-update:semver-patch dependency-group: all-go-mod-patch-and-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…ot/github_actions/release-0.12/all-github-actions-028b5da3eb 🌱(deps): Bump the all-github-actions group with 2 updates
…ot/go_modules/release-0.12/all-go-mod-patch-and-minor-5f2b6a42fe 🌱(deps): Bump the all-go-mod-patch-and-minor group across 2 directories with 4 updates
openshift-ci
bot
added
the
needs-ok-to-test
|
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. |
|
[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 |
…ot/cherry-pick-2502-to-release-0.12 [release-0.12] 🐛 fix openstackserver controller concurrency
shiftstack-merge-bot-cloner
bot
force-pushed
the
merge-bot-main
branch
from
b7d1b70 to
594352d
Compare
…es with 5 updates Bumps the all-go-mod-patch-and-minor group with 4 updates in the / directory: [github.com/gophercloud/gophercloud/v2](https://github.com/gophercloud/gophercloud), [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo), [github.com/onsi/gomega](https://github.com/onsi/gomega) and [golang.org/x/crypto](https://github.com/golang/crypto). Bumps the all-go-mod-patch-and-minor group with 4 updates in the /hack/tools directory: [github.com/gophercloud/gophercloud/v2](https://github.com/gophercloud/gophercloud), [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo), [github.com/onsi/gomega](https://github.com/onsi/gomega) and [golang.org/x/text](https://github.com/golang/text). Updates `github.com/gophercloud/gophercloud/v2` from 2.6.0 to 2.7.0 - [Release notes](https://github.com/gophercloud/gophercloud/releases) - [Changelog](https://github.com/gophercloud/gophercloud/blob/v2.7.0/CHANGELOG.md) - [Commits](gophercloud/gophercloud@v2.6.0...v2.7.0) Updates `github.com/onsi/ginkgo/v2` from 2.23.3 to 2.23.4 - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.23.3...v2.23.4) Updates `github.com/onsi/gomega` from 1.36.3 to 1.37.0 - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.36.3...v1.37.0) Updates `golang.org/x/crypto` from 0.36.0 to 0.37.0 - [Commits](golang/crypto@v0.36.0...v0.37.0) Updates `golang.org/x/text` from 0.23.0 to 0.24.0 - [Release notes](https://github.com/golang/text/releases) - [Commits](golang/text@v0.23.0...v0.24.0) Updates `github.com/gophercloud/gophercloud/v2` from 2.6.0 to 2.7.0 - [Release notes](https://github.com/gophercloud/gophercloud/releases) - [Changelog](https://github.com/gophercloud/gophercloud/blob/v2.7.0/CHANGELOG.md) - [Commits](gophercloud/gophercloud@v2.6.0...v2.7.0) Updates `github.com/onsi/ginkgo/v2` from 2.23.3 to 2.23.4 - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.23.3...v2.23.4) Updates `github.com/onsi/gomega` from 1.36.3 to 1.37.0 - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.36.3...v1.37.0) Updates `golang.org/x/text` from 0.23.0 to 0.24.0 - [Release notes](https://github.com/golang/text/releases) - [Commits](golang/text@v0.23.0...v0.24.0) --- updated-dependencies: - dependency-name: github.com/gophercloud/gophercloud/v2 dependency-version: 2.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-go-mod-patch-and-minor - dependency-name: github.com/onsi/ginkgo/v2 dependency-version: 2.23.4 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.37.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-go-mod-patch-and-minor - dependency-name: golang.org/x/crypto 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: golang.org/x/text dependency-version: 0.24.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-go-mod-patch-and-minor - dependency-name: github.com/gophercloud/gophercloud/v2 dependency-version: 2.7.0 dependency-type: indirect update-type: version-update:semver-minor dependency-group: all-go-mod-patch-and-minor - dependency-name: github.com/onsi/ginkgo/v2 dependency-version: 2.23.4 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.37.0 dependency-type: indirect update-type: version-update:semver-minor dependency-group: all-go-mod-patch-and-minor - dependency-name: golang.org/x/text dependency-version: 0.24.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.12/all-go-mod-patch-and-minor-d1805c56fc 🌱(deps): Bump the all-go-mod-patch-and-minor group across 2 directories with 5 updates
shiftstack-merge-bot-cloner
bot
force-pushed
the
merge-bot-main
branch
from
594352d to
38d9b2c
Compare
|
/ok-to-test |
openshift-ci
bot
added
ok-to-test
|
@shiftstack-merge-bot[bot]: The following tests failed, say
Full PR test history. Your PR dashboard. 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
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.