Skip to content

Commit 1cc569d

Browse files
committed
fix: read semaphore admin secret from semaphore namespace
1 parent 5c01028 commit 1cc569d

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

internal/controller/hermesinstance_controller.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -704,15 +704,16 @@ func (r *HermesInstanceReconciler) semaphoreCleanup(ctx context.Context, inst *h
704704
logger := log.FromContext(ctx)
705705
s := inst.Spec.Semaphore
706706

707-
// Read admin password from the referenced secret
707+
// Read admin password from the referenced secret (always in semaphore ns)
708708
var adminSecret corev1.Secret
709709
if s.AdminTokenSecretRef != nil {
710-
ns := inst.Namespace
710+
secretNS := "semaphore"
711+
secretName := s.AdminTokenSecretRef.LocalObjectReference.Name
711712
if err := r.Get(ctx, types.NamespacedName{
712-
Name: s.AdminTokenSecretRef.LocalObjectReference.Name, Namespace: ns,
713+
Name: secretName, Namespace: secretNS,
713714
}, &adminSecret); err != nil {
714715
return fmt.Errorf("read admin token secret %s/%s: %w",
715-
ns, s.AdminTokenSecretRef.LocalObjectReference.Name, err)
716+
secretNS, secretName, err)
716717
}
717718
}
718719
adminPassword := string(adminSecret.Data[s.AdminTokenSecretRef.Key])

0 commit comments

Comments
 (0)