fix

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

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/pkg/resource/logging-config/alloy-logging-config.go b/pkg/resource/logging-config/alloy-logging-config.go
@@ -92,7 +92,7 @@ func generateAlloyConfig(lc loggedcluster.Interface, observabilityBundleVersion
 		SecretName:         common.AlloyLogAgentAppName,
 		LoggingURLKey:      common.LoggingURL,
 		LoggingTenantIDKey: common.LoggingTenantID,
-		LoggingUsernameKey: clusterName,
+		LoggingUsernameKey: common.LoggingUsername,
 		LoggingPasswordKey: common.LoggingPassword,
 	}
 

diff --git a/pkg/resource/logging-config/alloy/test/logging-config.alloy.162_MC.yaml b/pkg/resource/logging-config/alloy/test/logging-config.alloy.162_MC.yaml
@@ -290,7 +290,7 @@ alloy:
         		tenant_id          = nonsensitive(remote.kubernetes.secret.credentials.data["logging-tenant-id"])
         
         		basic_auth {
-        			username = nonsensitive(remote.kubernetes.secret.credentials.data["test-installation"])
+        			username = nonsensitive(remote.kubernetes.secret.credentials.data["logging-username"])
         			password = remote.kubernetes.secret.credentials.data["logging-password"]
         		}
         

diff --git a/pkg/resource/logging-config/alloy/test/logging-config.alloy.162_WC.yaml b/pkg/resource/logging-config/alloy/test/logging-config.alloy.162_WC.yaml
@@ -295,7 +295,7 @@ alloy:
         		tenant_id          = nonsensitive(remote.kubernetes.secret.credentials.data["logging-tenant-id"])
         
         		basic_auth {
-        			username = nonsensitive(remote.kubernetes.secret.credentials.data["test-cluster"])
+        			username = nonsensitive(remote.kubernetes.secret.credentials.data["logging-username"])
         			password = remote.kubernetes.secret.credentials.data["logging-password"]
         		}
         

diff --git a/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_MC.yaml b/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_MC.yaml
@@ -270,7 +270,7 @@ alloy:
         		tenant_id          = nonsensitive(remote.kubernetes.secret.credentials.data["logging-tenant-id"])
         
         		basic_auth {
-        			username = nonsensitive(remote.kubernetes.secret.credentials.data["test-installation"])
+        			username = nonsensitive(remote.kubernetes.secret.credentials.data["logging-username"])
         			password = remote.kubernetes.secret.credentials.data["logging-password"]
         		}
         

diff --git a/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_WC.yaml b/pkg/resource/logging-config/alloy/test/logging-config.alloy.170_WC.yaml
@@ -270,7 +270,7 @@ alloy:
         		tenant_id          = nonsensitive(remote.kubernetes.secret.credentials.data["logging-tenant-id"])
         
         		basic_auth {
-        			username = nonsensitive(remote.kubernetes.secret.credentials.data["test-cluster"])
+        			username = nonsensitive(remote.kubernetes.secret.credentials.data["logging-username"])
         			password = remote.kubernetes.secret.credentials.data["logging-password"]
         		}
         

diff --git a/...ource/logging-config/alloy/test/logging-config.alloy.170_WC_default_namespaces_empty.yaml b/...ource/logging-config/alloy/test/logging-config.alloy.170_WC_default_namespaces_empty.yaml
@@ -270,7 +270,7 @@ alloy:
         		tenant_id          = nonsensitive(remote.kubernetes.secret.credentials.data["logging-tenant-id"])
         
         		basic_auth {
-        			username = nonsensitive(remote.kubernetes.secret.credentials.data["test-cluster"])
+        			username = nonsensitive(remote.kubernetes.secret.credentials.data["logging-username"])
         			password = remote.kubernetes.secret.credentials.data["logging-password"]
         		}
         

diff --git a/...esource/logging-config/alloy/test/logging-config.alloy.170_WC_default_namespaces_nil.yaml b/...esource/logging-config/alloy/test/logging-config.alloy.170_WC_default_namespaces_nil.yaml
@@ -270,7 +270,7 @@ alloy:
         		tenant_id          = nonsensitive(remote.kubernetes.secret.credentials.data["logging-tenant-id"])
         
         		basic_auth {
-        			username = nonsensitive(remote.kubernetes.secret.credentials.data["test-cluster"])
+        			username = nonsensitive(remote.kubernetes.secret.credentials.data["logging-username"])
         			password = remote.kubernetes.secret.credentials.data["logging-password"]
         		}