K8s: Ensure there is always a user in appcontext.User (#78247)

This commit is contained in:
Ryan McKinley
2023-11-15 16:52:54 -08:00
committed by GitHub
parent 768fde02aa
commit 71f32d4e19
2 changed files with 25 additions and 8 deletions

View File

@@ -1,9 +1,7 @@
package authorizer
import (
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/apiserver/pkg/authorization/authorizerfactory"
"k8s.io/apiserver/pkg/authorization/union"
"github.com/grafana/grafana/pkg/services/grafana-apiserver/auth/authorizer/org"
@@ -17,12 +15,7 @@ func ProvideAuthorizer(
stackIDAuthorizer *stack.StackIDAuthorizer,
cfg *setting.Cfg,
) authorizer.Authorizer {
authorizers := []authorizer.Authorizer{
// This will allow privileged uses to do anything.
// In development mode, a privileged user is configured and saved into:
// ${data}/grafana-apiserver/grafana.kubeconfig
authorizerfactory.NewPrivilegedGroups(user.SystemPrivilegedGroup),
}
authorizers := []authorizer.Authorizer{}
// In Hosted grafana, the StackID replaces the orgID as a valid namespace
if cfg.StackID != "" {