Skip to content

Commit 48f1835

Browse files
authored
ROX-21884: fix secret owner reference in FS for static CR name (#2402)
fix secret owner reference in FS for static CR name
1 parent 74a9615 commit 48f1835

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

fleetshard/pkg/central/reconciler/reconciler.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -646,16 +646,21 @@ func (r *CentralReconciler) ensureSecretHasOwnerReference(ctx context.Context, s
646646
return nil
647647
}
648648

649-
centralCR := &unstructured.Unstructured{}
650-
centralCR.SetGroupVersionKind(k8s.CentralGVK)
649+
centralCRList := &unstructured.UnstructuredList{}
650+
centralCRList.SetGroupVersionKind(k8s.CentralGVK)
651651

652-
objectKey := ctrlClient.ObjectKey{Namespace: namespace, Name: remoteCentral.Metadata.Name}
653-
if err := r.client.Get(ctx, objectKey, centralCR); err != nil {
652+
if err := r.client.List(ctx, centralCRList, &ctrlClient.ListOptions{Namespace: namespace}); err != nil {
654653
return fmt.Errorf("getting current central CR from k8s: %w", err)
655654
}
656655

656+
if len(centralCRList.Items) == 0 {
657+
return fmt.Errorf("no central CR found in namespaces: %q", namespace)
658+
}
659+
660+
centralCR := centralCRList.Items[0]
661+
657662
secret.OwnerReferences = []metav1.OwnerReference{
658-
*metav1.NewControllerRef(centralCR, k8s.CentralGVK),
663+
*metav1.NewControllerRef(&centralCR, k8s.CentralGVK),
659664
}
660665

661666
if err := r.client.Update(ctx, secret); err != nil {

0 commit comments

Comments
 (0)