Skip to content

Commit 5fe8768

Browse files
shorimrakesh-garimella
shorim
and
rakesh-garimella
authored
test: Add missing log tests (#376)
* refactor LogPipeline creation in e2e test * refactoring changes for istio access logs * missing http output in istio access logs test * unify creation of mock backends * fix e2e-test target * revert increase in timeout * fix linting * fix access log test * apply the refactoring for istio tracing test * fix istio tracing test * fix bug in backend config map * test for log delivery to custom output * add test for validating webhook * remove unnecessary spaces * fix linting * check if renaming mockNs fixes lint * fix lint * check if linting complains for HTTP * fix linting * renaming the context for validating webhook test * reduce duplication for log delivery tests * dedot * works * fix * fix lint * fix linting * fix * fix linting * improve WithKubernetesLabels * improve WithKubernetesAnnotations * update WithKubernetesLabels and WithKubernetesAnnotations * fix nil pointer dereference --------- Co-authored-by: Rakesh Garimella <[email protected]>
1 parent 42bf102 commit 5fe8768

29 files changed

+846
-651
lines changed

‎Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ provision-test-env:
108108

109109
.PHONY: e2e-test
110110
e2e-test: ginkgo k3d | test-matchers provision-test-env ## Provision k3d cluster and run end-to-end tests.
111+
IMG=k3d-kyma-registry:5000/telemetry-manager:latest make deploy-dev
111112
$(GINKGO) run --tags e2e -v --junit-report=junit.xml ./test/e2e
112113
mkdir -p ${ARTIFACTS}
113114
mv junit.xml ${ARTIFACTS}

‎test/e2e/logging_annotation_test.go

+27-22
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ import (
1313

1414
kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
1515
kitlog "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/log"
16+
"github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
17+
"github.com/kyma-project/telemetry-manager/test/testkit/mocks/logproducer"
18+
"github.com/kyma-project/telemetry-manager/test/testkit/mocks/urlprovider"
1619

1720
"github.com/kyma-project/telemetry-manager/test/testkit/k8s/verifiers"
18-
"github.com/kyma-project/telemetry-manager/test/testkit/mocks"
1921

2022
. "github.com/kyma-project/telemetry-manager/test/testkit/matchers"
2123
)
@@ -24,7 +26,7 @@ var _ = Describe("Logging", Label("logging"), func() {
2426

2527
Context("Keep annotations, drop labels", Ordered, func() {
2628
var (
27-
urls *mocks.URLProvider
29+
urls *urlprovider.URLProvider
2830
mockNs = "log-keep-anno-mocks"
2931
mockDeploymentName = "log-receiver-annotation"
3032
)
@@ -47,9 +49,9 @@ var _ = Describe("Logging", Label("logging"), func() {
4749
}, timeout*2, interval).Should(Succeed())
4850
})
4951

50-
It("Should have a log spammer running", func() {
52+
It("Should have a log producer running", func() {
5153
Eventually(func(g Gomega) {
52-
key := types.NamespacedName{Name: mockDeploymentName + "-spammer", Namespace: mockNs}
54+
key := types.NamespacedName{Name: "log-producer", Namespace: mockNs}
5355
ready, err := verifiers.IsDeploymentReady(ctx, k8sClient, key)
5456
g.Expect(err).NotTo(HaveOccurred())
5557
g.Expect(ready).To(BeTrue())
@@ -63,18 +65,18 @@ var _ = Describe("Logging", Label("logging"), func() {
6365
g.Expect(err).NotTo(HaveOccurred())
6466
g.Expect(resp).To(HaveHTTPStatus(http.StatusOK))
6567
g.Expect(resp).To(HaveHTTPBody(SatisfyAll(
66-
ContainLogs(WithKubernetesAnnotations()),
68+
ContainLogs(WithKubernetesAnnotations("release", "v1.0.0")),
6769
Not(ContainLogs(WithKubernetesLabels())),
6870
)))
6971
}, telemetryDeliveryTimeout, interval).Should(Succeed())
7072
})
7173
})
7274
})
7375

74-
func makeLogsAnnotationTestK8sObjects(namespace string, mockDeploymentName string) ([]client.Object, *mocks.URLProvider) {
76+
func makeLogsAnnotationTestK8sObjects(namespace string, mockDeploymentName string) ([]client.Object, *urlprovider.URLProvider) {
7577
var (
7678
objs []client.Object
77-
urls = mocks.NewURLProvider()
79+
urls = urlprovider.New()
7880

7981
grpcOTLPPort = 4317
8082
httpOTLPPort = 4318
@@ -85,35 +87,38 @@ func makeLogsAnnotationTestK8sObjects(namespace string, mockDeploymentName strin
8587
objs = append(objs, mocksNamespace.K8sObject())
8688

8789
//// Mocks namespace objects.
88-
mockHTTPBackend := mocks.NewHTTPBackend(mockDeploymentName, mocksNamespace.Name(), "/logs/"+telemetryDataFilename)
90+
mockBackend := backend.New(mockDeploymentName, mocksNamespace.Name(), "/logs/"+telemetryDataFilename, backend.SignalTypeLogs)
8991

90-
mockBackendConfigMap := mockHTTPBackend.HTTPBackendConfigMap("log-receiver-config")
91-
mockFluentDConfigMap := mockHTTPBackend.FluentDConfigMap("log-receiver-config-fluentd")
92-
mockBackendDeployment := mockHTTPBackend.HTTPDeployment(mockBackendConfigMap.Name(), mockFluentDConfigMap.FluentDName())
93-
mockBackendExternalService := mockHTTPBackend.ExternalService().
92+
mockBackendConfigMap := mockBackend.ConfigMap("log-receiver-config")
93+
mockFluentdConfigMap := mockBackend.FluentdConfigMap("log-receiver-config-fluentd")
94+
mockBackendDeployment := mockBackend.Deployment(mockBackendConfigMap.Name()).WithFluentdConfigName(mockFluentdConfigMap.Name())
95+
mockBackendExternalService := mockBackend.ExternalService().
9496
WithPort("grpc-otlp", grpcOTLPPort).
9597
WithPort("http-otlp", httpOTLPPort).
9698
WithPort("http-web", httpWebPort).
9799
WithPort("http-log", httpLogPort)
98-
mockLogSpammer := mockHTTPBackend.LogSpammer()
100+
mockLogProducer := logproducer.New("log-producer", mocksNamespace.Name()).
101+
WithAnnotations(map[string]string{
102+
"release": "v1.0.0",
103+
})
99104
// Default namespace objects.
100105
logEndpointURL := mockBackendExternalService.Host()
101106
hostSecret := kitk8s.NewOpaqueSecret("log-rcv-hostname", defaultNamespaceName, kitk8s.WithStringData("log-host", logEndpointURL))
102-
logHTTPPipeline := kitlog.NewHTTPPipeline("pipeline-annotation-test", hostSecret.SecretKeyRef("log-host"))
103-
logHTTPPipeline.KeepAnnotations(true)
104-
logHTTPPipeline.DropLabels(true)
107+
logPipeline := kitlog.NewPipeline("pipeline-annotation-test").WithSecretKeyRef(hostSecret.SecretKeyRef("log-host")).WithHTTPOutput()
108+
logPipeline.KeepAnnotations(true)
109+
logPipeline.DropLabels(true)
105110

106111
objs = append(objs, []client.Object{
107112
mockBackendConfigMap.K8sObject(),
108-
mockFluentDConfigMap.K8sObjectFluentDConfig(),
109-
mockBackendDeployment.K8sObjectHTTP(kitk8s.WithLabel("app", mockHTTPBackend.Name())),
110-
mockBackendExternalService.K8sObject(kitk8s.WithLabel("app", mockHTTPBackend.Name())),
113+
mockFluentdConfigMap.K8sObject(),
114+
mockBackendDeployment.K8sObject(kitk8s.WithLabel("app", mockBackend.Name())),
115+
mockBackendExternalService.K8sObject(kitk8s.WithLabel("app", mockBackend.Name())),
111116
hostSecret.K8sObject(),
112-
logHTTPPipeline.K8sObjectHTTP(),
113-
mockLogSpammer.K8sObject(kitk8s.WithLabel("app", "logging-annotation-test")),
117+
logPipeline.K8sObject(),
118+
mockLogProducer.K8sObject(kitk8s.WithLabel("app", "logging-annotation-test")),
114119
}...)
115120

116-
urls.SetMockBackendExportAt(proxyClient.ProxyURLForService(mocksNamespace.Name(), mockHTTPBackend.Name(), telemetryDataFilename, httpWebPort), 0)
121+
urls.SetMockBackendExportAt(proxyClient.ProxyURLForService(mocksNamespace.Name(), mockBackend.Name(), telemetryDataFilename, httpWebPort), 0)
117122

118123
return objs, urls
119124
}

‎test/e2e/logging_dedot_test.go

+111
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
//go:build e2e
2+
3+
package e2e
4+
5+
import (
6+
"net/http"
7+
8+
. "github.com/onsi/ginkgo/v2"
9+
. "github.com/onsi/gomega"
10+
"k8s.io/apimachinery/pkg/types"
11+
"sigs.k8s.io/controller-runtime/pkg/client"
12+
13+
kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
14+
"github.com/kyma-project/telemetry-manager/test/testkit/k8s/verifiers"
15+
kitlog "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/log"
16+
. "github.com/kyma-project/telemetry-manager/test/testkit/matchers"
17+
"github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
18+
"github.com/kyma-project/telemetry-manager/test/testkit/mocks/logproducer"
19+
"github.com/kyma-project/telemetry-manager/test/testkit/mocks/urlprovider"
20+
)
21+
22+
var _ = Describe("Logging", Label("logging"), func() {
23+
Context("dedot labels", Ordered, func() {
24+
var (
25+
urls *urlprovider.URLProvider
26+
mockNs = "log-dedot-labels-mocks"
27+
mockDeploymentName = "log-receiver-dedot-labels"
28+
)
29+
30+
BeforeAll(func() {
31+
k8sObjects, logsURLProvider := makeLogsDeDotTestK8sObjects(mockNs, mockDeploymentName)
32+
urls = logsURLProvider
33+
DeferCleanup(func() {
34+
Expect(kitk8s.DeleteObjects(ctx, k8sClient, k8sObjects...)).Should(Succeed())
35+
})
36+
Expect(kitk8s.CreateObjects(ctx, k8sClient, k8sObjects...)).Should(Succeed())
37+
})
38+
It("Should have a log backend running", func() {
39+
Eventually(func(g Gomega) {
40+
key := types.NamespacedName{Name: mockDeploymentName, Namespace: mockNs}
41+
ready, err := verifiers.IsDeploymentReady(ctx, k8sClient, key)
42+
g.Expect(err).NotTo(HaveOccurred())
43+
g.Expect(ready).To(BeTrue())
44+
}, timeout*2, interval).Should(Succeed())
45+
})
46+
It("Should have a log producer running", func() {
47+
Eventually(func(g Gomega) {
48+
key := types.NamespacedName{Name: "log-producer", Namespace: mockNs}
49+
ready, err := verifiers.IsDeploymentReady(ctx, k8sClient, key)
50+
g.Expect(err).NotTo(HaveOccurred())
51+
g.Expect(ready).To(BeTrue())
52+
}, timeout*2, interval).Should(Succeed())
53+
})
54+
// label foo.bar: value should be represented as foo_bar:value
55+
It("Should dedot the labels", func() {
56+
Eventually(func(g Gomega) {
57+
resp, err := proxyClient.Get(urls.MockBackendExport())
58+
g.Expect(err).NotTo(HaveOccurred())
59+
g.Expect(resp).To(HaveHTTPStatus(http.StatusOK))
60+
g.Expect(resp).To(HaveHTTPBody(SatisfyAll(
61+
ContainLogs(WithKubernetesLabels("dedot_label", "logging-dedot-value"))),
62+
))
63+
}, timeout, interval).Should(Succeed())
64+
})
65+
})
66+
})
67+
68+
func makeLogsDeDotTestK8sObjects(namespace string, mockDeploymentName string) ([]client.Object, *urlprovider.URLProvider) {
69+
var (
70+
objs []client.Object
71+
urls = urlprovider.New()
72+
73+
grpcOTLPPort = 4317
74+
httpOTLPPort = 4318
75+
httpWebPort = 80
76+
httpLogPort = 9880
77+
)
78+
mocksNamespace := kitk8s.NewNamespace(namespace)
79+
objs = append(objs, mocksNamespace.K8sObject())
80+
81+
//// Mocks namespace objects.
82+
mockBackend := backend.New(mockDeploymentName, mocksNamespace.Name(), "/logs/"+telemetryDataFilename, backend.SignalTypeLogs)
83+
84+
mockBackendConfigMap := mockBackend.ConfigMap("log-receiver-config")
85+
mockFluentdConfigMap := mockBackend.FluentdConfigMap("log-receiver-config-fluentd")
86+
mockBackendDeployment := mockBackend.Deployment(mockBackendConfigMap.Name()).WithFluentdConfigName(mockFluentdConfigMap.Name())
87+
mockBackendExternalService := mockBackend.ExternalService().
88+
WithPort("grpc-otlp", grpcOTLPPort).
89+
WithPort("http-otlp", httpOTLPPort).
90+
WithPort("http-web", httpWebPort).
91+
WithPort("http-log", httpLogPort)
92+
mockLogProducer := logproducer.New("log-producer", mocksNamespace.Name())
93+
// Default namespace objects.
94+
logEndpointURL := mockBackendExternalService.Host()
95+
hostSecret := kitk8s.NewOpaqueSecret("log-rcv-hostname", defaultNamespaceName, kitk8s.WithStringData("log-host", logEndpointURL))
96+
logPipeline := kitlog.NewPipeline("pipeline-dedot-test").WithSecretKeyRef(hostSecret.SecretKeyRef("log-host")).WithHTTPOutput().WithIncludeContainer([]string{"log-producer"})
97+
98+
objs = append(objs, []client.Object{
99+
mockBackendConfigMap.K8sObject(),
100+
mockFluentdConfigMap.K8sObject(),
101+
mockBackendDeployment.K8sObject(kitk8s.WithLabel("app", mockBackend.Name())),
102+
mockBackendExternalService.K8sObject(kitk8s.WithLabel("app", mockBackend.Name())),
103+
hostSecret.K8sObject(),
104+
logPipeline.K8sObject(),
105+
mockLogProducer.K8sObject(kitk8s.WithLabel("dedot.label", "logging-dedot-value")),
106+
}...)
107+
108+
urls.SetMockBackendExportAt(proxyClient.ProxyURLForService(mocksNamespace.Name(), mockBackend.Name(), telemetryDataFilename, httpWebPort), 0)
109+
110+
return objs, urls
111+
}

‎test/e2e/logging_exclude_container_test.go

+24-22
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ import (
1212

1313
kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
1414
kitlog "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/log"
15+
"github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
16+
"github.com/kyma-project/telemetry-manager/test/testkit/mocks/logproducer"
1517

1618
"github.com/kyma-project/telemetry-manager/test/testkit/k8s/verifiers"
17-
"github.com/kyma-project/telemetry-manager/test/testkit/mocks"
19+
"github.com/kyma-project/telemetry-manager/test/testkit/mocks/urlprovider"
1820

1921
. "github.com/kyma-project/telemetry-manager/test/testkit/matchers"
2022
)
@@ -23,7 +25,7 @@ var _ = Describe("Logging", Label("logging"), func() {
2325

2426
Context("Container Excludes", Ordered, func() {
2527
var (
26-
urls *mocks.URLProvider
28+
urls *urlprovider.URLProvider
2729
mockNs = "log-exclude-cntnr-mocks"
2830
mockDeploymentName = "log-receiver-exclude-container"
2931
)
@@ -46,9 +48,9 @@ var _ = Describe("Logging", Label("logging"), func() {
4648
}, timeout*2, interval).Should(Succeed())
4749
})
4850

49-
It("Should have a log spammer running", func() {
51+
It("Should have a log producer running", func() {
5052
Eventually(func(g Gomega) {
51-
key := types.NamespacedName{Name: mockDeploymentName + "-spammer", Namespace: mockNs}
53+
key := types.NamespacedName{Name: "log-producer", Namespace: mockNs}
5254
ready, err := verifiers.IsDeploymentReady(ctx, k8sClient, key)
5355
g.Expect(err).NotTo(HaveOccurred())
5456
g.Expect(ready).To(BeTrue())
@@ -65,23 +67,23 @@ var _ = Describe("Logging", Label("logging"), func() {
6567
}, timeout, interval).Should(Succeed())
6668
})
6769

68-
It("Should not collect any log-spammer logs", func() {
70+
It("Should not collect any log-producer logs", func() {
6971
Consistently(func(g Gomega) {
7072
resp, err := proxyClient.Get(urls.MockBackendExport())
7173
g.Expect(err).NotTo(HaveOccurred())
7274
g.Expect(resp).To(HaveHTTPStatus(http.StatusOK))
7375
g.Expect(resp).To(HaveHTTPBody(SatisfyAll(
74-
Not(ContainLogs(WithContainer("log-spammer"))))))
76+
Not(ContainLogs(WithContainer("log-producer"))))))
7577
}, telemetryDeliveryTimeout, interval).Should(Succeed())
7678
})
7779

7880
})
7981
})
8082

81-
func makeLogsTestExcludeContainerK8sObjects(namespace string, mockDeploymentName string) ([]client.Object, *mocks.URLProvider) {
83+
func makeLogsTestExcludeContainerK8sObjects(namespace string, mockDeploymentName string) ([]client.Object, *urlprovider.URLProvider) {
8284
var (
8385
objs []client.Object
84-
urls = mocks.NewURLProvider()
86+
urls = urlprovider.New()
8587

8688
grpcOTLPPort = 4317
8789
httpOTLPPort = 4318
@@ -92,34 +94,34 @@ func makeLogsTestExcludeContainerK8sObjects(namespace string, mockDeploymentName
9294
objs = append(objs, mocksNamespace.K8sObject())
9395

9496
//// Mocks namespace objects.
95-
mockHTTPBackend := mocks.NewHTTPBackend(mockDeploymentName, mocksNamespace.Name(), "/logs/"+telemetryDataFilename)
97+
mockBackend := backend.New(mockDeploymentName, mocksNamespace.Name(), "/logs/"+telemetryDataFilename, backend.SignalTypeLogs)
9698

97-
mockBackendConfigMap := mockHTTPBackend.HTTPBackendConfigMap("log-receiver-config")
98-
mockFluentDConfigMap := mockHTTPBackend.FluentDConfigMap("log-receiver-config-fluentd")
99-
mockBackendDeployment := mockHTTPBackend.HTTPDeployment(mockBackendConfigMap.Name(), mockFluentDConfigMap.FluentDName())
100-
mockBackendExternalService := mockHTTPBackend.ExternalService().
99+
mockBackendConfigMap := mockBackend.ConfigMap("log-receiver-config")
100+
mockFluentdConfigMap := mockBackend.FluentdConfigMap("log-receiver-config-fluentd")
101+
mockBackendDeployment := mockBackend.Deployment(mockBackendConfigMap.Name()).WithFluentdConfigName(mockFluentdConfigMap.Name())
102+
mockBackendExternalService := mockBackend.ExternalService().
101103
WithPort("grpc-otlp", grpcOTLPPort).
102104
WithPort("http-otlp", httpOTLPPort).
103105
WithPort("http-web", httpWebPort).
104106
WithPort("http-log", httpLogPort)
105-
mockLogSpammer := mockHTTPBackend.LogSpammer()
107+
mockLogProducer := logproducer.New("log-producer", mocksNamespace.Name())
106108
// Default namespace objects.
107109
logEndpointURL := mockBackendExternalService.Host()
108110
hostSecret := kitk8s.NewOpaqueSecret("log-rcv-hostname", defaultNamespaceName, kitk8s.WithStringData("log-host", logEndpointURL))
109-
logHTTPPipeline := kitlog.NewHTTPPipeline("pipeline-exclude-container", hostSecret.SecretKeyRef("log-host"))
110-
logHTTPPipeline.WithExcludeContainer([]string{"log-spammer"})
111+
logPipeline := kitlog.NewPipeline("pipeline-exclude-container").WithSecretKeyRef(hostSecret.SecretKeyRef("log-host")).WithHTTPOutput()
112+
logPipeline.WithExcludeContainer([]string{"log-producer"})
111113

112114
objs = append(objs, []client.Object{
113115
mockBackendConfigMap.K8sObject(),
114-
mockFluentDConfigMap.K8sObjectFluentDConfig(),
115-
mockBackendDeployment.K8sObjectHTTP(kitk8s.WithLabel("app", mockHTTPBackend.Name())),
116-
mockBackendExternalService.K8sObject(kitk8s.WithLabel("app", mockHTTPBackend.Name())),
116+
mockFluentdConfigMap.K8sObject(),
117+
mockBackendDeployment.K8sObject(kitk8s.WithLabel("app", mockBackend.Name())),
118+
mockBackendExternalService.K8sObject(kitk8s.WithLabel("app", mockBackend.Name())),
117119
hostSecret.K8sObject(),
118-
logHTTPPipeline.K8sObjectHTTP(),
119-
mockLogSpammer.K8sObject(kitk8s.WithLabel("app", "logging-test")),
120+
logPipeline.K8sObject(),
121+
mockLogProducer.K8sObject(kitk8s.WithLabel("app", "logging-test")),
120122
}...)
121123

122-
urls.SetMockBackendExportAt(proxyClient.ProxyURLForService(mocksNamespace.Name(), mockHTTPBackend.Name(), telemetryDataFilename, httpWebPort), 0)
124+
urls.SetMockBackendExportAt(proxyClient.ProxyURLForService(mocksNamespace.Name(), mockBackend.Name(), telemetryDataFilename, httpWebPort), 0)
123125

124126
return objs, urls
125127
}

‎test/e2e/logging_fluentbit_metrics_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s"
1717
kitlog "github.com/kyma-project/telemetry-manager/test/testkit/kyma/telemetry/log"
1818

19-
"github.com/kyma-project/telemetry-manager/test/testkit/mocks"
19+
"github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend"
2020

2121
. "github.com/kyma-project/telemetry-manager/test/testkit/matchers"
2222
)
@@ -98,24 +98,24 @@ func makeLogsTestK8sObjects(namespace string, mockDeploymentName string) []clien
9898
objs = append(objs, mocksNamespace.K8sObject())
9999

100100
//// Mocks namespace objects.
101-
mockHTTPBackend := mocks.NewHTTPBackend(mockDeploymentName, mocksNamespace.Name(), "/logs/"+telemetryDataFilename)
101+
mockBackend := backend.New(mockDeploymentName, mocksNamespace.Name(), "/logs/"+telemetryDataFilename, backend.SignalTypeLogs)
102102

103-
mockBackendConfigMap := mockHTTPBackend.HTTPBackendConfigMap("log-receiver-config")
104-
mockFluentDConfigMap := mockHTTPBackend.FluentDConfigMap("log-receiver-config-fluentd")
105-
mockBackendDeployment := mockHTTPBackend.HTTPDeployment(mockBackendConfigMap.Name(), mockFluentDConfigMap.FluentDName())
106-
mockBackendExternalService := mockHTTPBackend.ExternalService().
103+
mockBackendConfigMap := mockBackend.ConfigMap("log-receiver-config")
104+
mockFluentdConfigMap := mockBackend.FluentdConfigMap("log-receiver-config-fluentd")
105+
mockBackendDeployment := mockBackend.Deployment(mockBackendConfigMap.Name()).WithFluentdConfigName(mockFluentdConfigMap.Name())
106+
mockBackendExternalService := mockBackend.ExternalService().
107107
WithPort("grpc-otlp", grpcOTLPPort).
108108
WithPort("http-otlp", httpOTLPPort).
109109
WithPort("http-web", httpWebPort)
110110

111111
// Default namespace objects.
112-
logPipeline := kitlog.NewPipeline("pipeline-mock-backend")
112+
logPipeline := kitlog.NewPipeline("pipeline-mock-backend").WithStdout()
113113

114114
objs = append(objs, []client.Object{
115115
mockBackendConfigMap.K8sObject(),
116-
mockFluentDConfigMap.K8sObjectFluentDConfig(),
117-
mockBackendDeployment.K8sObjectHTTP(kitk8s.WithLabel("app", mockHTTPBackend.Name())),
118-
mockBackendExternalService.K8sObject(kitk8s.WithLabel("app", mockHTTPBackend.Name())),
116+
mockFluentdConfigMap.K8sObject(),
117+
mockBackendDeployment.K8sObject(kitk8s.WithLabel("app", mockBackend.Name())),
118+
mockBackendExternalService.K8sObject(kitk8s.WithLabel("app", mockBackend.Name())),
119119
logPipeline.K8sObject(),
120120
}...)
121121

0 commit comments

Comments
 (0)