K8s: Improve identity mapping setup (#89450)

pkg/services/store/resolver/ds_cache.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grafana/grafana/pkg/infra/appcontext"
+	"github.com/grafana/grafana/pkg/apimachinery/identity"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
 	"github.com/grafana/grafana/pkg/tsdb/grafanads"
@@ -122,12 +122,12 @@ func (c *dsCache) getDS(ctx context.Context, uid string) (*dsVal, error) {
 		}
 	}
 
-	usr, err := appcontext.User(ctx)
+	usr, err := identity.GetRequester(ctx)
 	if err != nil {
 		return nil, nil // no user
 	}
 
-	v, ok := c.cache[usr.OrgID]
+	v, ok := c.cache[usr.GetOrgID()]
 	if !ok {
 		return nil, nil // org not found
 	}