change from isCapi to GetTenant

giantswarm · Nov 27, 2024 · 7e0ffc0 · 7e0ffc0
1 parent 21fbf4b
commit 7e0ffc0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 14 deletions.
diff --git a/pkg/logged-cluster/vintagemc/cluster.go b/pkg/logged-cluster/vintagemc/cluster.go
@@ -13,10 +13,6 @@ type Object struct {
 	Options loggedcluster.Options
 }
 
-func (o Object) IsCAPI() bool {
-	return false
-}
-
 func (o Object) HasLoggingEnabled() bool {
 	return o.Options.EnableLoggingFlag
 }

diff --git a/pkg/logged-cluster/vintagewc/cluster.go b/pkg/logged-cluster/vintagewc/cluster.go
@@ -44,10 +44,6 @@ func (o Object) HasLoggingEnabled() bool {
 	return loggingEnabled
 }
 
-func (o Object) IsCAPI() bool {
-	return false
-}
-
 func (o Object) GetLoggingAgent() string {
 	return o.Options.LoggingAgent
 }

diff --git a/pkg/resource/proxy-auth/proxy-auth.go b/pkg/resource/proxy-auth/proxy-auth.go
@@ -67,17 +67,12 @@ func GenerateProxyAuthSecret(lc loggedcluster.Interface, credentialsSecret *v1.S
 			return v1.Secret{}, errors.WithStack(err)
 		}
 
-		tenant := writeUser
-		if lc.IsCAPI() {
-			tenant = common.DefaultWriteTenant
-		}
-
 		authCfg.Users = append(authCfg.Users, config.User{
 			Username: writeUser,
 			Password: writePassword,
 			// we set the default tenant even though it may be given by the sender
 			// depending of grafana-multi-teant-proxy config
-			OrgID: tenant,
+			OrgID: writeUser,
 		})
 
 		// Add write user to allowed tenants for read user