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

⚠️ KCP: Stop updating and using Kubeadm's ClusterStatus with Kuberntes v1.22 #4485

Merged
merged 1 commit into from
May 26, 2021
Merged

⚠️ KCP: Stop updating and using Kubeadm's ClusterStatus with Kuberntes v1.22 #4485

merged 1 commit into from
May 26, 2021

Conversation

fabriziopandini
Copy link
Member

What this PR does / why we need it:
This PR makes it possible for CAPI 0.3.x to work with Kubernetes/kubeadm v1.22.0, where the ClusterStatus field inside the Kubeadm-config map will be dropped.

Which issue(s) this PR fixes:
Fixes #4423

@k8s-ci-robot k8s-ci-robot added this to the v0.3 milestone Apr 15, 2021
@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 15, 2021
@fabriziopandini
Copy link
Member Author

/hold
for the change happening in kubeadm so we can properly test this PR

@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 15, 2021
@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-test-release-0-3

@fabriziopandini
Copy link
Member Author

/test pull-cluster-api-test-release-0-3

@fabriziopandini fabriziopandini changed the title [WIP] ⚠️ Stop updating ClusterStatus for KubernetesVersion >= v1.22.0 ⚠️ Stop updating ClusterStatus for KubernetesVersion >= v1.22.0 May 19, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 19, 2021
@fabriziopandini
Copy link
Member Author

/hold cancel
changes merged in kubeadm rif kubernetes/kubernetes#101915, so we should get this change both in v1alpha3 (this PR) and in v1alpha4 (upcoming PR) otherwise CAPI won't work with Kubernetes v1.22

@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 May 19, 2021
@fabriziopandini fabriziopandini mentioned this pull request May 24, 2021
Closed
vincepri
vincepri approved these changes May 24, 2021
View reviewed changes
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/lgtm
/assign @CecileRobertMichon

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 24, 2021
@vincepri
Copy link
Member

/retitle ⚠️ KCP: Stop updating and using Kubeadm's ClusterStatus with Kuberntes v1.22

@k8s-ci-robot k8s-ci-robot changed the title ⚠️ Stop updating ClusterStatus for KubernetesVersion >= v1.22.0 ⚠️ KCP: Stop updating and using Kubeadm's ClusterStatus with Kuberntes v1.22 May 24, 2021
@CecileRobertMichon
Copy link
Contributor

looks like UTs are failing?

otherwise lgtm

@vincepri
Copy link
Member

Hm, I assumed (😂 whoops) that it was flaking

@vincepri
Copy link
Member

/lgtm cancel

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 24, 2021
@fabriziopandini fabriziopandini force-pushed the stop-updating-ClusterStatus-for-KubernetesVersionGTE-v1.22.0 branch from 1b0890f to 795c280 Compare May 25, 2021 11:35
@fabriziopandini fabriziopandini force-pushed the stop-updating-ClusterStatus-for-KubernetesVersionGTE-v1.22.0 branch from 795c280 to ecf6dde Compare May 25, 2021 12:06
@fabriziopandini
Copy link
Member Author

rebased and fixed failing tests

vincepri
vincepri approved these changes May 26, 2021
View reviewed changes
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 26, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 26, 2021
@k8s-ci-robot k8s-ci-robot merged commit 60a913c into kubernetes-sigs:release-0.3 May 26, 2021
@fabriziopandini fabriziopandini deleted the stop-updating-ClusterStatus-for-KubernetesVersionGTE-v1.22.0 branch May 28, 2021 10:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@enxebre enxebre enxebre left review comments

@vincepri vincepri vincepri approved these changes

@detiber detiber Awaiting requested review from detiber

Assignees

@vincepri vincepri

@CecileRobertMichon CecileRobertMichon

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
v0.3
Development

Successfully merging this pull request may close these issues.
5 participants
@fabriziopandini @vincepri @CecileRobertMichon @k8s-ci-robot @enxebre