Skip to content

Commit d2b4ff8

Browse files
committed
chore: adjust tests
Signed-off-by: Bence Csati <[email protected]>
1 parent 21e5df7 commit d2b4ff8

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

e2e/testdata/filestorage/one_tenant_one_subscription.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ spec:
4545
condition: "true"
4646
outputs:
4747
- name: otlp-test-output
48-
namespace: collector
48+
namespace: example-tenant-ns
4949
---
5050
apiVersion: telemetry.kube-logging.dev/v1alpha1
5151
kind: Output
5252
metadata:
5353
name: otlp-test-output
54-
namespace: collector
54+
namespace: example-tenant-ns
5555
spec:
5656
otlp:
5757
endpoint: receiver-collector.telemetry-controller-system.svc.cluster.local:4317

e2e/testdata/one_tenant_two_subscriptions/one_tenant_two_subscriptions.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
condition: "true"
4444
outputs:
4545
- name: otlp-test-output
46-
namespace: collector
46+
namespace: example-tenant-ns
4747
---
4848
apiVersion: telemetry.kube-logging.dev/v1alpha1
4949
kind: Subscription
@@ -54,13 +54,13 @@ spec:
5454
condition: "true"
5555
outputs:
5656
- name: otlp-test-output-2
57-
namespace: collector
57+
namespace: example-tenant-ns
5858
---
5959
apiVersion: telemetry.kube-logging.dev/v1alpha1
6060
kind: Output
6161
metadata:
6262
name: otlp-test-output
63-
namespace: collector
63+
namespace: example-tenant-ns
6464
spec:
6565
otlp:
6666
endpoint: receiver-collector.telemetry-controller-system.svc.cluster.local:4317
@@ -71,7 +71,7 @@ apiVersion: telemetry.kube-logging.dev/v1alpha1
7171
kind: Output
7272
metadata:
7373
name: otlp-test-output-2
74-
namespace: collector
74+
namespace: example-tenant-ns
7575
spec:
7676
otlp:
7777
endpoint: receiver-collector.telemetry-controller-system.svc.cluster.local:4317

e2e/testdata/tenants_with_bridges/tenants_with_bridges.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ spec:
8282
condition: "true"
8383
outputs:
8484
- name: otlp-test-output-database
85-
namespace: collector
85+
namespace: database
8686
---
8787
apiVersion: telemetry.kube-logging.dev/v1alpha1
8888
kind: Output
8989
metadata:
9090
name: otlp-test-output-database
91-
namespace: collector
91+
namespace: database
9292
spec:
9393
batch:
9494
send_batch_size: 8192
@@ -128,13 +128,13 @@ spec:
128128
condition: "true"
129129
outputs:
130130
- name: otlp-test-output-web
131-
namespace: collector
131+
namespace: web
132132
---
133133
apiVersion: telemetry.kube-logging.dev/v1alpha1
134134
kind: Output
135135
metadata:
136136
name: otlp-test-output-web
137-
namespace: collector
137+
namespace: web
138138
spec:
139139
batch:
140140
send_batch_size: 8192

internal/controller/telemetry/controller_integration_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ var _ = Describe("Telemetry controller integration test", func() {
8181
Outputs: []v1alpha1.NamespacedName{
8282
{
8383
Name: "otlp-test-output-1",
84-
Namespace: "collector",
84+
Namespace: "tenant-1-ctrl",
8585
},
8686
},
8787
},
@@ -96,7 +96,7 @@ var _ = Describe("Telemetry controller integration test", func() {
9696
Outputs: []v1alpha1.NamespacedName{
9797
{
9898
Name: "otlp-test-output-2",
99-
Namespace: "collector",
99+
Namespace: "tenant-2-all",
100100
},
101101
},
102102
},
@@ -173,7 +173,7 @@ var _ = Describe("Telemetry controller integration test", func() {
173173
{
174174
ObjectMeta: metav1.ObjectMeta{
175175
Name: "otlp-test-output-1",
176-
Namespace: "collector",
176+
Namespace: "tenant-1-ctrl",
177177
},
178178
Spec: v1alpha1.OutputSpec{
179179
OTLPGRPC: &v1alpha1.OTLPGRPC{
@@ -189,7 +189,7 @@ var _ = Describe("Telemetry controller integration test", func() {
189189
{
190190
ObjectMeta: metav1.ObjectMeta{
191191
Name: "otlp-test-output-2",
192-
Namespace: "collector",
192+
Namespace: "tenant-2-all",
193193
},
194194
Spec: v1alpha1.OutputSpec{
195195
OTLPGRPC: &v1alpha1.OTLPGRPC{

0 commit comments

Comments
 (0)