matching labels

strangelove-ventures · Oct 18, 2023 · 2acc959 · 2acc959
1 parent a881273
commit 2acc959
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/internal/fullnode/cluster_role_binding_control.go b/internal/fullnode/cluster_role_binding_control.go
@@ -28,7 +28,11 @@ func (sc ClusterRoleBindingControl) Reconcile(ctx context.Context, log kube.Logg
 	var crs rbacv1.ClusterRoleBindingList
 	if err := sc.client.List(ctx, &crs,
 		client.InNamespace(crd.Namespace),
-		client.MatchingFields{kube.ControllerOwnerField: crd.Name},
+		client.MatchingLabels{
+			kube.ControllerLabel: "cosmos-operator",
+			kube.ComponentLabel:  cosmosv1.CosmosFullNodeController,
+			kube.NameLabel:       appName(crd),
+		},
 	); err != nil {
 		return kube.TransientError(fmt.Errorf("list existing cluster role bindings: %w", err))
 	}

diff --git a/internal/fullnode/cluster_role_control.go b/internal/fullnode/cluster_role_control.go
@@ -28,7 +28,11 @@ func (sc ClusterRoleControl) Reconcile(ctx context.Context, log kube.Logger, crd
 	var crs rbacv1.ClusterRoleList
 	if err := sc.client.List(ctx, &crs,
 		client.InNamespace(crd.Namespace),
-		client.MatchingFields{kube.ControllerOwnerField: crd.Name},
+		client.MatchingLabels{
+			kube.ControllerLabel: "cosmos-operator",
+			kube.ComponentLabel:  cosmosv1.CosmosFullNodeController,
+			kube.NameLabel:       appName(crd),
+		},
 	); err != nil {
 		return kube.TransientError(fmt.Errorf("list existing cluster roles: %w", err))
 	}

diff --git a/internal/fullnode/service_account_control.go b/internal/fullnode/service_account_control.go
@@ -28,7 +28,11 @@ func (sc ServiceAccountControl) Reconcile(ctx context.Context, log kube.Logger,
 	var svcs corev1.ServiceAccountList
 	if err := sc.client.List(ctx, &svcs,
 		client.InNamespace(crd.Namespace),
-		client.MatchingFields{kube.ControllerOwnerField: crd.Name},
+		client.MatchingLabels{
+			kube.ControllerLabel: "cosmos-operator",
+			kube.ComponentLabel:  cosmosv1.CosmosFullNodeController,
+			kube.NameLabel:       appName(crd),
+		},
 	); err != nil {
 		return kube.TransientError(fmt.Errorf("list existing service accounts: %w", err))
 	}