Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.11 into main #339

Merged
merged 33 commits into from
Dec 5, 2024
Merged

Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.11 into main #339

merged 33 commits into from
Dec 5, 2024

Conversation

shiftstack-merge-bot[bot]
Copy link

No description provided.

EmilienM and others added 2 commits November 22, 2024 15:57
@EmilienM
Better conditions for creating Floating IPs
6ccf996 
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.
@k8s-ci-robot
Merge pull request kubernetes-sigs#2269 from k8s-infra-cherrypick-rob…
a8f8d28 
…ot/cherry-pick-2261-to-release-0.11

[release-0.11] 🐛 Better checks before creating Floating IPs
@openshift-ci openshift-ci bot requested review from mandre and MaysaMacedo November 25, 2024 12:12
@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 Nov 25, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Nov 25, 2024

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.

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.

@EmilienM
Copy link
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 Nov 25, 2024
@EmilienM
Copy link
Member

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 25, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Nov 25, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EmilienM

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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 Nov 25, 2024
@EmilienM
Copy link
Member

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Nov 25, 2024
@EmilienM
Copy link
Member

retry the hypershift job when openshift/hypershift#5186 has merged.

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 9884985 and 2 for PR HEAD 8fdbf0c in total

dependabot bot and others added 3 commits November 25, 2024 19:49
@dependabot
🌱(deps): Bump github.com/onsi/ginkgo/v2 in /hack/tools
7227a01 
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] <support@github.com>
@k8s-ci-robot
Merge pull request kubernetes-sigs#2282 from kubernetes-sigs/dependab…
ea4e25b 
…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
@dependabot
🌱(deps): Bump the kubernetes group across 3 directories with 6 updates
a832296 
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] <support@github.com>
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 9884985 and 2 for PR HEAD 8fdbf0c in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 9884985 and 2 for PR HEAD 8fdbf0c in total

k8s-ci-robot and others added 3 commits November 25, 2024 23:42
@k8s-ci-robot
Merge pull request kubernetes-sigs#2279 from kubernetes-sigs/dependab…
e579c2f 
…ot/go_modules/release-0.11/kubernetes-a35d3a6f0d

🌱(deps): Bump the kubernetes group across 3 directories with 6 updates
@dependabot
🌱(deps): Bump github.com/onsi/ginkgo/v2 from 2.21.0 to 2.22.0
6310c11 
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] <support@github.com>
@dependabot
Update generated code
50853c7
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 9884985 and 2 for PR HEAD 8fdbf0c in total

k8s-ci-robot and others added 2 commits November 26, 2024 00:46
@k8s-ci-robot
Merge pull request kubernetes-sigs#2280 from kubernetes-sigs/dependab…
71174b4 
…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
@dependabot
🌱(deps): Bump github.com/onsi/ginkgo/v2 in /orc
dd524db 
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] <support@github.com>
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 9884985 and 2 for PR HEAD 8fdbf0c in total

5 similar comments
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 9884985 and 2 for PR HEAD 8fdbf0c in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 9884985 and 2 for PR HEAD 8fdbf0c in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 9884985 and 2 for PR HEAD 8fdbf0c in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 9884985 and 2 for PR HEAD 8fdbf0c in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 9884985 and 2 for PR HEAD 8fdbf0c in total

@mandre
Copy link
Member

mandre commented Nov 28, 2024

/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 28, 2024
@mandre
Copy link
Member

mandre commented Nov 28, 2024

e2e-hypershift is permafailing:

     eventually.go:223:  - incorrect condition: wanted ClusterVersionProgressing=False, got ClusterVersionProgressing=True: ClusterOperatorNotAvailable(Unable to apply 4.19.0-0.ci.test-2024-11-28-082831-ci-op-wxn97gg0-latest: the cluster operator image-registry is not available)
    hypershift_framework.go:181: skipping postTeardown()
    hypershift_framework.go:162: skipping teardown, already called
    --- FAIL: TestNodePool/HostedCluster2 (2588.83s)

