From 57f9aa1cc9021b66c5e5cf66b0159b7d3fdef31b Mon Sep 17 00:00:00 2001
From: Simon Gerber <simon.gerber@vshn.ch>
Date: Tue, 26 May 2026 10:00:45 +0200
Subject: [PATCH] Correctly set service account name for generated RBAC

---
 component/main.jsonnet                               |  2 +-
 ...3_supplemental_role_my-namespace_copy-secret.yaml | 12 ++++++------
 .../espejote/60_mr_my-namespace_copy-secret.yaml     |  4 ++--
 .../espejote/60_mr_syn-espejote_with-sa-in-spec.yaml |  4 ++--
 .../espejote/60_mr_syn-espejote_with-sa.yaml         |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/component/main.jsonnet b/component/main.jsonnet
index ef7fd68..3b49b63 100644
--- a/component/main.jsonnet
+++ b/component/main.jsonnet
@@ -91,7 +91,7 @@ local alerts = addKubernetesNameLabel({
 
 local serviceAccountName(name) =
   espejote.serviceAccountNameFromManagedResource(
-    params.managedResources[name].spec,
+    params.managedResources[name],
     'espejote-%s' % namespacedName(name).name
   );
 
diff --git a/tests/golden/resources/espejote/espejote/43_supplemental_role_my-namespace_copy-secret.yaml b/tests/golden/resources/espejote/espejote/43_supplemental_role_my-namespace_copy-secret.yaml
index 0210072..b1b9678 100644
--- a/tests/golden/resources/espejote/espejote/43_supplemental_role_my-namespace_copy-secret.yaml
+++ b/tests/golden/resources/espejote/espejote/43_supplemental_role_my-namespace_copy-secret.yaml
@@ -2,8 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    app.kubernetes.io/name: espejote-supplemental-admin-espejote-copy-secret
-  name: espejote:supplemental:admin:espejote-copy-secret
+    app.kubernetes.io/name: espejote-supplemental-admin-copy-configmap
+  name: espejote:supplemental:admin:copy-configmap
   namespace: my-namespace
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -11,15 +11,15 @@ roleRef:
   name: espejote:supplemental:my-namespace:copy-secret:admin
 subjects:
   - kind: ServiceAccount
-    name: espejote-copy-secret
+    name: copy-configmap
     namespace: my-namespace
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    app.kubernetes.io/name: espejote-supplemental-argocd-manager-espejote-copy-secret
-  name: espejote:supplemental:argocd-manager:espejote-copy-secret
+    app.kubernetes.io/name: espejote-supplemental-argocd-manager-copy-configmap
+  name: espejote:supplemental:argocd-manager:copy-configmap
   namespace: my-namespace
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -27,5 +27,5 @@ roleRef:
   name: espejote:supplemental:my-namespace:copy-secret:argocd-manager
 subjects:
   - kind: ServiceAccount
-    name: espejote-copy-secret
+    name: copy-configmap
     namespace: my-namespace
diff --git a/tests/golden/resources/espejote/espejote/60_mr_my-namespace_copy-secret.yaml b/tests/golden/resources/espejote/espejote/60_mr_my-namespace_copy-secret.yaml
index 1dfcc06..f282503 100644
--- a/tests/golden/resources/espejote/espejote/60_mr_my-namespace_copy-secret.yaml
+++ b/tests/golden/resources/espejote/espejote/60_mr_my-namespace_copy-secret.yaml
@@ -2,9 +2,9 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app.kubernetes.io/name: espejote-copy-secret
+    app.kubernetes.io/name: copy-configmap
     managedresource.espejote.io/name: copy-secret
-  name: espejote-copy-secret
+  name: copy-configmap
   namespace: my-namespace
 ---
 apiVersion: espejote.io/v1alpha1
diff --git a/tests/golden/resources/espejote/espejote/60_mr_syn-espejote_with-sa-in-spec.yaml b/tests/golden/resources/espejote/espejote/60_mr_syn-espejote_with-sa-in-spec.yaml
index e4152c0..e412fd0 100644
--- a/tests/golden/resources/espejote/espejote/60_mr_syn-espejote_with-sa-in-spec.yaml
+++ b/tests/golden/resources/espejote/espejote/60_mr_syn-espejote_with-sa-in-spec.yaml
@@ -2,9 +2,9 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app.kubernetes.io/name: espejote-with-sa-in-spec
+    app.kubernetes.io/name: sa-in-spec
     managedresource.espejote.io/name: with-sa-in-spec
-  name: espejote-with-sa-in-spec
+  name: sa-in-spec
   namespace: syn-espejote
 ---
 apiVersion: espejote.io/v1alpha1
diff --git a/tests/golden/resources/espejote/espejote/60_mr_syn-espejote_with-sa.yaml b/tests/golden/resources/espejote/espejote/60_mr_syn-espejote_with-sa.yaml
index 2b2df62..1359149 100644
--- a/tests/golden/resources/espejote/espejote/60_mr_syn-espejote_with-sa.yaml
+++ b/tests/golden/resources/espejote/espejote/60_mr_syn-espejote_with-sa.yaml
@@ -2,9 +2,9 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app.kubernetes.io/name: espejote-with-sa
+    app.kubernetes.io/name: sa-with
     managedresource.espejote.io/name: with-sa
-  name: espejote-with-sa
+  name: sa-with
   namespace: syn-espejote
 ---
 apiVersion: espejote.io/v1alpha1