🐛 bump CAPI to v1.1.3 by chrischdi · Pull Request #1209 · kubernetes-sigs/cluster-api-provider-openstack

chrischdi · 2022-04-19T15:01:44Z

What this PR does / why we need it:

fixes k8s v1.24 compatibility due to removal of deprecated control-plane label node-role.kubernetes.io/master xref capi #5919
fixes periodics conformance ci job (failed due to using kubeadm v1.24)
adds tolerations and usage of the new control-plane node label

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

squashed commits
if necessary:
- includes documentation
- adds unit tests

/hold

netlify · 2022-04-19T15:01:48Z

✅ Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

Name	Link
🔨 Latest commit	`368bc8b`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-cluster-api-openstack/deploys/625fdfc24e22ca0008b8c1be
😎 Deploy Preview	https://deploy-preview-1209--kubernetes-sigs-cluster-api-openstack.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

chrischdi · 2022-04-19T15:02:58Z

xref previous PR which bumped the dependency: #1137

tobiasgiese · 2022-04-19T15:07:11Z

/lgtm

thanks for fixing the conformance tests with this.
Do we have to update any documentation or release matrix?

chrischdi · 2022-04-19T15:19:27Z

/test help

k8s-ci-robot · 2022-04-19T15:19:28Z

@chrischdi: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test pull-cluster-api-provider-openstack-build
/test pull-cluster-api-provider-openstack-e2e-test
/test pull-cluster-api-provider-openstack-test

The following commands are available to trigger optional jobs:

/test pull-cluster-api-provider-openstack-conformance-test

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-provider-openstack-build
pull-cluster-api-provider-openstack-e2e-test
pull-cluster-api-provider-openstack-test

Details

In response to this:

/test help

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/test-infra repository.

chrischdi · 2022-04-19T15:19:39Z

/test pull-cluster-api-provider-openstack-conformance-test

chrischdi · 2022-04-19T15:20:34Z

/lgtm

thanks for fixing the conformance tests with this. Do we have to update any documentation or release matrix?

I think its not yet time to say we are compatible with the unreleased v1.24 :-) especially as long as there is no release.

tobiasgiese · 2022-04-19T15:21:41Z

I think its not yet time to say we are compatible with the unreleased v1.24 :-) especially as long as there is no release.

I was talking about the CAPI release :D we could add that we‘re v1.1 compatible. Currently we‘re only mentioning v1.0

chrischdi · 2022-04-19T19:07:08Z

/test pull-cluster-api-provider-openstack-e2e-test

Bumped some more versions + occm + fixed occm yaml which I broke on old commit

chrischdi · 2022-04-19T21:46:45Z

/test pull-cluster-api-provider-openstack-e2e-test

jichenjc · 2022-04-19T23:52:24Z

/test pull-cluster-api-provider-openstack-e2e-test

jichenjc · 2022-04-20T00:02:34Z

README.md

+|                                    | v1.16 | v1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 |
+| ---------------------------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
+| OpenStack Provider v1alpha3 (v0.3) | ✓     | ✓     | ✓     | ✓     | ✓     |       |       |       |
+| OpenStack Provider v1alpha4 (v0.4) |       |       |       |       | ✓     | ✓     | ✓     | ✓     |


do we have such test for OpenStack Provider v1alpha4 (v0.4) + v1.22/v1.23?

You're right 👍 I removed this ones. I also switched the v1.22 ones to + (should work, but we weren't able to test it)

I've got no strong opinions what to note exactly.

This PR introduces the testing for v1.23.

jichenjc · 2022-04-20T00:05:43Z

/lgtm

tobiasgiese · 2022-04-20T06:35:21Z

README.md

-| OpenStack Provider v1alpha4 (v0.4) |       |       |       |       | ✓    | ✓     |
-| OpenStack Provider v1alpha4 (v0.5) |       |       |       |       | ✓    | ✓     |
-| OpenStack Provider v1alpha5        |       |       |       |       |       | ✓     |
+|                                    | v1.16 | v1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 |


Should we add CAPI v1.1 in l.40? Or change the v1.0 to v1.1?

