mirror of
https://github.com/projectcapsule/capsule.git
synced 2026-08-19 12:36:39 +00:00
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>
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user