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

🐛 bump CAPI to v1.1.3 #1209

Merged
merged 1 commit into from Apr 21, 2022
Merged

🐛 bump CAPI to v1.1.3 #1209

merged 1 commit into from Apr 21, 2022

Conversation

chrischdi
Copy link
Member

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:

  1. 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

@k8s-ci-robot 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
@netlify
Copy link

netlify bot commented Apr 19, 2022 •
edited

✅ 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...

QR Code

Use your smartphone camera to open QR code link.

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

@k8s-ci-robot 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 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
@chrischdi
Copy link
Member Author

xref previous PR which bumped the dependency: #1137

@chrischdi chrischdi changed the title * fixes k8s v1.24 compatibility due to removal of deprecated control-plane label node-role.kubernetes.io/master [xref capi #5919](https://github.com/kubernetes-sigs/cluster-api/pull/5919) * fixes periodics conformance ci job https://testgrid.k8s.io/sig-cluster-lifecycle-cluster-api-provider-openstack#periodic-conformance-test-mainbump CAPI to v1.1.3 🐛 bump CAPI to v1.1.3 Apr 19, 2022
@tobiasgiese
Copy link
Member

/lgtm

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

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

/test help

@k8s-ci-robot
Copy link
Contributor

@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

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
Copy link
Member Author

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

@chrischdi
Copy link
Member Author

/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
Copy link
Member

tobiasgiese commented Apr 19, 2022 •
edited

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

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

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

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

@chrischdi
Copy link
Member Author

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

1 similar comment
@jichenjc
Copy link
Contributor

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

jichenjc
jichenjc reviewed Apr 20, 2022
View reviewed changes
README.md Outdated
| | 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) | | | | | ✓ | ✓ | ✓ | ✓ |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 20, 2022
tobiasgiese
tobiasgiese reviewed Apr 20, 2022
View reviewed changes
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 |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@chrischdi
Fix capo v1.24 kubernetes compatibility
368bc8b 
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>
@k8s-ci-robot 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 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
@chrischdi
Copy link
Member Author

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
Copy link
Member

/lgtm

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

/lgtm

@jichenjc
Copy link
Contributor

/approve
/hold cancel

@k8s-ci-robot 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
Copy link
Contributor

[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

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

@k8s-ci-robot k8s-ci-robot merged commit 3431b8a into kubernetes-sigs:main Apr 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jichenjc jichenjc jichenjc left review comments

@tobiasgiese tobiasgiese tobiasgiese left review comments

@mdbooth mdbooth Awaiting requested review from mdbooth

Assignees

@seanschneeweiss seanschneeweiss

@jichenjc jichenjc

@tobiasgiese tobiasgiese

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@chrischdi @tobiasgiese @k8s-ci-robot @jichenjc @seanschneeweiss