hmm, I changed it to v1.1, maybe it makes sense to remove the CAPI version here 🤔

IMHO we must keep the CAPI version compatibility, so it's good as it is now 👍🏻

kubeadm v1.24 removes the deprecated control-plane node label node-role.kubernetes.io/master. This PR introduces the new label node-role.kubernetes.io/control-plane in the CAPO tests and bumps the CAPI dependency for compatibility to nodes provisioned using kubeadm v1.24. * bumps CAPI to v1.1.3 * fixes k8s v1.24 compatibility * fixes periodics conformance ci job * adds tolerations and usage of the new control-plane node label * bumps e2e k8s version to v1.23.5 * bumps capo version to v1.23.2 Signed-off-by: Christian Schlotter <schlotterc@vmware.com>

chrischdi · 2022-04-20T10:26:47Z

I adjusted the tables and synced the rbac stuff for occm so it should succeed now.

/test pull-cluster-api-provider-openstack-e2e-test

PTAL :-) 👍

tobiasgiese · 2022-04-20T11:33:19Z

/lgtm

seanschneeweiss · 2022-04-20T15:06:44Z

/lgtm

jichenjc · 2022-04-20T23:42:10Z

/approve
/hold cancel

k8s-ci-robot · 2022-04-20T23:42:27Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi, jichenjc

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [chrischdi,jichenjc]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 19, 2022

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 19, 2022

k8s-ci-robot requested review from mdbooth and tobiasgiese April 19, 2022 15:01

k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 19, 2022

k8s-ci-robot assigned tobiasgiese Apr 19, 2022

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 19, 2022

chrischdi force-pushed the pr-bump-capi-v1-1-3 branch from 6c24193 to 1add8f8 Compare April 19, 2022 19:06

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 19, 2022

jichenjc reviewed Apr 20, 2022

View reviewed changes

k8s-ci-robot assigned jichenjc Apr 20, 2022

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 20, 2022

tobiasgiese reviewed Apr 20, 2022

View reviewed changes

chrischdi force-pushed the pr-bump-capi-v1-1-3 branch from 1add8f8 to 368bc8b Compare April 20, 2022 10:26

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 20, 2022

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 20, 2022

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 20, 2022

k8s-ci-robot assigned seanschneeweiss Apr 20, 2022

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 20, 2022

k8s-ci-robot merged commit 3431b8a into kubernetes-sigs:main Apr 21, 2022

Comments

Conversation

chrischdi commented Apr 19, 2022

Uh oh!

netlify bot commented Apr 19, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

Uh oh!

chrischdi commented Apr 19, 2022

Uh oh!

tobiasgiese commented Apr 19, 2022

Uh oh!

chrischdi commented Apr 19, 2022

Uh oh!

k8s-ci-robot commented Apr 19, 2022

Uh oh!

chrischdi commented Apr 19, 2022

Uh oh!

chrischdi commented Apr 19, 2022

Uh oh!

tobiasgiese commented Apr 19, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chrischdi commented Apr 19, 2022

Uh oh!

chrischdi commented Apr 19, 2022

Uh oh!

jichenjc commented Apr 19, 2022

Uh oh!

jichenjc Apr 20, 2022

Choose a reason for hiding this comment

Uh oh!

chrischdi Apr 20, 2022

Choose a reason for hiding this comment

Uh oh!

jichenjc commented Apr 20, 2022

Uh oh!

tobiasgiese Apr 20, 2022

Choose a reason for hiding this comment

Uh oh!

chrischdi Apr 20, 2022

Choose a reason for hiding this comment

Uh oh!

tobiasgiese Apr 20, 2022

Choose a reason for hiding this comment

Uh oh!

chrischdi commented Apr 20, 2022

Uh oh!

tobiasgiese commented Apr 20, 2022

Uh oh!

seanschneeweiss commented Apr 20, 2022

Uh oh!

jichenjc commented Apr 20, 2022

Uh oh!

k8s-ci-robot commented Apr 20, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

netlify bot commented Apr 19, 2022 •

edited

Loading

tobiasgiese commented Apr 19, 2022 •

edited

Loading