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.

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

✨ Remove configmap entry when doing a KubeadmControlPlane scale down #2383

Merged

Conversation

detiber
Copy link
Member

@detiber detiber commented Feb 20, 2020

What this PR does / why we need it:

Removes the machine's kubeadm configmap entry when doing a KubeadmControlPlane scale down

Related to #2242
Builds on #2379 #2380 #2381 #2382

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 20, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: detiber

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 Feb 20, 2020
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 20, 2020
@detiber
Copy link
Member Author

detiber commented Feb 20, 2020

/hold

I messed up the attribution on this PR, it should include @dlipovetsky

@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 Feb 20, 2020
@detiber
Copy link
Member Author

detiber commented Feb 20, 2020

/test pull-cluster-api-capd-e2e

@vincepri
Copy link
Member

/milestone v0.3.0-rc.2

@k8s-ci-robot k8s-ci-robot added this to the v0.3.0-rc.2 milestone Feb 20, 2020
@ncdc ncdc added the area/control-plane Issues or PRs related to control-plane lifecycle management label Feb 20, 2020
@detiber detiber force-pushed the kcpRemoveConfigMapEntry branch 2 times, most recently from 8e80f87 to 397621c Compare February 20, 2020 21:01
@detiber
Copy link
Member Author

detiber commented Feb 20, 2020

Attribution fixed, leaving hold on prerequisites, though

Co-authored-by: Daniel Lipovetsky <dlipovetsky@d2iq.com>
@detiber
Copy link
Member Author

detiber commented Feb 21, 2020

/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 Feb 21, 2020
@dlipovetsky
Copy link
Contributor

lgtm, but will defer to a third party 🙂

@@ -453,6 +454,21 @@ func (r *KubeadmControlPlaneReconciler) scaleDownControlPlane(ctx context.Contex
}
}

if !internal.HasAnnotationKey(controlplanev1.ScaleDownConfigMapEntryRemovedAnnotation)(machineToDelete) {
if err := r.managementCluster.TargetClusterControlPlaneIsHealthy(ctx, util.ObjectKey(cluster), kcp.Name); err != nil {
Copy link
Member

Choose a reason for hiding this comment

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

Not a blocker, but we need to check provider contracts around load balancers to ensure they stop sending requests to machines.

@randomvariable
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 Feb 21, 2020
@k8s-ci-robot k8s-ci-robot merged commit 098a911 into kubernetes-sigs:master Feb 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane Issues or PRs related to control-plane lifecycle management 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
Development

Successfully merging this pull request may close these issues.

6 participants