Skip to content

Commit 6120885

Browse files
fix: translate serviceaccounts to type serviceaccount not user (#1956)
* fix(controller): decode old object for delete requests Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com> * chore: modernize golang Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com> * chore: modernize golang Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com> * chore: modernize golang Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com> * fix: preserve ca-bundles injected from external providers Signed-off-by: Oliver Baehler <oliver@sudo-i.net> * fix: translate serviceaccounts to type serviceaccount not user Signed-off-by: Oliver Baehler <oliver@sudo-i.net> --------- Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com> Signed-off-by: Oliver Baehler <oliver@sudo-i.net>
1 parent 002b8e4 commit 6120885

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

pkg/runtime/configuration/client.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,11 @@ func (c *capsuleConfiguration) UserGroups() []string {
153153

154154
//nolint:staticcheck
155155
func (c *capsuleConfiguration) UserNames() []string {
156-
return append(c.retrievalFn().Spec.UserNames, c.retrievalFn().Spec.Users.GetByKinds([]rbac.OwnerKind{rbac.UserOwner, rbac.ServiceAccountOwner})...)
156+
return append(c.retrievalFn().Spec.UserNames, c.retrievalFn().Spec.Users.GetByKinds([]rbac.OwnerKind{rbac.UserOwner})...)
157+
}
158+
159+
func (c *capsuleConfiguration) ServiceAccounts() []string {
160+
return c.retrievalFn().Spec.Users.GetByKinds([]rbac.OwnerKind{rbac.ServiceAccountOwner})
157161
}
158162

159163
func (c *capsuleConfiguration) Users() rbac.UserListSpec {
@@ -166,6 +170,13 @@ func (c *capsuleConfiguration) Users() rbac.UserListSpec {
166170
})
167171
}
168172

173+
for _, user := range c.ServiceAccounts() {
174+
out.Upsert(rbac.UserSpec{
175+
Kind: rbac.ServiceAccountOwner,
176+
Name: user,
177+
})
178+
}
179+
169180
for _, group := range c.UserGroups() {
170181
out.Upsert(rbac.UserSpec{
171182
Kind: rbac.GroupOwner,

0 commit comments

Comments
 (0)