Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.11 into release-4.18 #337
Conversation
This file contains 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}
When a floating is created, we need to make sure that `OpenStackCluster.Spec.DisableExternalNetwork` is not set to `True`. Otherwise, we'll have a nil pointer error. * Add a check in `reconcileBastion` to check that external network is not disabled before creating the floating IP for the bastion. * Add a check in `reconcileControlPlaneEndpoint` and `reconcileAPIServerLoadBalancer` to check that external network is not disabled (alongside the DisableAPIServerFloatingIP check) before creating the floating IP for the API server endpoint. * Add a safeguard in `GetOrCreateFloatingIP` to return a proper error (instead of a nil pointer error) when `openStackCluster.Status.ExternalNetwork` is nil. * Add API CEL to check that when DisableExternalNetwork is set and true, the bastion (if defined) doesn't have a floating IP defined and also that disableAPIServerFloatingIP (when set) is not False.
…ot/cherry-pick-2261-to-release-0.11 [release-0.11] 🐛 Better checks before creating Floating IPs
|
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. |
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 |
|
/ok-to-test |
openshift-ci
bot
added
ok-to-test
|
Let's wait for 4.19 being officially open for development, causing release-4.18 to no longer be sync'ed with main. |
openshift-ci
bot
added
the
do-not-merge/hold
|
We need openshift/release#59117 to land so it'll run make. |
EmilienM
force-pushed
the
merge-bot-release-4.18
branch
from
3f5a6c1
to
3054cbd
Compare
|
Retry the hypershift job when openshift/hypershift#5186 has merged. |
Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.21.0 to 2.22.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.21.0...v2.22.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…ot/go_modules/hack/tools/release-0.11/github.com/onsi/ginkgo/v2-2.22.0 🌱(deps): Bump github.com/onsi/ginkgo/v2 from 2.21.0 to 2.22.0 in /hack/tools
Bumps the kubernetes 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 kubernetes 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 kubernetes 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.6 to 0.30.7 - [Commits](kubernetes/api@v0.30.6...v0.30.7) Updates `k8s.io/apiextensions-apiserver` from 0.30.6 to 0.30.7 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.30.6...v0.30.7) Updates `k8s.io/apimachinery` from 0.30.6 to 0.30.7 - [Commits](kubernetes/apimachinery@v0.30.6...v0.30.7) Updates `k8s.io/client-go` from 0.30.6 to 0.30.7 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.30.6...v0.30.7) Updates `k8s.io/component-base` from 0.30.6 to 0.30.7 - [Commits](kubernetes/component-base@v0.30.6...v0.30.7) Updates `k8s.io/api` from 0.31.2 to 0.31.3 - [Commits](kubernetes/api@v0.30.6...v0.30.7) Updates `k8s.io/apiextensions-apiserver` from 0.31.2 to 0.31.3 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.30.6...v0.30.7) Updates `k8s.io/apimachinery` from 0.31.2 to 0.31.3 - [Commits](kubernetes/apimachinery@v0.30.6...v0.30.7) Updates `k8s.io/client-go` from 0.31.2 to 0.31.3 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.30.6...v0.30.7) Updates `k8s.io/component-base` from 0.31.2 to 0.31.3 - [Commits](kubernetes/component-base@v0.30.6...v0.30.7) Updates `k8s.io/code-generator` from 0.31.2 to 0.31.3 - [Commits](kubernetes/code-generator@v0.31.2...v0.31.3) Updates `k8s.io/api` from 0.30.6 to 0.30.7 - [Commits](kubernetes/api@v0.30.6...v0.30.7) Updates `k8s.io/apiextensions-apiserver` from 0.30.6 to 0.30.7 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.30.6...v0.30.7) Updates `k8s.io/apimachinery` from 0.30.6 to 0.30.7 - [Commits](kubernetes/apimachinery@v0.30.6...v0.30.7) Updates `k8s.io/client-go` from 0.30.6 to 0.30.7 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.30.6...v0.30.7) Updates `k8s.io/component-base` from 0.30.6 to 0.30.7 - [Commits](kubernetes/component-base@v0.30.6...v0.30.7) --- updated-dependencies: - dependency-name: k8s.io/api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/apiextensions-apiserver dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/apimachinery dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/client-go dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/component-base dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/api dependency-type: indirect update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/apiextensions-apiserver dependency-type: indirect update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/apimachinery dependency-type: indirect update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/client-go dependency-type: indirect update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/component-base dependency-type: indirect update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/code-generator dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/apiextensions-apiserver dependency-type: indirect update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/apimachinery dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/client-go dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kubernetes - dependency-name: k8s.io/component-base dependency-type: indirect update-type: version-update:semver-patch dependency-group: kubernetes ... Signed-off-by: dependabot[bot] <[email protected]>
…ot/go_modules/release-0.11/kubernetes-a35d3a6f0d 🌱(deps): Bump the kubernetes group across 3 directories with 6 updates
Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.21.0 to 2.22.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.21.0...v2.22.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…ot/go_modules/release-0.11/github.com/onsi/ginkgo/v2-2.22.0 🌱(deps): Bump github.com/onsi/ginkgo/v2 from 2.21.0 to 2.22.0
Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.21.0 to 2.22.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.21.0...v2.22.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.35.1 to 1.36.0. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.35.1...v1.36.0) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…ot/go_modules/orc/release-0.11/github.com/onsi/ginkgo/v2-2.22.0 🌱(deps): Bump github.com/onsi/ginkgo/v2 from 2.21.0 to 2.22.0 in /orc
…ot/go_modules/release-0.11/github.com/onsi/gomega-1.36.0 🌱(deps): Bump github.com/onsi/gomega from 1.35.1 to 1.36.0
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.35.1 to 1.36.0. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.35.1...v1.36.0) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…ot/go_modules/orc/release-0.11/github.com/onsi/gomega-1.36.0 🌱(deps): Bump github.com/onsi/gomega from 1.35.1 to 1.36.0 in /orc
… with 3 updates Bumps the all-go-mod-patch-and-minor group with 3 updates in the /orc directory: [github.com/google/uuid](https://github.com/google/uuid), [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) and [golang.org/x/text](https://github.com/golang/text). Updates `github.com/google/uuid` from 1.4.0 to 1.6.0 - [Release notes](https://github.com/google/uuid/releases) - [Changelog](https://github.com/google/uuid/blob/master/CHANGELOG.md) - [Commits](google/uuid@v1.4.0...v1.6.0) Updates `github.com/prometheus/client_golang` from 1.18.0 to 1.20.5 - [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.18.0...v1.20.5) Updates `golang.org/x/text` from 0.19.0 to 0.20.0 - [Release notes](https://github.com/golang/text/releases) - [Commits](golang/text@v0.19.0...v0.20.0) --- updated-dependencies: - dependency-name: github.com/google/uuid 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-type: indirect update-type: version-update:semver-minor dependency-group: all-go-mod-patch-and-minor - dependency-name: golang.org/x/text 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/orc/release-0.11/all-go-mod-patch-and-minor-a144fc68b5 🌱(deps): Bump the all-go-mod-patch-and-minor group across 1 directory with 3 updates
|
/retest-required |
|
@mandre please don't run the HCP job, we need openshift/hypershift#5193 landed first. Thanks |
shiftstack-merge-bot-cloner
bot
force-pushed
the
merge-bot-release-4.18
branch
from
3054cbd
to
3665968
Compare
|
@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.