squash

Author: mboersma

azure/services/aso/aso.go

@@ -378,7 +378,8 @@ func isOwnedBy(resource client.Object, owner client.Object, scheme *runtime.Sche
 }
 
 func hasLegacyOwnedByLabel(labels map[string]string, clusterName string) bool {
-	return labels[infrav1.OwnedByClusterLabelKey] == clusterName //nolint:staticcheck
+	//nolint:staticcheck // Referencing this deprecated value is required for backwards compatibility.
+	return labels[infrav1.OwnedByClusterLabelKey] == clusterName
 }
 
 // PauseResource pauses an ASO resource by updating its `reconcile-policy` to `skip`.

azure/services/aso/aso_test.go

@@ -565,8 +565,9 @@ func TestCreateOrUpdateResource(t *testing.T) {
 				Name:      "name",
 				Namespace: "namespace",
 				Labels: map[string]string{
-					clusterv1.ClusterNameLabel:     clusterName,
-					infrav1.OwnedByClusterLabelKey: clusterName, //nolint:staticcheck
+					clusterv1.ClusterNameLabel: clusterName,
+					//nolint:staticcheck // Referencing this deprecated value is required for backwards compatibility.
+					infrav1.OwnedByClusterLabelKey: clusterName,
 				},
 				Annotations: map[string]string{
 					asoannotations.ReconcilePolicy: string(asoannotations.ReconcilePolicySkip),