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

[release-1.5] 🐛 Improve handling of topology orphaned objects #10347

Merged
merged 2 commits into from
Apr 3, 2024
Merged

[release-1.5] 🐛 Improve handling of topology orphaned objects #10347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f7cc91
Avoid leaving orphaned InfrastructureCluster when create control plan…
fabriziopandini Mar 18, 2024
d78b823
Best effort cleanup of referenced templates/objects
fabriziopandini Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions internal/controllers/topology/cluster/desired_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (r *Reconciler) computeDesiredState(ctx context.Context, s *scope.Scope) (*
desiredState.ControlPlane.MachineHealthCheck = computeMachineHealthCheck(
desiredState.ControlPlane.Object,
selectorForControlPlaneMHC(),
s.Current.Cluster.Name,
s.Current.Cluster,
s.Blueprint.ControlPlaneMachineHealthCheckClass())
}

Expand Down Expand Up @@ -764,7 +764,7 @@ func computeMachineDeployment(_ context.Context, s *scope.Scope, machineDeployme
desiredMachineDeployment.MachineHealthCheck = computeMachineHealthCheck(
desiredMachineDeploymentObj,
selectorForMachineDeploymentMHC(desiredMachineDeploymentObj),
s.Current.Cluster.Name,
s.Current.Cluster,
s.Blueprint.MachineDeploymentMachineHealthCheckClass(&machineDeploymentTopology))
}
return desiredMachineDeployment, nil
Expand Down Expand Up @@ -1020,7 +1020,7 @@ func ownerReferenceTo(obj client.Object) *metav1.OwnerReference {
}
}

func computeMachineHealthCheck(healthCheckTarget client.Object, selector *metav1.LabelSelector, clusterName string, check *clusterv1.MachineHealthCheckClass) *clusterv1.MachineHealthCheck {
func computeMachineHealthCheck(healthCheckTarget client.Object, selector *metav1.LabelSelector, cluster *clusterv1.Cluster, check *clusterv1.MachineHealthCheckClass) *clusterv1.MachineHealthCheck {
// Create a MachineHealthCheck with the spec given in the ClusterClass.
mhc := &clusterv1.MachineHealthCheck{
TypeMeta: metav1.TypeMeta{
Expand All @@ -1033,9 +1033,14 @@ func computeMachineHealthCheck(healthCheckTarget client.Object, selector *metav1
Labels: map[string]string{
clusterv1.ClusterTopologyOwnedLabel: "",
},
// Note: we are adding an ownerRef to Cluster so the MHC will be automatically garbage collected
// in case deletion is triggered before an object reconcile happens.
OwnerReferences: []metav1.OwnerReference{
*ownerReferenceTo(cluster),
},
},
Spec: clusterv1.MachineHealthCheckSpec{
ClusterName: clusterName,
ClusterName: cluster.Name,
Selector: *selector,
UnhealthyConditions: check.UnhealthyConditions,
MaxUnhealthy: check.MaxUnhealthy,
Expand Down
9 changes: 6 additions & 3 deletions internal/controllers/topology/cluster/desired_state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2239,7 +2239,7 @@ func Test_computeMachineHealthCheck(t *testing.T) {
"foo": "bar",
}}
healthCheckTarget := builder.MachineDeployment("ns1", "md1").Build()
clusterName := "cluster1"
cluster := builder.Cluster("ns1", "cluster1").Build()
want := &clusterv1.MachineHealthCheck{
TypeMeta: metav1.TypeMeta{
Kind: clusterv1.GroupVersion.WithKind("MachineHealthCheck").Kind,
Expand All @@ -2253,9 +2253,12 @@ func Test_computeMachineHealthCheck(t *testing.T) {
"cluster.x-k8s.io/cluster-name": "cluster1",
clusterv1.ClusterTopologyOwnedLabel: "",
},
OwnerReferences: []metav1.OwnerReference{
*ownerReferenceTo(cluster),
},
},
Spec: clusterv1.MachineHealthCheckSpec{
ClusterName: "cluster1",
ClusterName: cluster.Name,
Selector: metav1.LabelSelector{MatchLabels: map[string]string{
"foo": "bar",
}},
Expand All @@ -2281,7 +2284,7 @@ func Test_computeMachineHealthCheck(t *testing.T) {
t.Run("set all fields correctly", func(t *testing.T) {
g := NewWithT(t)

got := computeMachineHealthCheck(healthCheckTarget, selector, clusterName, mhcSpec)
got := computeMachineHealthCheck(healthCheckTarget, selector, cluster, mhcSpec)

g.Expect(got).To(Equal(want), cmp.Diff(got, want))
})
Expand Down
Loading
Loading