Fix Deleting out-of-date machines #40
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
g-gaston
reviewed
Aug 10, 2023
controllers/controller_test.go
Outdated
|
|
||
| machineList := &clusterv1.MachineList{} | ||
| g.Expect(fakeClient.List(context.Background(), machineList, client.InNamespace("test"))).To(Succeed()) | ||
| g.Expect(len(machineList.Items)).To(Equal(0)) |
There was a problem hiding this comment.
nit: this improves the error message in case of error
Suggested change
| g.Expect(len(machineList.Items)).To(Equal(0)) | |
| g.Expect(machineList.Items).To(BeEmpty()) |
controllers/controller_test.go
Outdated
Comment on lines
405
to
412
| machine2.OwnerReferences = []metav1.OwnerReference{ | ||
| { | ||
| Kind: "Cluster", | ||
| APIVersion: clusterv1.GroupVersion.String(), | ||
| Name: cluster.Name, | ||
| UID: cluster.GetUID(), | ||
| }, | ||
| } |
There was a problem hiding this comment.
nit: this ownership is not realistic afaik
Suggested change
| machine2.OwnerReferences = []metav1.OwnerReference{ | |
| { | |
| Kind: "Cluster", | |
| APIVersion: clusterv1.GroupVersion.String(), | |
| Name: cluster.Name, | |
| UID: cluster.GetUID(), | |
| }, | |
| } | |
| notOwnedMachine.OwnerReferences = []metav1.OwnerReference{} |
controllers/controller_test.go
Outdated
| etcdadmCluster.Status.Initialized = true | ||
| // etcdadm controller has also registered that the status.Initialized field is true, so it has set InitializedCondition to true | ||
| conditions.MarkTrue(etcdadmCluster, etcdv1.InitializedCondition) | ||
| machine := newEtcdMachine(etcdadmCluster, cluster) |
There was a problem hiding this comment.
Suggested change
| machine := newEtcdMachine(etcdadmCluster, cluster) | |
| ownedMachine := newEtcdMachine(etcdadmCluster, cluster) |
controllers/controller_test.go
Outdated
| // etcdadm controller has also registered that the status.Initialized field is true, so it has set InitializedCondition to true | ||
| conditions.MarkTrue(etcdadmCluster, etcdv1.InitializedCondition) | ||
| machine := newEtcdMachine(etcdadmCluster, cluster) | ||
| machine2 := newEtcdMachine(etcdadmCluster, cluster) |
There was a problem hiding this comment.
Suggested change
| machine2 := newEtcdMachine(etcdadmCluster, cluster) | |
| notOwnedMachine := newEtcdMachine(etcdadmCluster, cluster) |
controllers/controller.go
Outdated
| @@ -342,7 +342,7 @@ func (r *EtcdadmClusterReconciler) reconcileDelete(ctx context.Context, etcdClus | |||
|
|
|||
| ownedMachines := etcdMachines.Filter(collections.OwnedMachines(etcdCluster)) | |||
There was a problem hiding this comment.
nit: you can move this to after the length check
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
https://github.com/aws/eks-anywhere-internal/issues/1626
Description of changes:
We should only remove the finalizer on the EtcdadmCluster when all machines have been deleted. Otherwise there may be a situation where out-of-date machines never get cleaned up.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.