Use `clusterctlv1.DeleteForMoveAnnotation` on last systempool validation #3426

pkbhowmick · 2023-04-14T17:58:28Z

What type of PR is this?

/kind bug

What this PR does / why we need it:
this PR fixed a bug in clusterctl move command
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
includes documentation
adds unit tests

Release note:

N/A

k8s-ci-robot · 2023-04-14T17:58:42Z

Hi @pkbhowmick. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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/test-infra repository.

pkbhowmick · 2023-04-14T18:03:07Z

#2774 can be handled in a better way now as there is a move annotation available at capi. Ref: kubernetes-sigs/cluster-api#8322

The annotation will be available in capi next release i.e. v1.5.0

k8s-triage-robot · 2023-07-13T19:02:26Z

The Kubernetes project currently lacks enough contributors to adequately respond to all PRs.

This bot triages PRs according to the following rules:

After 90d of inactivity, lifecycle/stale is applied
After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
After 30d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

Mark this PR as fresh with /remove-lifecycle stale
Close this PR with /close
Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle stale

nawazkh · 2023-08-09T07:43:06Z

Hey @pkbhowmick , How is this PR coming along?

pkbhowmick · 2023-08-09T07:50:23Z

Hey @pkbhowmick , How is this PR coming along?

Hey @nawazkh, the PR needs CAPI v1.5, so waiting for #3707

Signed-off-by: Pulak Kanti Bhowmick <pkbhowmick007@gmail.com>

nawazkh · 2023-10-02T18:11:48Z

Hey @pkbhowmick, I guess this PR is a "work in progress" state. If not, please feel free to remove the work-in-progress label.

pkbhowmick · 2023-10-02T18:15:08Z

/remove-lifecycle stale

pkbhowmick · 2023-10-02T18:16:05Z

Hi @nawazkh , this PR is ready for review/test

Jont828 · 2023-10-12T16:35:42Z

Thanks for the contribution! Does anyone know if this is covered in an e2e test already (so we can validate that this is working)?

mboersma · 2023-10-12T18:32:40Z

/ok-to-test
/test pull-cluster-api-provider-azure-capi-e2e

The CAPI tests that CAPZ runs include clusterctl move, so I think that will cover it:

Ensure API servers are stable before doing move @ 10/12/23 17:41:30.728
Moving the cluster to self hosted @ 10/12/23 17:41:40.73
Moving workload clusters @ 10/12/23 17:41:40.73
  INFO: clusterctl move --from-kubeconfig /root/.kube/config --to-kubeconfig /tmp/e2e-kubeconfig1923033913 --namespace self-hosted
  Oct 12 17:41:47.231: INFO: Waiting for the cluster to be reconciled after moving to self hosted
Waiting for cluster to enter the provisioned phase @ 10/12/23 17:41:47.299
PASSED! @ 10/12/23 17:42:07.474
Ensure API servers are stable before doing move @ 10/12/23 17:42:09.177
Moving the cluster back to bootstrap @ 10/12/23 17:42:19.182
Moving workload clusters @ 10/12/23 17:42:19.182
  INFO: clusterctl move --from-kubeconfig /tmp/e2e-kubeconfig1923033913 --to-kubeconfig /root/.kube/config --namespace self-hosted
  Oct 12 17:42:30.966: INFO: Waiting for the cluster to be reconciled after moving back to booststrap

I think there should also be a unit test case in azuremanagedmachinepool_webhook_test.go.

mboersma · 2023-10-12T18:35:23Z

I think that will cover it

Nope, I forgot this was just for AMMP, and I don't think the CAPI test is using a managed cluster. So AFAICT we don't have e2e coverage for this.

codecov · 2023-10-12T18:42:53Z

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (ff21c16) 56.65% compared to head (cf10241) 56.64%.
Report is 98 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3426      +/-   ##
==========================================
- Coverage   56.65%   56.64%   -0.02%     
==========================================
  Files         187      187              
  Lines       19139    19139              
==========================================
- Hits        10844    10842       -2     
- Misses       7666     7668       +2     
  Partials      629      629

Files	Coverage Δ
api/v1beta1/azuremanagedmachinepool_webhook.go	`84.29% <0.00%> (ø)`

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

mboersma · 2023-10-18T12:04:00Z

api/v1beta1/azuremanagedmachinepool_webhook.go

@@ -316,7 +317,8 @@ func (m *AzureManagedMachinePool) validateLastSystemNodePool(cli client.Client)
 		return nil
 	}