But I assume it should be fixed with openshift/hypershift#5178

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 28, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 28, 2024
EmilienM and others added 2 commits November 28, 2024 15:01
@EmilienM
Re-work release process
86bb42e
@k8s-ci-robot
Merge pull request kubernetes-sigs#2292 from k8s-infra-cherrypick-rob…
e46b9c7 
…ot/cherry-pick-2289-to-release-0.11

[release-0.11] 🌱 Automate the release process
dependabot bot and others added 9 commits December 2, 2024 19:02
@dependabot
🌱(deps): Bump the all-go-mod-patch-and-minor group across 3 directori…
dfd2eca 
…es with 2 updates

Bumps the all-go-mod-patch-and-minor group with 1 update in the / directory: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).
Bumps the all-go-mod-patch-and-minor group with 2 updates in the /hack/tools directory: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) and [github.com/itchyny/gojq](https://github.com/itchyny/gojq).
Bumps the all-go-mod-patch-and-minor group with 1 update in the /orc directory: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).


Updates `sigs.k8s.io/controller-runtime` from 0.18.5 to 0.18.6
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.18.5...v0.18.6)

Updates `sigs.k8s.io/controller-runtime` from 0.18.5 to 0.18.6
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.18.5...v0.18.6)

Updates `github.com/itchyny/gojq` from 0.12.16 to 0.12.17
- [Release notes](https://github.com/itchyny/gojq/releases)
- [Changelog](https://github.com/itchyny/gojq/blob/main/CHANGELOG.md)
- [Commits](itchyny/gojq@v0.12.16...v0.12.17)

Updates `sigs.k8s.io/controller-runtime` from 0.18.5 to 0.18.6
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.18.5...v0.18.6)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/itchyny/gojq
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/controller-runtime
  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>
@k8s-ci-robot
Merge pull request kubernetes-sigs#2299 from kubernetes-sigs/dependab…
4fd334b 
…ot/go_modules/release-0.11/all-go-mod-patch-and-minor-808623830b

🌱(deps): Bump the all-go-mod-patch-and-minor group across 3 directories with 2 updates
@lentzi90
E2E: Use CAPI production images
fd02389 
Use CAPI production images instead of from GCR.

Don't prepull cert-manager. We always let these images get out of
sync, causing us to pull double instead of saving anything. We end up
with different tags in e2e_conf.yaml and in the Makefile.
Additionally, CAPI may change what version is installed by clusterctl by
default, causing us to pull *two* wrong versions and then install a
third if we don't remember to check when bumping CAPI.

Signed-off-by: Lennart Jern <lennart.jern@est.tech>
@lentzi90
Fix conformance suite
e134f44 
The conformance suite was using deprecated ginkgo v1 functionality. This commit migrates it to v2, which makes the tests run again.

Signed-off-by: Lennart Jern <lennart.jern@est.tech>
@k8s-ci-robot
Merge pull request kubernetes-sigs#2301 from k8s-infra-cherrypick-rob…
0db62eb 
…ot/cherry-pick-2294-to-release-0.11

[release-0.11] 🌱 Fix conformance suite
@k8s-ci-robot
Merge pull request kubernetes-sigs#2300 from k8s-infra-cherrypick-rob…
29cf01a 
…ot/cherry-pick-2295-to-release-0.11

[release-0.11] 🌱 E2E: Use CAPI production images and skip cert-manager pre-pull
Merge https://github.com/kubernetes-sigs/cluster-api-provider-opensta…
8070b4d 
…ck:release-0.11 into main
Updating and vendoring go modules after an upstream merge
93dc53d
CARRY: running make merge-bot
6ebd932
@EmilienM
Copy link
Member

EmilienM commented Dec 5, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 5, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 966242b into openshift:main Dec 5, 2024
8 of 9 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the merge-bot-main branch December 5, 2024 14:42
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: openstack-cluster-api-controllers
This PR has been included in build openstack-cluster-api-controllers-container-v4.19.0-202412051538.p0.g966242b.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mandre mandre Awaiting requested review from mandre

@MaysaMacedo MaysaMacedo Awaiting requested review from MaysaMacedo

Assignees

@EmilienM EmilienM

Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@EmilienM @openshift-ci-robot @mandre @openshift-bot @k8s-ci-robot @lentzi90