From 61208852bc0c4fb6be3f8a552179a2aba0e04c29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20B=C3=A4hler?= <26610571+oliverbaehler@users.noreply.github.com> Date: Mon, 8 Jun 2026 16:59:49 +0200 Subject: [PATCH] fix: translate serviceaccounts to type serviceaccount not user (#1956) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(controller): decode old object for delete requests Signed-off-by: Oliver Bähler * chore: modernize golang Signed-off-by: Oliver Bähler * chore: modernize golang Signed-off-by: Oliver Bähler * chore: modernize golang Signed-off-by: Oliver Bähler * fix: preserve ca-bundles injected from external providers Signed-off-by: Oliver Baehler * fix: translate serviceaccounts to type serviceaccount not user Signed-off-by: Oliver Baehler --------- Signed-off-by: Oliver Bähler Signed-off-by: Oliver Baehler --- pkg/runtime/configuration/client.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkg/runtime/configuration/client.go b/pkg/runtime/configuration/client.go index 4b127093..9250c021 100644 --- a/pkg/runtime/configuration/client.go +++ b/pkg/runtime/configuration/client.go @@ -153,7 +153,11 @@ func (c *capsuleConfiguration) UserGroups() []string { //nolint:staticcheck func (c *capsuleConfiguration) UserNames() []string { - return append(c.retrievalFn().Spec.UserNames, c.retrievalFn().Spec.Users.GetByKinds([]rbac.OwnerKind{rbac.UserOwner, rbac.ServiceAccountOwner})...) + return append(c.retrievalFn().Spec.UserNames, c.retrievalFn().Spec.Users.GetByKinds([]rbac.OwnerKind{rbac.UserOwner})...) +} + +func (c *capsuleConfiguration) ServiceAccounts() []string { + return c.retrievalFn().Spec.Users.GetByKinds([]rbac.OwnerKind{rbac.ServiceAccountOwner}) } func (c *capsuleConfiguration) Users() rbac.UserListSpec { @@ -166,6 +170,13 @@ func (c *capsuleConfiguration) Users() rbac.UserListSpec { }) } + for _, user := range c.ServiceAccounts() { + out.Upsert(rbac.UserSpec{ + Kind: rbac.ServiceAccountOwner, + Name: user, + }) + } + for _, group := range c.UserGroups() { out.Upsert(rbac.UserSpec{ Kind: rbac.GroupOwner,