fix changelog

giantswarm · Dec 17, 2024 · e42cca1 · e42cca1
1 parent c945501
commit e42cca1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Use `giantswarm` tenant by default instead of cluster name.
-- Replace multi-tenant-proxy with ingress auth map.
+- Replace multi-tenant-proxy with ingress auth map on CAPI.
 
 ### Removed
 

diff --git a/pkg/resource/proxy-auth/proxy-auth.go b/pkg/resource/proxy-auth/proxy-auth.go
@@ -67,12 +67,17 @@ func GenerateProxyAuthSecret(lc loggedcluster.Interface, credentialsSecret *v1.S
 			return v1.Secret{}, errors.WithStack(err)
 		}
 
+		tenant := writeUser
+		if lc.IsCAPI() {
+			tenant = lc.GetTenant()
+		}
+
 		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: common.DefaultWriteTenant,
+			OrgID: tenant,
 		})
 
 		// Add write user to allowed tenants for read user