fix tests

giantswarm · Dec 17, 2024 · 408b6f4 · 408b6f4
1 parent b31f7ca
commit 408b6f4
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 32 deletions.
diff --git a/pkg/common/common.go b/pkg/common/common.go
@@ -107,11 +107,3 @@ func FormatScrapedNamespaces(lc loggedcluster.Interface, namespaces []string) st
 
 	return "[]"
 }
-
-func FormatScrapedNamespaces(lc loggedcluster.Interface, namespaces []string) string {
-	if IsWorkloadCluster(lc) {
-		return fmt.Sprintf("[\"%s\"]", strings.Join(namespaces, "\", \""))
-	}
-
-	return "[]"
-}
diff --git a/pkg/resource/events-logger-config/reconciler.go b/pkg/resource/events-logger-config/reconciler.go
@@ -3,6 +3,7 @@ package eventsloggerconfig
 import (
 	"context"
 	"reflect"
+
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
 	apimachineryerrors "k8s.io/apimachinery/pkg/api/errors"

diff --git a/pkg/resource/events-logger-secret/reconciler.go b/pkg/resource/events-logger-secret/reconciler.go
@@ -3,6 +3,7 @@ package eventsloggersecret
 import (
 	"context"
 	"reflect"
+
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
 	apimachineryerrors "k8s.io/apimachinery/pkg/api/errors"

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
@@ -297,10 +297,6 @@ alloy:
         		tls_config {
         			insecure_skip_verify = false
         		}
-        
-        		tls_config {
-        			insecure_skip_verify = false
-        		}
         	}
         	external_labels = {
         		cluster_id   = "test-installation",

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
@@ -302,10 +302,6 @@ alloy:
         		tls_config {
         			insecure_skip_verify = false
         		}
-        
-        		tls_config {
-        			insecure_skip_verify = false
-        		}
         	}
         	external_labels = {
         		cluster_id   = "test-cluster",

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
@@ -291,10 +291,6 @@ alloy:
         		tls_config {
         			insecure_skip_verify = false
         		}
-        
-        		tls_config {
-        			insecure_skip_verify = false
-        		}
         	}
         	external_labels = {
         		cluster_id   = "test-installation",

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
@@ -291,10 +291,6 @@ alloy:
         		tls_config {
         			insecure_skip_verify = false
         		}
-        
-        		tls_config {
-        			insecure_skip_verify = false
-        		}
         	}
         	external_labels = {
         		cluster_id   = "test-cluster",

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
@@ -291,10 +291,6 @@ alloy:
         		tls_config {
         			insecure_skip_verify = false
         		}
-        
-        		tls_config {
-        			insecure_skip_verify = false
-        		}
         	}
         	external_labels = {
         		cluster_id   = "test-cluster",

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
@@ -291,10 +291,6 @@ alloy:
         		tls_config {
         			insecure_skip_verify = false
         		}
-        
-        		tls_config {
-        			insecure_skip_verify = false
-        		}
         	}
         	external_labels = {
         		cluster_id   = "test-cluster",