-	if ownerCluster.Spec.Paused {


Does the DeleteForMoveAnnotation supercede this entirely? Wouldn't we still want to check for both conditions?

Yes, we don't need this. Move annotation confirms that object is being deleted because of clusterctl move operation.

Jont828 · 2023-10-18T23:40:40Z

/rename Use clusterctlv1.DeleteForMoveAnnotation on last systempool validation

jackfrancis · 2023-10-19T16:42:45Z

/assign @CecileRobertMichon

feel free to loop me in as well

CecileRobertMichon

/lgtm
/approve

Let's see if we can add a self-hosted AKS cluster test to validate move in e2e. Opened #4157.

k8s-ci-robot · 2023-10-19T17:55:18Z

LGTM label has been added.

Git tree hash: 6c0d11c3f371c9fb68dd07b8ef154418d48af433

k8s-ci-robot · 2023-10-19T17:55:21Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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:

~~OWNERS~~ [CecileRobertMichon]

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 requested review from devigned and mboersma April 14, 2023 17:58

k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 14, 2023

pkbhowmick force-pushed the better-validation branch from 3213f30 to 36356c8 Compare April 14, 2023 18:09

k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 14, 2023

k8s-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jul 13, 2023

Use clusterctl move annotation on last systempool validation

cf10241

Signed-off-by: Pulak Kanti Bhowmick <pkbhowmick007@gmail.com>

pkbhowmick force-pushed the better-validation branch from 36356c8 to cf10241 Compare September 28, 2023 13:24

k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 28, 2023

pkbhowmick changed the title ~~[WIP] Use clusterctl move annotation on last systempool validation~~ Use clusterctl move annotation on last systempool validation Sep 28, 2023

nawazkh added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 2, 2023

k8s-ci-robot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Oct 2, 2023

nawazkh removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 2, 2023

k8s-ci-robot 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 Oct 12, 2023

mboersma reviewed Oct 18, 2023

View reviewed changes

pkbhowmick changed the title ~~Use clusterctl move annotation on last systempool validation~~ Use clusterctlv1.DeleteForMoveAnnotation on last systempool validation Oct 19, 2023

k8s-ci-robot assigned CecileRobertMichon Oct 19, 2023

CecileRobertMichon reviewed Oct 19, 2023

View reviewed changes

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

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 19, 2023

k8s-ci-robot merged commit 1b6df41 into kubernetes-sigs:main Oct 19, 2023
21 checks passed

k8s-ci-robot added this to the v1.12 milestone Oct 19, 2023

CecileRobertMichon mentioned this pull request Dec 9, 2023

Similar issue #2656 (AKS Cluster must have at least one system pool) happens on the latest version of capz. #4341

Closed

This was referenced Dec 14, 2023

Revert "Use clusterctl move annotation on last systempool validation" #4387

Merged

AzureManagedMachinePool ValidateDelete Webhook will check AMMP for DeleteForMoveAnnotation annotation #4392

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use `clusterctlv1.DeleteForMoveAnnotation` on last systempool validation #3426

Use `clusterctlv1.DeleteForMoveAnnotation` on last systempool validation #3426

pkbhowmick commented Apr 14, 2023 •

edited

Loading

k8s-ci-robot commented Apr 14, 2023

pkbhowmick commented Apr 14, 2023 •

edited

Loading

k8s-triage-robot commented Jul 13, 2023

nawazkh commented Aug 9, 2023

pkbhowmick commented Aug 9, 2023

nawazkh commented Oct 2, 2023

pkbhowmick commented Oct 2, 2023

pkbhowmick commented Oct 2, 2023

Jont828 commented Oct 12, 2023

mboersma commented Oct 12, 2023

mboersma commented Oct 12, 2023

codecov bot commented Oct 12, 2023 •

edited

Loading

mboersma Oct 18, 2023

pkbhowmick Oct 18, 2023 •

edited

Loading

Jont828 commented Oct 18, 2023

jackfrancis commented Oct 19, 2023

CecileRobertMichon left a comment

k8s-ci-robot commented Oct 19, 2023

k8s-ci-robot commented Oct 19, 2023

Use clusterctlv1.DeleteForMoveAnnotation on last systempool validation #3426

Use clusterctlv1.DeleteForMoveAnnotation on last systempool validation #3426

Conversation

pkbhowmick commented Apr 14, 2023 • edited Loading

k8s-ci-robot commented Apr 14, 2023

pkbhowmick commented Apr 14, 2023 • edited Loading

k8s-triage-robot commented Jul 13, 2023

nawazkh commented Aug 9, 2023

pkbhowmick commented Aug 9, 2023

nawazkh commented Oct 2, 2023

pkbhowmick commented Oct 2, 2023

pkbhowmick commented Oct 2, 2023

Jont828 commented Oct 12, 2023

mboersma commented Oct 12, 2023

mboersma commented Oct 12, 2023

codecov bot commented Oct 12, 2023 • edited Loading

Codecov Report

mboersma Oct 18, 2023

Choose a reason for hiding this comment

pkbhowmick Oct 18, 2023 • edited Loading

Choose a reason for hiding this comment

Jont828 commented Oct 18, 2023

jackfrancis commented Oct 19, 2023

CecileRobertMichon left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Oct 19, 2023

k8s-ci-robot commented Oct 19, 2023

Use `clusterctlv1.DeleteForMoveAnnotation` on last systempool validation #3426

Use `clusterctlv1.DeleteForMoveAnnotation` on last systempool validation #3426

pkbhowmick commented Apr 14, 2023 •

edited

Loading

pkbhowmick commented Apr 14, 2023 •

edited

Loading

codecov bot commented Oct 12, 2023 •

edited

Loading

pkbhowmick Oct 18, 2023 •

edited

Loading