fix(test): fix typos, missing exporters from conf gen test

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
kube-logging · Jan 29, 2024 · 7646384 · 7646384
1 parent bc083af
commit 7646384
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/e2e/e2e_test.sh b/e2e/e2e_test.sh
@@ -10,6 +10,7 @@ create_if_does_not_exist() {
 
 KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME_E2E:-so-e2e}
 NO_KIND_CLEANUP=${NO_KIND_CLEANUP:-}
+CI_MODE=${CI_MODE:-}
   # Backup current kubernetes context
 CURRENT_K8S_CTX=$(kubectl config view | grep "current" | cut -f 2 -d : | xargs)
 

diff --git a/internal/controller/telemetry/otel_col_conf_test_fixtures/complex.yaml b/internal/controller/telemetry/otel_col_conf_test_fixtures/complex.yaml
@@ -58,11 +58,11 @@ receivers:
 exporters:
     logging/debug:
         verbosity: detailed
-    otlp/collector_otelp-test-output:
+    otlp/collector_otlp-test-output:
         endpoint: receiver-collector.example-tenant-ns.svc.cluster.local:4317
         tls:
             insecure: true
-    otlp/collector_otelp-test-output-2:
+    otlp/collector_otlp-test-output-2:
         endpoint: receiver-collector.example-tenant-ns.svc.cluster.local:4317
         tls:
             insecure: true
@@ -123,6 +123,8 @@ service:
         logs/tenant_example-tenant_subscription_subscription-example-1:
             receivers: [routing/tenant_example-tenant_subscriptions]
             processors: [attributes/subscription_subscription-example-1]
+            exporters: [otlp/collector_otlp-test-output]
         logs/tenant_example-tenant_subscription_subscription-example-2:
             receivers: [routing/tenant_example-tenant_subscriptions]
             processors: [attributes/subscription_subscription-example-2]
+            exporters: [otlp/collector_otlp-test-output-2]
diff --git a/internal/controller/telemetry/otel_conf_gen_test.go b/internal/controller/telemetry/otel_conf_gen_test.go
@@ -42,7 +42,7 @@ func TestOtelColConfComplex(t *testing.T) {
 				OTTL: "route()",
 				Outputs: []v1alpha1.NamespacedName{
 					{
-						Name:      "otel-test-output",
+						Name:      "otlp-test-output",
 						Namespace: "collector",
 					},
 				},
@@ -57,7 +57,7 @@ func TestOtelColConfComplex(t *testing.T) {
 				OTTL: "route()",
 				Outputs: []v1alpha1.NamespacedName{
 					{
-						Name:      "otel-test-output-2",
+						Name:      "otlp-test-output-2",
 						Namespace: "collector",
 					},
 				},
@@ -93,7 +93,7 @@ func TestOtelColConfComplex(t *testing.T) {
 		Outputs: []v1alpha1.OtelOutput{
 			{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      "otelp-test-output",
+					Name:      "otlp-test-output",
 					Namespace: "collector",
 				},
 				Spec: v1alpha1.OtelOutputSpec{
@@ -109,7 +109,7 @@ func TestOtelColConfComplex(t *testing.T) {
 			},
 			{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      "otelp-test-output-2",
+					Name:      "otlp-test-output-2",
 					Namespace: "collector",
 				},
 				Spec: v1alpha1.OtelOutputSpec{