Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#4387 from nawazkh/revert_use_clust…
Browse files Browse the repository at this point in the history
…erctl_move_annotation

Revert "Use clusterctl move annotation on last systempool validation"
  • Loading branch information
k8s-ci-robot authored Dec 14, 2023
2 parents a1f0ccc + 7aa4dba commit 1021a7c
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions api/v1beta1/azuremanagedmachinepool_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import (
azureutil "sigs.k8s.io/cluster-api-provider-azure/util/azure"
webhookutils "sigs.k8s.io/cluster-api-provider-azure/util/webhook"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
capifeature "sigs.k8s.io/cluster-api/feature"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -337,8 +336,7 @@ func validateLastSystemNodePool(cli client.Client, labels map[string]string, nam
return nil
}

// checking if the Cluster is going to be deleted for clusterctl move operation
if _, found := ownerCluster.Annotations[clusterctlv1.DeleteForMoveAnnotation]; found {
if ownerCluster.Spec.Paused {
return nil
}

Expand Down

0 comments on commit 1021a7c

Please sign in to comment.