change from isCapi to GetTenant

pkg/logged-cluster/capicluster/cluster.go

@@ -90,6 +90,10 @@ func (o Object) GetTenant() string {
 	return common.DefaultWriteTenant
 }
 
+func (o Object) IsCAPI() bool {
+	return true
+}
+
 // On capi clusters, use an extraconfig
 func (o Object) GetObservabilityBundleConfigMap() string {
 	return "observability-bundle-logging-extraconfig"

pkg/logged-cluster/vintagemc/cluster.go

@@ -66,6 +66,14 @@ func (o Object) GetObject() client.Object {
 	return o.Object
 }
 
+func (o Object) GetTenant() string {
+	return o.GetClusterName()
+}
+
+func (o Object) IsCAPI() bool {
+	return false
+}
+
 // On vintage MC, there's no support for extraconfig so we should use standard user values
 func (o Object) GetObservabilityBundleConfigMap() string {
 	return "observability-bundle-user-values"

pkg/logged-cluster/vintagewc/cluster.go

@@ -96,6 +96,14 @@ func (o Object) GetObject() client.Object {
 	return o.Object
 }
 
+func (o Object) GetTenant() string {
+	return o.GetClusterName()
+}
+
+func (o Object) IsCAPI() bool {
+	return false
+}
+
 // on vintage WC, use extraconfig
 func (o Object) GetObservabilityBundleConfigMap() string {
 	return "observability-bundle-logging-extraconfig"

pkg/resource/events-logger-secret/grafana-agent-secret.go

@@ -31,11 +31,6 @@ func generateGrafanaAgentSecret(lc loggedcluster.Interface, credentialsSecret *v
 		return nil, errors.WithStack(err)
 	}
 
-	tenant := clusterName
-	if lc.IsCAPI() {
-		tenant = common.DefaultWriteTenant
-	}
-
 	values := values{
 		ExtraSecret: extraSecret{
 			Name: fmt.Sprintf("%s-%s", clusterName, common.GrafanaAgentExtraSecretName()),

pkg/resource/events-logger-secret/reconciler.go

@@ -31,7 +31,7 @@ func (r *Reconciler) ReconcileCreate(ctx context.Context, lc loggedcluster.Inter
 
 	// Retrieve secret containing credentials
 	var eventsLoggerCredentialsSecret v1.Secret
-	err := r.Client.Get(ctx, types.NamespacedName{Name: loggingcredentials.LoggingCredentialsSecretMeta(lc).Name, Namespace: loggingcredentials.LoggingCredentialsSecretMeta(lc).Namespace},
+	err := r.Client.Get(ctx, types.NamespacedName{Name: loggingcredentials.LoggingCredentialsSecretMeta().Name, Namespace: loggingcredentials.LoggingCredentialsSecretMeta().Namespace},
 		&eventsLoggerCredentialsSecret)
 	if err != nil {
 		return ctrl.Result{}, errors.WithStack(err)

pkg/resource/grafana-datasource/grafana-loki-datasource.go

@@ -45,7 +45,7 @@ type secureJsonData struct {
 }
 
 // DatasourceSecretMeta returns metadata for the observability bundle extra values configmap.
-func datasourceSecretMeta(lc loggedcluster.Interface) metav1.ObjectMeta {
+func datasourceSecretMeta() metav1.ObjectMeta {
 	metadata := metav1.ObjectMeta{
 		Name:      datasourceSecretName,
 		Namespace: datasourceSecretNamespace,
@@ -96,7 +96,7 @@ func GenerateDatasourceSecret(lc loggedcluster.Interface, credentialsSecret *v1.
 	}
 
 	secret := v1.Secret{
-		ObjectMeta: datasourceSecretMeta(lc),
+		ObjectMeta: datasourceSecretMeta(),
 		Data: map[string][]byte{
 			datasourceFileName: []byte(v),
 		},

pkg/resource/grafana-datasource/reconciler.go

@@ -35,7 +35,7 @@ func (r *Reconciler) ReconcileCreate(ctx context.Context, lc loggedcluster.Inter
 
 	// Retrieve secret containing credentials
 	var loggingCredentialsSecret v1.Secret
-	err := r.Client.Get(ctx, types.NamespacedName{Name: loggingcredentials.LoggingCredentialsSecretMeta(lc).Name, Namespace: loggingcredentials.LoggingCredentialsSecretMeta(lc).Namespace},
+	err := r.Client.Get(ctx, types.NamespacedName{Name: loggingcredentials.LoggingCredentialsSecretMeta().Name, Namespace: loggingcredentials.LoggingCredentialsSecretMeta().Namespace},
 		&loggingCredentialsSecret)
 	if err != nil {
 		return ctrl.Result{}, errors.WithStack(err)
@@ -84,7 +84,7 @@ func (r *Reconciler) ReconcileDelete(ctx context.Context, lc loggedcluster.Inter
 	logger.Info("delete grafana datasource")
 
 	datasourceSecret := v1.Secret{
-		ObjectMeta: datasourceSecretMeta(lc),
+		ObjectMeta: datasourceSecretMeta(),
 	}
 
 	// Delete secret.

pkg/resource/logging-credentials/logging_operator_secrets.go

@@ -27,7 +27,7 @@ type userCredentials struct {
 }
 
 // LoggingCredentialsSecretMeta returns metadata for the logging-operator credentials secret.
-func LoggingCredentialsSecretMeta(lc loggedcluster.Interface) metav1.ObjectMeta {
+func LoggingCredentialsSecretMeta() metav1.ObjectMeta {
 	metadata := metav1.ObjectMeta{
 		Name:      LoggingCredentialsName,
 		Namespace: LoggingCredentialsNamespace,
@@ -61,7 +61,7 @@ func genPassword() (string, error) {
 // the observabilitybundle application to enable logging.
 func GenerateLoggingCredentialsBasicSecret(lc loggedcluster.Interface) *v1.Secret {
 	secret := v1.Secret{
-		ObjectMeta: LoggingCredentialsSecretMeta(lc),
+		ObjectMeta: LoggingCredentialsSecretMeta(),
 		Data:       map[string][]byte{},
 	}
 

pkg/resource/logging-credentials/reconciler.go

@@ -25,13 +25,13 @@ type Reconciler struct {
 func (r *Reconciler) ReconcileCreate(ctx context.Context, lc loggedcluster.Interface) (ctrl.Result, error) {
 	logger := log.FromContext(ctx)
 
-	logger.Info("loggingcredentials checking secret", "namespace", LoggingCredentialsSecretMeta(lc).Namespace, "name", LoggingCredentialsSecretMeta(lc).Name)
+	logger.Info("loggingcredentials checking secret", "namespace", LoggingCredentialsSecretMeta().Namespace, "name", LoggingCredentialsSecretMeta().Name)
 
 	// Start with some empty secret
 	loggingCredentialsSecret := GenerateLoggingCredentialsBasicSecret(lc)
 
 	// Retrieve existing secret if it exists
-	err := r.Client.Get(ctx, types.NamespacedName{Name: LoggingCredentialsSecretMeta(lc).Name, Namespace: LoggingCredentialsSecretMeta(lc).Namespace}, loggingCredentialsSecret)
+	err := r.Client.Get(ctx, types.NamespacedName{Name: LoggingCredentialsSecretMeta().Name, Namespace: LoggingCredentialsSecretMeta().Namespace}, loggingCredentialsSecret)
 	if err != nil {
 		if apimachineryerrors.IsNotFound(err) {
 			logger.Info("loggingcredentials secret not found, initializing one")
@@ -47,9 +47,9 @@ func (r *Reconciler) ReconcileCreate(ctx context.Context, lc loggedcluster.Inter
 	}
 
 	// Check if metadata has been updated
-	if !reflect.DeepEqual(loggingCredentialsSecret.ObjectMeta.Labels, LoggingCredentialsSecretMeta(lc).Labels) {
+	if !reflect.DeepEqual(loggingCredentialsSecret.ObjectMeta.Labels, LoggingCredentialsSecretMeta().Labels) {
 		logger.Info("loggingCredentials - metatada update required")
-		loggingCredentialsSecret.ObjectMeta = LoggingCredentialsSecretMeta(lc)
+		loggingCredentialsSecret.ObjectMeta = LoggingCredentialsSecretMeta()
 		secretUpdated = true
 	}
 
@@ -77,13 +77,13 @@ func (r *Reconciler) ReconcileCreate(ctx context.Context, lc loggedcluster.Inter
 func (r *Reconciler) ReconcileDelete(ctx context.Context, lc loggedcluster.Interface) (ctrl.Result, error) {
 	logger := log.FromContext(ctx)
 
-	logger.Info("loggingcredentials secret delete", "namespace", LoggingCredentialsSecretMeta(lc).Namespace, "name", LoggingCredentialsSecretMeta(lc).Name)
+	logger.Info("loggingcredentials secret delete", "namespace", LoggingCredentialsSecretMeta().Namespace, "name", LoggingCredentialsSecretMeta().Name)
 
 	// Start with some empty secret
 	loggingCredentialsSecret := GenerateLoggingCredentialsBasicSecret(lc)
 
 	// Retrieve existing secret
-	err := r.Client.Get(ctx, types.NamespacedName{Name: LoggingCredentialsSecretMeta(lc).Name, Namespace: LoggingCredentialsSecretMeta(lc).Namespace}, loggingCredentialsSecret)
+	err := r.Client.Get(ctx, types.NamespacedName{Name: LoggingCredentialsSecretMeta().Name, Namespace: LoggingCredentialsSecretMeta().Namespace}, loggingCredentialsSecret)
 	if err != nil {
 		if apimachineryerrors.IsNotFound(err) {
 			logger.Info("loggingcredentials secret not found, initializing one")
@@ -97,9 +97,9 @@ func (r *Reconciler) ReconcileDelete(ctx context.Context, lc loggedcluster.Inter
 	secretUpdated := RemoveLoggingCredentials(lc, loggingCredentialsSecret)
 
 	// Check if metadata has been updated
-	if !reflect.DeepEqual(loggingCredentialsSecret.ObjectMeta.Labels, LoggingCredentialsSecretMeta(lc).Labels) {
+	if !reflect.DeepEqual(loggingCredentialsSecret.ObjectMeta.Labels, LoggingCredentialsSecretMeta().Labels) {
 		logger.Info("loggingCredentials - metatada update required")
-		loggingCredentialsSecret.ObjectMeta = LoggingCredentialsSecretMeta(lc)
+		loggingCredentialsSecret.ObjectMeta = LoggingCredentialsSecretMeta()
 		secretUpdated = true
 	}
 

pkg/resource/logging-secret/reconciler.go

@@ -31,7 +31,7 @@ func (r *Reconciler) ReconcileCreate(ctx context.Context, lc loggedcluster.Inter
 
 	// Retrieve secret containing credentials
 	var loggingCredentialsSecret v1.Secret
-	err := r.Client.Get(ctx, types.NamespacedName{Name: loggingcredentials.LoggingCredentialsSecretMeta(lc).Name, Namespace: loggingcredentials.LoggingCredentialsSecretMeta(lc).Namespace},
+	err := r.Client.Get(ctx, types.NamespacedName{Name: loggingcredentials.LoggingCredentialsSecretMeta().Name, Namespace: loggingcredentials.LoggingCredentialsSecretMeta().Namespace},
 		&loggingCredentialsSecret)
 	if err != nil {
 		return ctrl.Result{}, errors.WithStack(err)

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

pkg/resource/proxy-auth/reconciler.go

@@ -30,7 +30,7 @@ func (r *Reconciler) ReconcileCreate(ctx context.Context, lc loggedcluster.Inter
 
 	// Retrieve secret containing credentials
 	var proxyAuthSecret v1.Secret
-	err := r.Client.Get(ctx, types.NamespacedName{Name: loggingcredentials.LoggingCredentialsSecretMeta(lc).Name, Namespace: loggingcredentials.LoggingCredentialsSecretMeta(lc).Namespace},
+	err := r.Client.Get(ctx, types.NamespacedName{Name: loggingcredentials.LoggingCredentialsSecretMeta().Name, Namespace: loggingcredentials.LoggingCredentialsSecretMeta().Namespace},
 		&proxyAuthSecret)
 	if err != nil {
 		return ctrl.Result{}, errors.WithStack(err)