diff --git a/.golangci.yaml b/.golangci.yaml index 5608ea2c76..406058cdbc 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -178,6 +178,8 @@ linters: alias: fbports - pkg: github.com/kyma-project/telemetry-manager/webhook/utils alias: webhookutils + - pkg: github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects + alias: kitk8sobjects no-unaliased: true no-extra-aliases: true loggercheck: diff --git a/docs/contributor/pocs/ginkgo-to-go-testing/_service_name_enrichment_test.go b/docs/contributor/pocs/ginkgo-to-go-testing/_service_name_enrichment_test.go index 47c6f91479..501813d247 100644 --- a/docs/contributor/pocs/ginkgo-to-go-testing/_service_name_enrichment_test.go +++ b/docs/contributor/pocs/ginkgo-to-go-testing/_service_name_enrichment_test.go @@ -1,7 +1,6 @@ package migrated import ( - "context" "fmt" "io" "net/http" @@ -11,19 +10,19 @@ import ( "testing" . "github.com/onsi/gomega" - "github.com/stretchr/testify/require" - "k8s.io/apimachinery/pkg/types" "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" + "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdloggen" + telemetryv1alpha1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1alpha1" testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" - "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdloggen" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" "github.com/kyma-project/telemetry-manager/test/testkit/periodic" "github.com/kyma-project/telemetry-manager/test/testkit/suite" @@ -59,7 +58,7 @@ func TestOTelLogPipeline_ServiceNameEnrichment(t *testing.T) { }, logProducerFunc: func(deploymentName, namespace string) client.Object { podSpecWithUndefinedService := telemetrygen.PodSpec(telemetrygen.SignalTypeLogs, telemetrygen.WithServiceName("")) - return kitk8s.NewDeployment(deploymentName, namespace). + return kitk8sobjects.NewDeployment(deploymentName, namespace). WithLabel(appLabelName, appLabelValue). WithPodSpec(podSpecWithUndefinedService). K8sObject() @@ -110,23 +109,17 @@ func TestOTelLogPipeline_ServiceNameEnrichment(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(mockNs).K8sObject(), + kitk8sobjects.NewNamespace(mockNs).K8sObject(), &pipeline, tc.logProducerFunc(genName, mockNs), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - // Cannot use t.Context() here because it is already canceled at this point - err := kitk8s.DeleteObjects(context.Background(), suite.K8sClient, resources...) - require.NoError(t, err) - }) Expect(kitk8s.CreateObjects(t.Context(), resources...)).Should(Succeed()) t.Log("Waiting for resources to be ready") assert.DeploymentReady(t.Context(), suite.K8sClient, kitkyma.LogGatewayName) - assert.DeploymentReady(t.Context(), suite.K8sClient, types.NamespacedName{Name: backend.Name(), Namespace: mockNs}) assert.LogPipelineOtelHealthy(t.Context(), suite.K8sClient, pipelineName) assert.OtelLogsFromNamespaceDelivered(suite.ProxyClient, backend.ExportURL(suite.ProxyClient), mockNs) diff --git a/test/e2e/logs/agent/instrumentation_scope_test.go b/test/e2e/logs/agent/instrumentation_scope_test.go index 42344c974a..a811a00dee 100644 --- a/test/e2e/logs/agent/instrumentation_scope_test.go +++ b/test/e2e/logs/agent/instrumentation_scope_test.go @@ -10,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -37,16 +38,13 @@ func TestInstrumentationScope(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), stdoutloggen.NewDeployment(genNs).K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/logs/agent/severity_parser_test.go b/test/e2e/logs/agent/severity_parser_test.go index 1ea12fc7bc..323510ba7c 100644 --- a/test/e2e/logs/agent/severity_parser_test.go +++ b/test/e2e/logs/agent/severity_parser_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -51,8 +52,8 @@ func TestSeverityParser(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), stdoutloggen.NewDeployment(genNs, stdoutloggen.WithFields(levelINFOScenario)).WithName(levelINFOScenario["scenario"]).K8sObject(), stdoutloggen.NewDeployment(genNs, stdoutloggen.WithFields(levelWarningScenario)).WithName(levelWarningScenario["scenario"]).K8sObject(), stdoutloggen.NewDeployment(genNs, stdoutloggen.WithFields(logLevelScenario)).WithName(logLevelScenario["scenario"]).K8sObject(), @@ -61,9 +62,6 @@ func TestSeverityParser(t *testing.T) { } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/logs/agent/trace_parser_test.go b/test/e2e/logs/agent/trace_parser_test.go index aef424cfc7..575f4b71df 100644 --- a/test/e2e/logs/agent/trace_parser_test.go +++ b/test/e2e/logs/agent/trace_parser_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -59,8 +60,8 @@ func TestTraceParser(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), stdoutloggen.NewDeployment(genNs, stdoutloggen.WithFields(traceIdFullOnlyScenario)).WithName(traceIdFullOnlyScenario["scenario"]).K8sObject(), stdoutloggen.NewDeployment(genNs, stdoutloggen.WithFields(traceparentOnlyScenario)).WithName(traceparentOnlyScenario["scenario"]).K8sObject(), stdoutloggen.NewDeployment(genNs, stdoutloggen.WithFields(traceIdPartialOnlyScenario)).WithName(traceIdPartialOnlyScenario["scenario"]).K8sObject(), @@ -70,9 +71,6 @@ func TestTraceParser(t *testing.T) { } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/logs/fluentbit/app_name_test.go b/test/e2e/logs/fluentbit/app_name_test.go index f4822a4462..3652284ccf 100644 --- a/test/e2e/logs/fluentbit/app_name_test.go +++ b/test/e2e/logs/fluentbit/app_name_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -44,11 +45,11 @@ func TestAppName(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(nsNone).K8sObject(), - kitk8s.NewNamespace(nsAppOnly).K8sObject(), - kitk8s.NewNamespace(nsNameOnly).K8sObject(), - kitk8s.NewNamespace(nsMixed).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(nsNone).K8sObject(), + kitk8sobjects.NewNamespace(nsAppOnly).K8sObject(), + kitk8sobjects.NewNamespace(nsNameOnly).K8sObject(), + kitk8sobjects.NewNamespace(nsMixed).K8sObject(), logProducerNone.K8sObject(), logProducerAppOnly.K8sObject(), logProducerNameOnly.K8sObject(), @@ -57,9 +58,6 @@ func TestAppName(t *testing.T) { } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/logs/fluentbit/base_payload_with_http_test.go b/test/e2e/logs/fluentbit/base_payload_with_http_test.go index d582a444e5..f5d8c05964 100644 --- a/test/e2e/logs/fluentbit/base_payload_with_http_test.go +++ b/test/e2e/logs/fluentbit/base_payload_with_http_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -37,16 +38,13 @@ func TestBasePayloadWithHTTPOutput(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), logProducer.K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/logs/fluentbit/custom_cluster_name_test.go b/test/e2e/logs/fluentbit/custom_cluster_name_test.go index bbdc751389..f4e2e6f372 100644 --- a/test/e2e/logs/fluentbit/custom_cluster_name_test.go +++ b/test/e2e/logs/fluentbit/custom_cluster_name_test.go @@ -1,7 +1,6 @@ package fluentbit import ( - "context" "testing" . "github.com/onsi/gomega" @@ -11,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -43,6 +43,8 @@ func TestCustomClusterName(t *testing.T) { WithHTTPOutput(testutils.HTTPHost(backend.Host()), testutils.HTTPPort(backend.Port())). Build() + kitk8s.PreserveAndScheduleRestoreOfTelemetryResource(t, kitkyma.TelemetryName) + Eventually(func(g Gomega) { g.Expect(suite.K8sClient.Get(t.Context(), kitkyma.TelemetryName, &telemetry)).NotTo(HaveOccurred()) telemetry.Spec.Enrichments = &operatorv1alpha1.EnrichmentSpec{ @@ -54,28 +56,18 @@ func TestCustomClusterName(t *testing.T) { }, periodic.EventuallyTimeout, periodic.TelemetryInterval).Should(Succeed()) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, logProducer.K8sObject(), telemetrygen.NewPod(genNs, telemetrygen.SignalTypeMetrics).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - - Eventually(func(g Gomega) { - g.Expect(suite.K8sClient.Get(context.Background(), kitkyma.TelemetryName, &telemetry)).Should(Succeed()) //nolint:usetesting // Remove ctx from Get - telemetry.Spec.Enrichments.Cluster = &operatorv1alpha1.Cluster{} - g.Expect(suite.K8sClient.Update(context.Background(), &telemetry)).To(Succeed()) //nolint:usetesting // Remove ctx from Update - }, periodic.EventuallyTimeout, periodic.TelemetryInterval).Should(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).Should(Succeed()) assert.BackendReachable(t, backend) assert.DaemonSetReady(t, kitkyma.FluentBitDaemonSetName) - assert.DeploymentReady(t, logProducer.NamespacedName()) assert.FluentBitLogPipelineHealthy(t, pipelineName) assert.BackendDataEventuallyMatches(t, backend, diff --git a/test/e2e/logs/fluentbit/custom_filter_test.go b/test/e2e/logs/fluentbit/custom_filter_test.go index 717d887763..13cb3c670a 100644 --- a/test/e2e/logs/fluentbit/custom_filter_test.go +++ b/test/e2e/logs/fluentbit/custom_filter_test.go @@ -12,6 +12,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen" @@ -37,15 +38,11 @@ func TestCustomFilterDenied(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) - Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) @@ -74,15 +71,11 @@ func TestCustomOutputDenied(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) - Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) @@ -120,18 +113,15 @@ func TestCustomFilterAllowed(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(includeNs).K8sObject(), - kitk8s.NewNamespace(excludeNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(includeNs).K8sObject(), + kitk8sobjects.NewNamespace(excludeNs).K8sObject(), logProducerInclude.K8sObject(), logProducerExclude.K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/logs/fluentbit/custom_output_test.go b/test/e2e/logs/fluentbit/custom_output_test.go index bd79f4de0d..3c3c00088c 100644 --- a/test/e2e/logs/fluentbit/custom_output_test.go +++ b/test/e2e/logs/fluentbit/custom_output_test.go @@ -10,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -41,16 +42,13 @@ func TestCustomOutput(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), logProducer.K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/logs/fluentbit/dedot_test.go b/test/e2e/logs/fluentbit/dedot_test.go index 4cf536cf84..a44e90bedf 100644 --- a/test/e2e/logs/fluentbit/dedot_test.go +++ b/test/e2e/logs/fluentbit/dedot_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -40,21 +41,17 @@ func TestDedot(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), logProducer.K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) assert.DaemonSetReady(t, kitkyma.FluentBitDaemonSetName) - assert.DeploymentReady(t, logProducer.NamespacedName()) assert.FluentBitLogPipelineHealthy(t, pipelineName) assert.BackendDataEventuallyMatches(t, backend, diff --git a/test/e2e/logs/fluentbit/keep_annotation_test.go b/test/e2e/logs/fluentbit/keep_annotation_test.go index 97ae00130f..9ebff7a3c4 100644 --- a/test/e2e/logs/fluentbit/keep_annotation_test.go +++ b/test/e2e/logs/fluentbit/keep_annotation_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -38,21 +39,17 @@ func TestKeepAnnotations(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), logProducer.K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) assert.DaemonSetReady(t, kitkyma.FluentBitDaemonSetName) - assert.DeploymentReady(t, logProducer.NamespacedName()) assert.FluentBitLogPipelineHealthy(t, pipelineName) assert.BackendDataEventuallyMatches(t, backend, diff --git a/test/e2e/logs/misc/endpoint_invalid_test.go b/test/e2e/logs/misc/endpoint_invalid_test.go index ee5e8c75ae..0cd791280a 100644 --- a/test/e2e/logs/misc/endpoint_invalid_test.go +++ b/test/e2e/logs/misc/endpoint_invalid_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/suite" "github.com/kyma-project/telemetry-manager/test/testkit/unique" @@ -36,7 +37,7 @@ func TestEndpointInvalid_OTel(t *testing.T) { WithOTLPOutput(testutils.OTLPEndpoint(invalidEndpoint)). Build() - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(endpointKey, invalidEndpoint)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(endpointKey, invalidEndpoint)) pipelineInvalidEndpointValueFrom := testutils.NewLogPipelineBuilder(). WithName(pipelineNameValueFromSecret). WithOTLPOutput(testutils.OTLPEndpointFromSecret(secret.Name(), secret.Namespace(), endpointKey)). @@ -48,10 +49,6 @@ func TestEndpointInvalid_OTel(t *testing.T) { &pipelineInvalidEndpointValue, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resourcesToSucceedCreation...)).To(Succeed()) - }) - Expect(kitk8s.CreateObjects(t, resourcesToSucceedCreation...)).To(Succeed()) assert.LogPipelineHasCondition(t, pipelineNameValueFromSecret, metav1.Condition{ @@ -87,7 +84,7 @@ func TestEndpointInvalid_FluentBit(t *testing.T) { WithHTTPOutput(testutils.HTTPHost(invalidHost)). Build() - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(hostKey, invalidHost)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(hostKey, invalidHost)) pipelineInvalidEndpointValueFrom := testutils.NewLogPipelineBuilder(). WithName(pipelineNameValueFromSecret). WithHTTPOutput(testutils.HTTPHostFromSecret(secret.Name(), secret.Namespace(), hostKey)). @@ -102,10 +99,6 @@ func TestEndpointInvalid_FluentBit(t *testing.T) { &pipelineInvalidEndpointValue, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resourcesInvalidEndpointValueFrom...)).To(Succeed()) - Expect(kitk8s.DeleteObjects(resourcesInvalidEndpointValue...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resourcesInvalidEndpointValueFrom...)).To(Succeed()) Expect(kitk8s.CreateObjects(t, resourcesInvalidEndpointValue...)).To(Succeed()) diff --git a/test/e2e/logs/misc/filter_invalid_test.go b/test/e2e/logs/misc/filter_invalid_test.go index d984c65def..7b9ce20038 100644 --- a/test/e2e/logs/misc/filter_invalid_test.go +++ b/test/e2e/logs/misc/filter_invalid_test.go @@ -31,8 +31,5 @@ func TestFilterInvalid(t *testing.T) { WithOTLPOutput(testutils.OTLPEndpoint("https://backend.example.com:4317")). Build() - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(&pipeline)).Should(MatchError(ContainSubstring("not found"))) - }) Expect(kitk8s.CreateObjects(t, &pipeline)).ToNot(Succeed()) } diff --git a/test/e2e/logs/misc/mtls_cert_key_pair_dont_match_test.go b/test/e2e/logs/misc/mtls_cert_key_pair_dont_match_test.go index 2972e22eaf..c10963da82 100644 --- a/test/e2e/logs/misc/mtls_cert_key_pair_dont_match_test.go +++ b/test/e2e/logs/misc/mtls_cert_key_pair_dont_match_test.go @@ -12,6 +12,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/suite" "github.com/kyma-project/telemetry-manager/test/testkit/unique" @@ -46,13 +47,10 @@ func TestMTLSCertKeyDontMatch_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.LogPipelineHasCondition(t, pipelineName, metav1.Condition{ @@ -108,9 +106,6 @@ func TestMTLSCertKeyDontMatch_FluentBit(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.LogPipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/logs/misc/mtls_expired_cert_test.go b/test/e2e/logs/misc/mtls_expired_cert_test.go index bbf94450ff..ce8a47feff 100644 --- a/test/e2e/logs/misc/mtls_expired_cert_test.go +++ b/test/e2e/logs/misc/mtls_expired_cert_test.go @@ -48,9 +48,6 @@ func TestMTLSExpiredCert_OTel(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.LogPipelineHasCondition(t, pipelineName, metav1.Condition{ @@ -105,9 +102,6 @@ func TestMTLSExpiredCert_FluentBit(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.LogPipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/logs/misc/mtls_invalid_ca_test.go b/test/e2e/logs/misc/mtls_invalid_ca_test.go index 32ce8552f3..182f2d45fa 100644 --- a/test/e2e/logs/misc/mtls_invalid_ca_test.go +++ b/test/e2e/logs/misc/mtls_invalid_ca_test.go @@ -48,9 +48,6 @@ func TestMTLSInvalidCA_OTel(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.LogPipelineHasCondition(t, pipelineName, metav1.Condition{ @@ -105,9 +102,6 @@ func TestMTLSInvalidCA_FluentBit(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.LogPipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/logs/misc/mtls_invalid_cert_test.go b/test/e2e/logs/misc/mtls_invalid_cert_test.go index 5384851228..0b58996e49 100644 --- a/test/e2e/logs/misc/mtls_invalid_cert_test.go +++ b/test/e2e/logs/misc/mtls_invalid_cert_test.go @@ -48,9 +48,6 @@ func TestMTLSInvalidCert_OTel(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.LogPipelineHasCondition(t, pipelineName, metav1.Condition{ @@ -105,9 +102,6 @@ func TestMTLSInvalidCert_FluentBit(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.LogPipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/logs/misc/reject_creation_test.go b/test/e2e/logs/misc/reject_creation_test.go index dfec0fee0f..5149ee16b5 100644 --- a/test/e2e/logs/misc/reject_creation_test.go +++ b/test/e2e/logs/misc/reject_creation_test.go @@ -579,10 +579,6 @@ func TestRejectLogPipelineCreation(t *testing.T) { resources := []client.Object{&tc.pipeline} - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).Should(MatchError(ContainSubstring("not found"))) - }) - err := kitk8s.CreateObjects(t, resources...) Expect(err).ShouldNot(Succeed(), "unexpected success for pipeline '%s', this test expects an error", tc.pipeline.Name) diff --git a/test/e2e/logs/misc/transform_invalid_test.go b/test/e2e/logs/misc/transform_invalid_test.go index 60b23bb3f1..5cdbffabc5 100644 --- a/test/e2e/logs/misc/transform_invalid_test.go +++ b/test/e2e/logs/misc/transform_invalid_test.go @@ -29,8 +29,5 @@ func TestTransformInvalid(t *testing.T) { WithOTLPOutput(testutils.OTLPEndpoint("https://backend.example.com:4317")). Build() - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(&pipeline)).Should(MatchError(ContainSubstring("not found"))) - }) Expect(kitk8s.CreateObjects(t, &pipeline)).ToNot(Succeed()) } diff --git a/test/e2e/logs/misc/version_conversion_test.go b/test/e2e/logs/misc/version_conversion_test.go index 65d1b2f719..94d6f66d43 100644 --- a/test/e2e/logs/misc/version_conversion_test.go +++ b/test/e2e/logs/misc/version_conversion_test.go @@ -70,9 +70,6 @@ func TestVersionConversion(t *testing.T) { } kitk8s.CreateObjects(t, resources...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) var v1Alpha1AsV1Beta1 telemetryv1beta1.LogPipeline diff --git a/test/e2e/logs/shared/check_metrics_endpoint_test.go b/test/e2e/logs/shared/check_metrics_endpoint_test.go index a9be7a97f2..c2fc4abaa0 100644 --- a/test/e2e/logs/shared/check_metrics_endpoint_test.go +++ b/test/e2e/logs/shared/check_metrics_endpoint_test.go @@ -12,6 +12,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen" @@ -64,15 +65,12 @@ func TestMetricsEndpoint_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, tc.logGeneratorBuilder(genNs), } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.DeploymentReady(t, kitkyma.LogGatewayName) @@ -107,13 +105,10 @@ func TestMetricsEndpoint_FluentBit(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.DaemonSetReady(t, kitkyma.FluentBitDaemonSetName) diff --git a/test/e2e/logs/shared/container_selector_test.go b/test/e2e/logs/shared/container_selector_test.go index b85d7fb467..1027afc46b 100644 --- a/test/e2e/logs/shared/container_selector_test.go +++ b/test/e2e/logs/shared/container_selector_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen" @@ -49,8 +50,8 @@ func TestContainerSelector_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &includePipeline, &excludePipeline, stdoutloggen.NewDeployment(genNs, stdoutloggen.WithContainer(container1)).WithName("gen-1").K8sObject(), @@ -59,9 +60,6 @@ func TestContainerSelector_OTel(t *testing.T) { resources = append(resources, backend1.K8sObjects()...) resources = append(resources, backend2.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend1) @@ -111,8 +109,8 @@ func TestContainerSelector_FluentBit(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &includePipeline, &excludePipeline, stdoutloggen.NewDeployment(genNs, stdoutloggen.WithContainer(container1)).WithName("gen-1").K8sObject(), @@ -121,9 +119,6 @@ func TestContainerSelector_FluentBit(t *testing.T) { resources = append(resources, backend1.K8sObjects()...) resources = append(resources, backend2.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend1) diff --git a/test/e2e/logs/shared/disabled_input_test.go b/test/e2e/logs/shared/disabled_input_test.go index 2711a36385..c646e0f9f7 100644 --- a/test/e2e/logs/shared/disabled_input_test.go +++ b/test/e2e/logs/shared/disabled_input_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -42,17 +43,14 @@ func TestDisabledInput_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, telemetrygen.NewPod(genNs, telemetrygen.SignalTypeLogs).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) @@ -97,9 +95,6 @@ func TestDisabledInput_FluentBit(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) Eventually(func(g Gomega) { diff --git a/test/e2e/logs/shared/extract_labels_test.go b/test/e2e/logs/shared/extract_labels_test.go index 5fb7764982..285b698b75 100644 --- a/test/e2e/logs/shared/extract_labels_test.go +++ b/test/e2e/logs/shared/extract_labels_test.go @@ -1,7 +1,6 @@ package shared import ( - "context" "testing" . "github.com/onsi/gomega" @@ -12,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log" "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit" @@ -93,6 +93,8 @@ func TestExtractLabels_OTel(t *testing.T) { labelKeyShouldNotMatch: labelValueShouldNotMatch, } + kitk8s.PreserveAndScheduleRestoreOfTelemetryResource(t, kitkyma.TelemetryName) + Eventually(func(g Gomega) { g.Expect(suite.K8sClient.Get(t.Context(), kitkyma.TelemetryName, &telemetry)).NotTo(HaveOccurred()) telemetry.Spec.Enrichments = &operatorv1alpha1.EnrichmentSpec{ @@ -105,21 +107,13 @@ func TestExtractLabels_OTel(t *testing.T) { }, periodic.EventuallyTimeout, periodic.TelemetryInterval).Should(Succeed()) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, tc.logGeneratorBuilder(genNs, genLabels), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - Eventually(func(g Gomega) { - g.Expect(suite.K8sClient.Get(context.Background(), kitkyma.TelemetryName, &telemetry)).To(Succeed()) //nolint:usetesting // Remove ctx from Get - telemetry.Spec.Enrichments = &operatorv1alpha1.EnrichmentSpec{} - g.Expect(suite.K8sClient.Update(context.Background(), &telemetry)).To(Succeed()) //nolint:usetesting // Remove ctx from Update - }, periodic.EventuallyTimeout, periodic.TelemetryInterval).Should(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) if tc.expectAgent { @@ -184,9 +178,9 @@ func TestExtractLabels_FluentBit(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(notDroppedNs).K8sObject(), - kitk8s.NewNamespace(droppedNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(notDroppedNs).K8sObject(), + kitk8sobjects.NewNamespace(droppedNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), logProducer.K8sObject(), &pipelineNotDropped, &pipelineDropped, @@ -194,9 +188,6 @@ func TestExtractLabels_FluentBit(t *testing.T) { resources = append(resources, backendNotDropped.K8sObjects()...) resources = append(resources, backendDropped.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backendNotDropped) diff --git a/test/e2e/logs/shared/filter_test.go b/test/e2e/logs/shared/filter_test.go index e7f14a25b7..a1969e05c9 100644 --- a/test/e2e/logs/shared/filter_test.go +++ b/test/e2e/logs/shared/filter_test.go @@ -10,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -62,15 +63,12 @@ func TestFilter_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/logs/shared/keep_original_body_test.go b/test/e2e/logs/shared/keep_original_body_test.go index 558f0f8609..1104a6f7fb 100644 --- a/test/e2e/logs/shared/keep_original_body_test.go +++ b/test/e2e/logs/shared/keep_original_body_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log" "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit" @@ -77,10 +78,10 @@ func TestKeepOriginalBody_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(sourceNsKeepOriginal).K8sObject(), - kitk8s.NewNamespace(sourceNsDropOriginal).K8sObject(), - kitk8s.NewNamespace(backendNsKeepOriginal).K8sObject(), - kitk8s.NewNamespace(backendNsDropOriginal).K8sObject(), + kitk8sobjects.NewNamespace(sourceNsKeepOriginal).K8sObject(), + kitk8sobjects.NewNamespace(sourceNsDropOriginal).K8sObject(), + kitk8sobjects.NewNamespace(backendNsKeepOriginal).K8sObject(), + kitk8sobjects.NewNamespace(backendNsDropOriginal).K8sObject(), &pipelineDropOriginal, &pipelineKeepOriginal, // stdout log generators in the "keep-original-body" namespace @@ -97,9 +98,6 @@ func TestKeepOriginalBody_OTel(t *testing.T) { resources = append(resources, backendKeepOriginal.K8sObjects()...) resources = append(resources, backendDropOriginal.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backendKeepOriginal) @@ -226,10 +224,10 @@ func TestKeepOriginalBody_FluentBit(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(sourceNsKeepOriginal).K8sObject(), - kitk8s.NewNamespace(sourceNsDropOriginal).K8sObject(), - kitk8s.NewNamespace(backendNsKeepOriginal).K8sObject(), - kitk8s.NewNamespace(backendNsDropOriginal).K8sObject(), + kitk8sobjects.NewNamespace(sourceNsKeepOriginal).K8sObject(), + kitk8sobjects.NewNamespace(sourceNsDropOriginal).K8sObject(), + kitk8sobjects.NewNamespace(backendNsKeepOriginal).K8sObject(), + kitk8sobjects.NewNamespace(backendNsDropOriginal).K8sObject(), &pipelineDropOriginal, &pipelineKeepOriginal, // stdout log generators in the "keep-original-body" namespace @@ -246,9 +244,6 @@ func TestKeepOriginalBody_FluentBit(t *testing.T) { resources = append(resources, backendKeepOriginal.K8sObjects()...) resources = append(resources, backendDropOriginal.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backendKeepOriginal) diff --git a/test/e2e/logs/shared/mtls_about_to_expire_cert_test.go b/test/e2e/logs/shared/mtls_about_to_expire_cert_test.go index 39b42fe222..6cf5e951b1 100644 --- a/test/e2e/logs/shared/mtls_about_to_expire_cert_test.go +++ b/test/e2e/logs/shared/mtls_about_to_expire_cert_test.go @@ -13,6 +13,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen" @@ -79,16 +80,13 @@ func TestMTLSAboutToExpireCert_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, tc.logGeneratorBuilder(genNs), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) @@ -147,16 +145,13 @@ func TestMTLSAboutToExpireCert_FluentBit(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, stdoutloggen.NewDeployment(genNs).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/logs/shared/mtls_test.go b/test/e2e/logs/shared/mtls_test.go index 2ed876e6b8..7da0d3e6eb 100644 --- a/test/e2e/logs/shared/mtls_test.go +++ b/test/e2e/logs/shared/mtls_test.go @@ -10,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen" @@ -73,16 +74,13 @@ func TestMTLS_OTel(t *testing.T) { ).Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, tc.logGeneratorBuilder(genNs), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) @@ -126,16 +124,13 @@ func TestMTLS_FluentBit(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, stdoutloggen.NewDeployment(genNs).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/logs/shared/multi_pipeline_broken_test.go b/test/e2e/logs/shared/multi_pipeline_broken_test.go index 72b320db5f..0d7a0337e3 100644 --- a/test/e2e/logs/shared/multi_pipeline_broken_test.go +++ b/test/e2e/logs/shared/multi_pipeline_broken_test.go @@ -12,6 +12,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen" @@ -75,17 +76,14 @@ func TestMultiPipelineBroken_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &healthyPipeline, &brokenPipeline, tc.logGeneratorBuilder(genNs), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) @@ -133,17 +131,14 @@ func TestMultiPipelineBroken_FluentBit(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &healthyPipeline, &brokenPipeline, stdoutloggen.NewDeployment(genNs).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/logs/shared/multi_pipeline_fanout_test.go b/test/e2e/logs/shared/multi_pipeline_fanout_test.go index ab9265564f..60670b676d 100644 --- a/test/e2e/logs/shared/multi_pipeline_fanout_test.go +++ b/test/e2e/logs/shared/multi_pipeline_fanout_test.go @@ -10,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" @@ -73,8 +74,8 @@ func TestMultiPipelineFanout_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline1, &pipeline2, tc.logGeneratorBuilder(genNs), @@ -82,9 +83,6 @@ func TestMultiPipelineFanout_OTel(t *testing.T) { resources = append(resources, backend1.K8sObjects()...) resources = append(resources, backend2.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend1) @@ -124,8 +122,8 @@ func TestMultiPipelineFanout_FluentBit(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline1, &pipeline2, stdoutloggen.NewDeployment(genNs).K8sObject(), @@ -133,9 +131,6 @@ func TestMultiPipelineFanout_FluentBit(t *testing.T) { resources = append(resources, backend1.K8sObjects()...) resources = append(resources, backend2.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend1) diff --git a/test/e2e/logs/shared/multi_pipeline_max_pipeline_test.go b/test/e2e/logs/shared/multi_pipeline_max_pipeline_test.go index 8905557ea9..efacd80e66 100644 --- a/test/e2e/logs/shared/multi_pipeline_max_pipeline_test.go +++ b/test/e2e/logs/shared/multi_pipeline_max_pipeline_test.go @@ -14,6 +14,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen" @@ -76,18 +77,12 @@ func TestMultiPipelineMaxPipeline(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), stdoutloggen.NewDeployment(genNs).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - Expect(kitk8s.DeleteObjects(pipelines[2:]...)).To(Succeed()) - Expect(kitk8s.DeleteObjects(&additionalFBPipeline)).To(Succeed()) - Expect(kitk8s.DeleteObjects(&additionalOTelPipeline)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) Expect(kitk8s.CreateObjects(t, pipelines...)).To(Succeed()) @@ -178,17 +173,12 @@ func TestMultiPipelineMaxPipeline_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), telemetrygen.NewDeployment(genNs, telemetrygen.SignalTypeLogs).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - Expect(kitk8s.DeleteObjects(pipelines[1:]...)).To(Succeed()) - Expect(kitk8s.DeleteObjects(&additionalPipeline)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) Expect(kitk8s.CreateObjects(t, pipelines...)).To(Succeed()) @@ -256,17 +246,12 @@ func TestMultiPipelineMaxPipeline_FluentBit(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), stdoutloggen.NewDeployment(genNs).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - Expect(kitk8s.DeleteObjects(pipelines[1:]...)).To(Succeed()) - Expect(kitk8s.DeleteObjects(&additionalPipeline)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) Expect(kitk8s.CreateObjects(t, pipelines...)).To(Succeed()) diff --git a/test/e2e/logs/shared/namespace_selector_test.go b/test/e2e/logs/shared/namespace_selector_test.go index c57a380c23..3529167e9b 100644 --- a/test/e2e/logs/shared/namespace_selector_test.go +++ b/test/e2e/logs/shared/namespace_selector_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen" @@ -110,9 +111,9 @@ func TestNamespaceSelector_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(gen1Ns).K8sObject(), - kitk8s.NewNamespace(gen2Ns).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(gen1Ns).K8sObject(), + kitk8sobjects.NewNamespace(gen2Ns).K8sObject(), &includePipeline, &excludePipeline, tc.logGeneratorBuilder(gen1Ns), @@ -121,9 +122,6 @@ func TestNamespaceSelector_OTel(t *testing.T) { resources = append(resources, backend1.K8sObjects()...) resources = append(resources, backend2.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend1) @@ -171,9 +169,9 @@ func TestNamespaceSelector_FluentBit(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(gen1Ns).K8sObject(), - kitk8s.NewNamespace(gen2Ns).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(gen1Ns).K8sObject(), + kitk8sobjects.NewNamespace(gen2Ns).K8sObject(), &includePipeline, &excludeGen2Pipeline, stdoutloggen.NewDeployment(gen1Ns).K8sObject(), @@ -182,9 +180,6 @@ func TestNamespaceSelector_FluentBit(t *testing.T) { resources = append(resources, backend1.K8sObjects()...) resources = append(resources, backend2.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend1) diff --git a/test/e2e/logs/shared/observed_time_test.go b/test/e2e/logs/shared/observed_time_test.go index 964b6b5756..a95791af84 100644 --- a/test/e2e/logs/shared/observed_time_test.go +++ b/test/e2e/logs/shared/observed_time_test.go @@ -10,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -66,16 +67,13 @@ func TestObservedTime_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(genNs).K8sObject(), - kitk8s.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), &pipeline, tc.logGeneratorBuilder(genNs), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/logs/shared/resources_test.go b/test/e2e/logs/shared/resources_test.go index 9d6553f71f..2a6c31aa55 100644 --- a/test/e2e/logs/shared/resources_test.go +++ b/test/e2e/logs/shared/resources_test.go @@ -13,6 +13,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/suite" "github.com/kyma-project/telemetry-manager/test/testkit/unique" @@ -69,16 +70,13 @@ func TestResources_OTel(t *testing.T) { secretName = uniquePrefix() ) - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(endpointKey, endpointValue)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(endpointKey, endpointValue)) pipeline := testutils.NewLogPipelineBuilder(). WithInput(tc.input). WithName(pipelineName). WithOTLPOutput(testutils.OTLPEndpointFromSecret(secret.Name(), kitkyma.DefaultNamespaceName, endpointKey)). Build() - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(&pipeline)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, &pipeline, secret.K8sObject())).To(Succeed()) assert.ResourcesExist(t, tc.resources...) @@ -114,9 +112,9 @@ func TestResources_FluentBit(t *testing.T) { } ) - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(hostKey, "localhost")) - //TODO: remove parser configmap creation after logparser removal is rolled out - parserConfigMap := kitk8s.NewConfigMap( + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(hostKey, "localhost")) + // TODO: remove parser configmap creation after logparser removal is rolled out + parserConfigMap := kitk8sobjects.NewConfigMap( kitkyma.FluentBitParserConfigMap.Name, kitkyma.FluentBitParserConfigMap.Namespace, ) @@ -128,9 +126,6 @@ func TestResources_FluentBit(t *testing.T) { hostKey)). Build() - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(&pipeline)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, &pipeline, secret.K8sObject(), parserConfigMap.K8sObject())).To(Succeed()) assert.ResourcesExist(t, resources...) diff --git a/test/e2e/logs/shared/secret_missing_test.go b/test/e2e/logs/shared/secret_missing_test.go index 1eda0aff7e..5dbdefd1db 100644 --- a/test/e2e/logs/shared/secret_missing_test.go +++ b/test/e2e/logs/shared/secret_missing_test.go @@ -13,6 +13,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/suite" "github.com/kyma-project/telemetry-manager/test/testkit/unique" @@ -48,7 +49,7 @@ func TestSecretMissing_OTel(t *testing.T) { secretName = uniquePrefix() ) - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(endpointKey, endpointValue)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(endpointKey, endpointValue)) pipeline := testutils.NewLogPipelineBuilder(). WithName(pipelineName). @@ -64,9 +65,6 @@ func TestSecretMissing_OTel(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.LogPipelineHasCondition(t, pipelineName, metav1.Condition{ @@ -110,7 +108,7 @@ func TestSecretMissing_FluentBit(t *testing.T) { secretName = uniquePrefix() ) - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(hostKey, hostValue)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(hostKey, hostValue)) pipeline := testutils.NewLogPipelineBuilder(). WithName(pipelineName). @@ -125,9 +123,6 @@ func TestSecretMissing_FluentBit(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.LogPipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/logs/shared/secret_rotation_test.go b/test/e2e/logs/shared/secret_rotation_test.go index 2dd084d969..334c51260c 100644 --- a/test/e2e/logs/shared/secret_rotation_test.go +++ b/test/e2e/logs/shared/secret_rotation_test.go @@ -10,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen" @@ -66,7 +67,7 @@ func TestSecretRotation_OTel(t *testing.T) { backend := kitbackend.New(backendNs, kitbackend.SignalTypeLogsOTel) // Initially, create a secret with an incorrect endpoint - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(endpointKey, endpointValue)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(endpointKey, endpointValue)) pipeline := testutils.NewLogPipelineBuilder(). WithName(pipelineName). @@ -79,17 +80,14 @@ func TestSecretRotation_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, tc.logGeneratorBuilder(genNs), secret.K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) @@ -103,7 +101,7 @@ func TestSecretRotation_OTel(t *testing.T) { assert.OTelLogsFromNamespaceNotDelivered(t, backend, genNs) // Update the secret to have the correct backend endpoint - secret.UpdateSecret(kitk8s.WithStringData(endpointKey, backend.Endpoint())) + secret.UpdateSecret(kitk8sobjects.WithStringData(endpointKey, backend.Endpoint())) Expect(kitk8s.UpdateObjects(t, secret.K8sObject())).To(Succeed()) assert.DeploymentReady(t, kitkyma.LogGatewayName) @@ -137,7 +135,7 @@ func TestSecretRotation_FluentBit(t *testing.T) { backend := kitbackend.New(backendNs, kitbackend.SignalTypeLogsFluentBit) // Initially, create a secret with an incorrect host - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(hostKey, hostValue)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(hostKey, hostValue)) pipeline := testutils.NewLogPipelineBuilder(). WithName(pipelineName). @@ -152,17 +150,14 @@ func TestSecretRotation_FluentBit(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), stdoutloggen.NewDeployment(genNs).K8sObject(), &pipeline, secret.K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) @@ -171,7 +166,7 @@ func TestSecretRotation_FluentBit(t *testing.T) { assert.FluentBitLogsFromNamespaceNotDelivered(t, backend, genNs) // Update the secret to have the correct backend host - secret.UpdateSecret(kitk8s.WithStringData(hostKey, backend.Host())) + secret.UpdateSecret(kitk8sobjects.WithStringData(hostKey, backend.Host())) Expect(kitk8s.UpdateObjects(t, secret.K8sObject())).To(Succeed()) assert.DaemonSetReady(t, kitkyma.FluentBitDaemonSetName) diff --git a/test/e2e/logs/shared/service_name_test.go b/test/e2e/logs/shared/service_name_test.go index e6ce5e9680..e3e3d8f05f 100644 --- a/test/e2e/logs/shared/service_name_test.go +++ b/test/e2e/logs/shared/service_name_test.go @@ -10,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -84,8 +85,8 @@ func TestServiceName_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) @@ -93,29 +94,26 @@ func TestServiceName_OTel(t *testing.T) { if tc.expectAgent { podSpecLogs := stdoutloggen.PodSpec() resources = append(resources, - kitk8s.NewPod(podWithBothLabelsName, genNs). + kitk8sobjects.NewPod(podWithBothLabelsName, genNs). WithLabel(kubeAppLabelKey, kubeAppLabelValue). WithLabel(appLabelKey, appLabelValue). WithPodSpec(podSpecLogs). K8sObject(), - kitk8s.NewJob(jobName, genNs).WithPodSpec(podSpecLogs).K8sObject(), - kitk8s.NewPod(podWithNoLabelsName, genNs).WithPodSpec(podSpecLogs).K8sObject(), + kitk8sobjects.NewJob(jobName, genNs).WithPodSpec(podSpecLogs).K8sObject(), + kitk8sobjects.NewPod(podWithNoLabelsName, genNs).WithPodSpec(podSpecLogs).K8sObject(), ) } else { podSpecWithUndefinedService := telemetrygen.PodSpec(telemetrygen.SignalTypeLogs, telemetrygen.WithServiceName("")) resources = append(resources, - kitk8s.NewPod(podWithAppLabelName, genNs). + kitk8sobjects.NewPod(podWithAppLabelName, genNs). WithLabel(appLabelKey, appLabelValue). WithPodSpec(podSpecWithUndefinedService). K8sObject(), - kitk8s.NewDeployment(deploymentName, genNs).WithPodSpec(podSpecWithUndefinedService).K8sObject(), - kitk8s.NewStatefulSet(statefulSetName, genNs).WithPodSpec(podSpecWithUndefinedService).K8sObject(), + kitk8sobjects.NewDeployment(deploymentName, genNs).WithPodSpec(podSpecWithUndefinedService).K8sObject(), + kitk8sobjects.NewStatefulSet(statefulSetName, genNs).WithPodSpec(podSpecWithUndefinedService).K8sObject(), ) } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.DeploymentReady(t, kitkyma.LogGatewayName) diff --git a/test/e2e/logs/shared/single_pipeline_test.go b/test/e2e/logs/shared/single_pipeline_test.go index 6c5a5fe96e..11fd05ef3e 100644 --- a/test/e2e/logs/shared/single_pipeline_test.go +++ b/test/e2e/logs/shared/single_pipeline_test.go @@ -10,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen" @@ -66,16 +67,13 @@ func TestSinglePipeline_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, tc.logGeneratorBuilder(genNs), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) @@ -109,16 +107,13 @@ func TestSinglePipeline_FluentBit(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), stdoutloggen.NewDeployment(genNs).K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/logs/shared/single_pipeline_v1beta1_test.go b/test/e2e/logs/shared/single_pipeline_v1beta1_test.go index 2d275574e1..c82cf32804 100644 --- a/test/e2e/logs/shared/single_pipeline_v1beta1_test.go +++ b/test/e2e/logs/shared/single_pipeline_v1beta1_test.go @@ -12,6 +12,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen" @@ -80,16 +81,13 @@ func TestSinglePipelineV1Beta1_OTel(t *testing.T) { } resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, tc.logGeneratorBuilder(genNs), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.OTelLogPipelineHealthy(t, pipelineName) @@ -139,16 +137,13 @@ func TestSinglePipelineV1Beta1_FluentBit(t *testing.T) { } resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), stdoutloggen.NewDeployment(genNs).K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/logs/shared/transform_test.go b/test/e2e/logs/shared/transform_test.go index 916f6ae589..c715fefe97 100644 --- a/test/e2e/logs/shared/transform_test.go +++ b/test/e2e/logs/shared/transform_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -153,18 +154,14 @@ func TestTransform_OTel(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), tc.logGeneratorBuilder(genNs), &pipelineTransform, } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) - Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/metrics/agent/prometheus_input_diagnostic_metric_test.go b/test/e2e/metrics/agent/prometheus_input_diagnostic_metric_test.go index 8484a7ae6c..fa524cd1e0 100644 --- a/test/e2e/metrics/agent/prometheus_input_diagnostic_metric_test.go +++ b/test/e2e/metrics/agent/prometheus_input_diagnostic_metric_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -46,17 +47,14 @@ func TestPrometheusInputDiagnosticMetric(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, metricProducer.Pod().WithPrometheusAnnotations(prommetricgen.SchemeHTTP).K8sObject(), metricProducer.Service().WithPrometheusAnnotations(prommetricgen.SchemeHTTP).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/metrics/agent/prometheus_input_test.go b/test/e2e/metrics/agent/prometheus_input_test.go index 588033b600..e76f5f414b 100644 --- a/test/e2e/metrics/agent/prometheus_input_test.go +++ b/test/e2e/metrics/agent/prometheus_input_test.go @@ -12,6 +12,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" "github.com/kyma-project/telemetry-manager/test/testkit/metrics/runtime" @@ -42,17 +43,14 @@ func TestPrometheusInput(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, metricProducer.Pod().WithPrometheusAnnotations(prommetricgen.SchemeHTTP).K8sObject(), metricProducer.Service().WithPrometheusAnnotations(prommetricgen.SchemeHTTP).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/metrics/agent/runtime_input_test.go b/test/e2e/metrics/agent/runtime_input_test.go index 6f83ed2e2c..748c7fa5db 100644 --- a/test/e2e/metrics/agent/runtime_input_test.go +++ b/test/e2e/metrics/agent/runtime_input_test.go @@ -16,6 +16,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" "github.com/kyma-project/telemetry-manager/test/testkit/metrics/runtime" @@ -101,26 +102,23 @@ func TestRuntimeInput(t *testing.T) { telemetryMetricGen := telemetrygen.PodSpec(telemetrygen.SignalTypeMetrics) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipelineA, &pipelineB, &pipelineC, prometheusMetricGen.Pod().WithPrometheusAnnotations(prommetricgen.SchemeHTTP).K8sObject(), prometheusMetricGen.Service().WithPrometheusAnnotations(prommetricgen.SchemeHTTP).K8sObject(), - kitk8s.NewDeployment(deploymentName, genNs).WithPodSpec(telemetryMetricGen).WithLabel("name", deploymentName).K8sObject(), - kitk8s.NewStatefulSet(statefulSetName, genNs).WithPodSpec(telemetryMetricGen).WithLabel("name", statefulSetName).K8sObject(), - kitk8s.NewDaemonSet(daemonSetName, genNs).WithPodSpec(telemetryMetricGen).WithLabel("name", daemonSetName).K8sObject(), - kitk8s.NewJob(jobName, genNs).WithPodSpec(telemetryMetricGen).WithLabel("name", jobName).K8sObject(), + kitk8sobjects.NewDeployment(deploymentName, genNs).WithPodSpec(telemetryMetricGen).WithLabel("name", deploymentName).K8sObject(), + kitk8sobjects.NewStatefulSet(statefulSetName, genNs).WithPodSpec(telemetryMetricGen).WithLabel("name", statefulSetName).K8sObject(), + kitk8sobjects.NewDaemonSet(daemonSetName, genNs).WithPodSpec(telemetryMetricGen).WithLabel("name", daemonSetName).K8sObject(), + kitk8sobjects.NewJob(jobName, genNs).WithPodSpec(telemetryMetricGen).WithLabel("name", jobName).K8sObject(), } resources = append(resources, backendA.K8sObjects()...) resources = append(resources, backendB.K8sObjects()...) resources = append(resources, backendC.K8sObjects()...) resources = append(resources, createPodsWithVolume(pvName, pvcName, podMountingPVCName, podMountingEmptyDirName, genNs)...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) t.Log("Resources should exist and be operational") diff --git a/test/e2e/metrics/agent/runtime_node_namespace_test.go b/test/e2e/metrics/agent/runtime_node_namespace_test.go index 7ca9aa0566..dbc5bc6e52 100644 --- a/test/e2e/metrics/agent/runtime_node_namespace_test.go +++ b/test/e2e/metrics/agent/runtime_node_namespace_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" "github.com/kyma-project/telemetry-manager/test/testkit/metrics/runtime" @@ -58,9 +59,9 @@ func TestRuntimeNodeNamespace(t *testing.T) { excludeMetricProducer := prommetricgen.New(excludeNs) resources := []client.Object{ - kitk8s.NewNamespace(includeNs).K8sObject(), - kitk8s.NewNamespace(excludeNs).K8sObject(), - kitk8s.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(includeNs).K8sObject(), + kitk8sobjects.NewNamespace(excludeNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), &includePipeline, &excludePipeline, includeMetricProducer.Pod().WithPrometheusAnnotations(prommetricgen.SchemeHTTP).K8sObject(), @@ -71,9 +72,6 @@ func TestRuntimeNodeNamespace(t *testing.T) { resources = append(resources, includeBacked.K8sObjects()...) resources = append(resources, excludeBackend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, includeBacked) diff --git a/test/e2e/metrics/agent/service_name_test.go b/test/e2e/metrics/agent/service_name_test.go index 5275bde4b4..61f25fd7e5 100644 --- a/test/e2e/metrics/agent/service_name_test.go +++ b/test/e2e/metrics/agent/service_name_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -56,20 +57,17 @@ func TestServiceName(t *testing.T) { telemetrygen.WithServiceName(attrWithMissingProcessForUnknownServicePattern)) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, - kitk8s.NewDaemonSet(daemonSetName, genNs).WithPodSpec(podSpecWithUndefinedService).K8sObject(), - kitk8s.NewJob(jobName, genNs).WithPodSpec(podSpecWithUndefinedService).K8sObject(), - kitk8s.NewPod(podWithInvalidStartForUnknownServicePatternName, genNs).WithPodSpec(podSpecWithInvalidStartForUnknownServicePattern).K8sObject(), - kitk8s.NewPod(podWithInvalidEndForUnknownServicePatternName, genNs).WithPodSpec(podSpecWithInvalidEndForUnknownServicePattern).K8sObject(), - kitk8s.NewPod(podWithMissingProcessForUnknownServicePatternName, genNs).WithPodSpec(podSpecWithMissingProcessForUnknownServicePattern).K8sObject(), + kitk8sobjects.NewDaemonSet(daemonSetName, genNs).WithPodSpec(podSpecWithUndefinedService).K8sObject(), + kitk8sobjects.NewJob(jobName, genNs).WithPodSpec(podSpecWithUndefinedService).K8sObject(), + kitk8sobjects.NewPod(podWithInvalidStartForUnknownServicePatternName, genNs).WithPodSpec(podSpecWithInvalidStartForUnknownServicePattern).K8sObject(), + kitk8sobjects.NewPod(podWithInvalidEndForUnknownServicePatternName, genNs).WithPodSpec(podSpecWithInvalidEndForUnknownServicePattern).K8sObject(), + kitk8sobjects.NewPod(podWithMissingProcessForUnknownServicePatternName, genNs).WithPodSpec(podSpecWithMissingProcessForUnknownServicePattern).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/metrics/gateway/kyma_input_test.go b/test/e2e/metrics/gateway/kyma_input_test.go index f107f04658..7614cc9b06 100644 --- a/test/e2e/metrics/gateway/kyma_input_test.go +++ b/test/e2e/metrics/gateway/kyma_input_test.go @@ -12,6 +12,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -50,8 +51,8 @@ func TestKymaInput(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(generatorNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(generatorNs).K8sObject(), &pipelineWithKymaOnly, &pipelineWithKymaAndOtlp, telemetrygen.NewPod(generatorNs, telemetrygen.SignalTypeMetrics).K8sObject(), @@ -59,9 +60,6 @@ func TestKymaInput(t *testing.T) { resources = append(resources, backendKymaOnly.K8sObjects()...) resources = append(resources, backendKymaAndOtlp.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backendKymaOnly) @@ -71,7 +69,7 @@ func TestKymaInput(t *testing.T) { if suite.DebugObjectsEnabled() { objects := []client.Object{ &pipelineWithKymaOnly, - kitk8s.NewConfigMap(kitkyma.MetricGatewayBaseName, kitkyma.SystemNamespaceName).K8sObject(), + kitk8sobjects.NewConfigMap(kitkyma.MetricGatewayBaseName, kitkyma.SystemNamespaceName).K8sObject(), } Expect(kitk8s.ObjectsToFile(t, objects...)).To(Succeed()) } diff --git a/test/e2e/metrics/misc/disabled_input_test.go b/test/e2e/metrics/misc/disabled_input_test.go index ce5d060d9f..9aa9999b07 100644 --- a/test/e2e/metrics/misc/disabled_input_test.go +++ b/test/e2e/metrics/misc/disabled_input_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" @@ -40,16 +41,13 @@ func TestDisabledInput(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, telemetrygen.NewPod(genNs, telemetrygen.SignalTypeMetrics).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/metrics/misc/endpoint_invalid_test.go b/test/e2e/metrics/misc/endpoint_invalid_test.go index e465a1c3f3..8d37dcb7ef 100644 --- a/test/e2e/metrics/misc/endpoint_invalid_test.go +++ b/test/e2e/metrics/misc/endpoint_invalid_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/suite" "github.com/kyma-project/telemetry-manager/test/testkit/unique" @@ -40,7 +41,7 @@ func TestEndpointInvalid(t *testing.T) { ). Build() - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(endpointKey, invalidEndpoint)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(endpointKey, invalidEndpoint)) pipelineInvalidEndpointValueFrom := testutils.NewMetricPipelineBuilder(). WithName(pipelineNameValueFromSecret). WithOTLPOutput(testutils.OTLPEndpointFromSecret(secret.Name(), secret.Namespace(), endpointKey)). @@ -61,9 +62,6 @@ func TestEndpointInvalid(t *testing.T) { &pipelineMissingPortHTTP, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.MetricPipelineHasCondition(t, pipelineNameValueFromSecret, metav1.Condition{ diff --git a/test/e2e/metrics/misc/filter_invalid_test.go b/test/e2e/metrics/misc/filter_invalid_test.go index c157c43663..c6b28a1561 100644 --- a/test/e2e/metrics/misc/filter_invalid_test.go +++ b/test/e2e/metrics/misc/filter_invalid_test.go @@ -31,8 +31,5 @@ func TestFilterInvalid(t *testing.T) { WithOTLPOutput(testutils.OTLPEndpoint("https://backend.example.com:4317")). Build() - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(&pipeline)).Should(MatchError(ContainSubstring("not found"))) - }) Expect(kitk8s.CreateObjects(t, &pipeline)).ToNot(Succeed()) } diff --git a/test/e2e/metrics/misc/mtls_cert_key_pair_dont_match_test.go b/test/e2e/metrics/misc/mtls_cert_key_pair_dont_match_test.go index c496cd9969..5ed5e61f0f 100644 --- a/test/e2e/metrics/misc/mtls_cert_key_pair_dont_match_test.go +++ b/test/e2e/metrics/misc/mtls_cert_key_pair_dont_match_test.go @@ -50,9 +50,6 @@ func TestMTLSCertKeyPairDontMatch(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.MetricPipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/metrics/misc/mtls_expired_cert_test.go b/test/e2e/metrics/misc/mtls_expired_cert_test.go index 02631e48e6..ffda1ddff2 100644 --- a/test/e2e/metrics/misc/mtls_expired_cert_test.go +++ b/test/e2e/metrics/misc/mtls_expired_cert_test.go @@ -49,9 +49,6 @@ func TestMTLSExpiredCert(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.MetricPipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/metrics/misc/mtls_invalid_ca_test.go b/test/e2e/metrics/misc/mtls_invalid_ca_test.go index 76a3790cfa..2ba931b945 100644 --- a/test/e2e/metrics/misc/mtls_invalid_ca_test.go +++ b/test/e2e/metrics/misc/mtls_invalid_ca_test.go @@ -49,9 +49,6 @@ func TestMTLSInvalidCA(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.MetricPipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/metrics/misc/mtls_invalid_cert_test.go b/test/e2e/metrics/misc/mtls_invalid_cert_test.go index 9265192702..89905abb55 100644 --- a/test/e2e/metrics/misc/mtls_invalid_cert_test.go +++ b/test/e2e/metrics/misc/mtls_invalid_cert_test.go @@ -49,9 +49,6 @@ func TestMTLSInvalidCert(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.MetricPipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/metrics/misc/mtls_missing_key_test.go b/test/e2e/metrics/misc/mtls_missing_key_test.go index 47cb6b4e78..43b5203e75 100644 --- a/test/e2e/metrics/misc/mtls_missing_key_test.go +++ b/test/e2e/metrics/misc/mtls_missing_key_test.go @@ -48,8 +48,5 @@ func TestMTLSMissingKey(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).Should(MatchError(ContainSubstring(notFoundError))) - }) Expect(kitk8s.CreateObjects(t, resources...)).Should(MatchError(ContainSubstring(tlsCrdValidationError))) } diff --git a/test/e2e/metrics/misc/reject_creation_test.go b/test/e2e/metrics/misc/reject_creation_test.go index ad0072462b..c56e35e670 100644 --- a/test/e2e/metrics/misc/reject_creation_test.go +++ b/test/e2e/metrics/misc/reject_creation_test.go @@ -335,10 +335,6 @@ func TestRejectPipelineCreation(t *testing.T) { resources := []client.Object{&tc.pipeline} - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).Should(MatchError(ContainSubstring("not found"))) - }) - err := kitk8s.CreateObjects(t, resources...) Expect(err).ShouldNot(Succeed(), "unexpected success for pipeline '%s', this test expects an error", tc.pipeline.Name) diff --git a/test/e2e/metrics/misc/transform_invalid_test.go b/test/e2e/metrics/misc/transform_invalid_test.go index 591ecc4bd9..a44af7d070 100644 --- a/test/e2e/metrics/misc/transform_invalid_test.go +++ b/test/e2e/metrics/misc/transform_invalid_test.go @@ -28,8 +28,5 @@ func TestTransformInvalid(t *testing.T) { WithOTLPOutput(testutils.OTLPEndpoint("https://backend.example.com:4317")). Build() - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(&pipeline)).Should(MatchError(ContainSubstring("not found"))) - }) Expect(kitk8s.CreateObjects(t, &pipeline)).ToNot(Succeed()) } diff --git a/test/e2e/metrics/shared/cloud_provider_attributes_test.go b/test/e2e/metrics/shared/cloud_provider_attributes_test.go index 90c61c2187..693289fe4a 100644 --- a/test/e2e/metrics/shared/cloud_provider_attributes_test.go +++ b/test/e2e/metrics/shared/cloud_provider_attributes_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -80,16 +81,13 @@ func TestCloudProviderAttributes(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, } resources = append(resources, tc.generatorBuilder(genNs)...) resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/metrics/shared/custom_cluster_name_test.go b/test/e2e/metrics/shared/custom_cluster_name_test.go index 7ff82d1529..88c69bf272 100644 --- a/test/e2e/metrics/shared/custom_cluster_name_test.go +++ b/test/e2e/metrics/shared/custom_cluster_name_test.go @@ -1,7 +1,6 @@ package shared import ( - "context" "testing" . "github.com/onsi/gomega" @@ -14,6 +13,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -76,6 +76,8 @@ func TestCustomClusterName(t *testing.T) { WithOTLPOutput(testutils.OTLPEndpoint(backend.Endpoint())). Build() + kitk8s.PreserveAndScheduleRestoreOfTelemetryResource(t, kitkyma.TelemetryName) + Eventually(func(g Gomega) { g.Expect(suite.K8sClient.Get(t.Context(), kitkyma.TelemetryName, &telemetry)).NotTo(HaveOccurred()) telemetry.Spec.Enrichments = &operatorv1alpha1.EnrichmentSpec{ @@ -90,22 +92,13 @@ func TestCustomClusterName(t *testing.T) { clusterUID := string(kubeSystemNs.UID) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, } resources = append(resources, tc.generatorBuilder(genNs)...) resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - - Eventually(func(g Gomega) { - g.Expect(suite.K8sClient.Get(context.Background(), kitkyma.TelemetryName, &telemetry)).Should(Succeed()) //nolint:usetesting // Remove ctx from Get - telemetry.Spec.Enrichments.Cluster = &operatorv1alpha1.Cluster{} - g.Expect(suite.K8sClient.Update(context.Background(), &telemetry)).To(Succeed()) //nolint:usetesting // Remove ctx from Update - }, periodic.EventuallyTimeout, periodic.TelemetryInterval).Should(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).Should(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/metrics/shared/endpoint_with_path_validation_test.go b/test/e2e/metrics/shared/endpoint_with_path_validation_test.go index a88eaea7b4..954e33e1d2 100644 --- a/test/e2e/metrics/shared/endpoint_with_path_validation_test.go +++ b/test/e2e/metrics/shared/endpoint_with_path_validation_test.go @@ -60,9 +60,6 @@ func TestEndpointWithPathValidation(t *testing.T) { &metricPipelineWithHTTPAndWithoutPath, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) }) } diff --git a/test/e2e/metrics/shared/extract_labels_test.go b/test/e2e/metrics/shared/extract_labels_test.go index b8db052293..ca06daea70 100644 --- a/test/e2e/metrics/shared/extract_labels_test.go +++ b/test/e2e/metrics/shared/extract_labels_test.go @@ -1,7 +1,6 @@ package shared import ( - "context" "testing" . "github.com/onsi/gomega" @@ -12,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -93,6 +93,8 @@ func TestExtractLabels(t *testing.T) { labelKeyShouldNotMatch: labelValueShouldNotMatch, } + kitk8s.PreserveAndScheduleRestoreOfTelemetryResource(t, kitkyma.TelemetryName) + Eventually(func(g Gomega) { g.Expect(suite.K8sClient.Get(t.Context(), kitkyma.TelemetryName, &telemetry)).NotTo(HaveOccurred()) telemetry.Spec.Enrichments = &operatorv1alpha1.EnrichmentSpec{ @@ -105,22 +107,13 @@ func TestExtractLabels(t *testing.T) { }, periodic.EventuallyTimeout, periodic.TelemetryInterval).Should(Succeed()) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, } resources = append(resources, tc.generatorBuilder(genNs, genLabels)...) resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - - Eventually(func(g Gomega) { - g.Expect(suite.K8sClient.Get(context.Background(), kitkyma.TelemetryName, &telemetry)).To(Succeed()) //nolint:usetesting // Remove ctx from Get - telemetry.Spec.Enrichments = &operatorv1alpha1.EnrichmentSpec{} - g.Expect(suite.K8sClient.Update(context.Background(), &telemetry)).To(Succeed()) //nolint:usetesting // Remove ctx from Update - }, periodic.EventuallyTimeout, periodic.TelemetryInterval).Should(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/metrics/shared/filter_test.go b/test/e2e/metrics/shared/filter_test.go index 711e81d51b..d0c76a2ef4 100644 --- a/test/e2e/metrics/shared/filter_test.go +++ b/test/e2e/metrics/shared/filter_test.go @@ -10,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -61,15 +62,12 @@ func TestFilter(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/metrics/shared/mtls_about_to_expire_cert_test.go b/test/e2e/metrics/shared/mtls_about_to_expire_cert_test.go index 4ba5fc0468..41496d581d 100644 --- a/test/e2e/metrics/shared/mtls_about_to_expire_cert_test.go +++ b/test/e2e/metrics/shared/mtls_about_to_expire_cert_test.go @@ -14,6 +14,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/metrics/runtime" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -88,16 +89,13 @@ func TestMTLSAboutToExpireCert(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, } resources = append(resources, tc.generatorBuilder(genNs)...) resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/metrics/shared/mtls_test.go b/test/e2e/metrics/shared/mtls_test.go index 6a1d98ae87..9a301f0ad6 100644 --- a/test/e2e/metrics/shared/mtls_test.go +++ b/test/e2e/metrics/shared/mtls_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/metrics/runtime" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -83,16 +84,13 @@ func TestMTLS(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, } resources = append(resources, tc.generatorBuilder(genNs)...) resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/metrics/shared/multi_pipeline_broken_test.go b/test/e2e/metrics/shared/multi_pipeline_broken_test.go index bd18d049a7..9d5129ec16 100644 --- a/test/e2e/metrics/shared/multi_pipeline_broken_test.go +++ b/test/e2e/metrics/shared/multi_pipeline_broken_test.go @@ -13,6 +13,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/metrics/runtime" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -82,17 +83,14 @@ func TestMultiPipelineBroken(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &healthyPipeline, &brokenPipeline, } resources = append(resources, tc.generatorBuilder(genNs)...) resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/metrics/shared/multi_pipeline_fanout_test.go b/test/e2e/metrics/shared/multi_pipeline_fanout_test.go index 322f9e3946..73b06d76f0 100644 --- a/test/e2e/metrics/shared/multi_pipeline_fanout_test.go +++ b/test/e2e/metrics/shared/multi_pipeline_fanout_test.go @@ -12,6 +12,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" "github.com/kyma-project/telemetry-manager/test/testkit/metrics/runtime" @@ -64,8 +65,8 @@ func TestMultiPipelineFanout_Agent(t *testing.T) { metricProducer := prommetricgen.New(genNs) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &metricPipelineRuntime, &metricPipelinePrometheus, metricProducer.Pod().WithPrometheusAnnotations(prommetricgen.SchemeHTTP).K8sObject(), @@ -74,9 +75,6 @@ func TestMultiPipelineFanout_Agent(t *testing.T) { resources = append(resources, backendRuntime.K8sObjects()...) resources = append(resources, backendPrometheus.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backendRuntime) @@ -184,8 +182,8 @@ func TestMultiPipelineFanout_Gateway(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline1, &pipeline2, telemetrygen.NewPod(genNs, telemetrygen.SignalTypeMetrics).K8sObject(), @@ -193,9 +191,6 @@ func TestMultiPipelineFanout_Gateway(t *testing.T) { resources = append(resources, backend1.K8sObjects()...) resources = append(resources, backend2.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend1) diff --git a/test/e2e/metrics/shared/multi_pipeline_max_pipeline_test.go b/test/e2e/metrics/shared/multi_pipeline_max_pipeline_test.go index 0723cfe1d1..76e7f0a1de 100644 --- a/test/e2e/metrics/shared/multi_pipeline_max_pipeline_test.go +++ b/test/e2e/metrics/shared/multi_pipeline_max_pipeline_test.go @@ -13,6 +13,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" @@ -54,17 +55,12 @@ func TestMultiPipelineMaxPipeline(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), telemetrygen.NewPod(genNs, telemetrygen.SignalTypeMetrics).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - Expect(kitk8s.DeleteObjects(pipelines[1:]...)).To(Succeed()) - Expect(kitk8s.DeleteObjects(&additionalPipeline)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) Expect(kitk8s.CreateObjects(t, pipelines...)).To(Succeed()) diff --git a/test/e2e/metrics/shared/namespace_selector_test.go b/test/e2e/metrics/shared/namespace_selector_test.go index bccb06b8c7..eddcbd7e91 100644 --- a/test/e2e/metrics/shared/namespace_selector_test.go +++ b/test/e2e/metrics/shared/namespace_selector_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/metrics/runtime" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -119,9 +120,9 @@ func TestNamespaceSelector(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(gen1Ns).K8sObject(), - kitk8s.NewNamespace(gen2Ns).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(gen1Ns).K8sObject(), + kitk8sobjects.NewNamespace(gen2Ns).K8sObject(), &includePipeline, &excludePipeline, } @@ -129,9 +130,6 @@ func TestNamespaceSelector(t *testing.T) { resources = append(resources, backend1.K8sObjects()...) resources = append(resources, backend2.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend1) @@ -143,7 +141,7 @@ func TestNamespaceSelector(t *testing.T) { objects := []client.Object{ &includePipeline, &excludePipeline, - kitk8s.NewConfigMap(kitkyma.MetricGatewayBaseName, kitkyma.SystemNamespaceName).K8sObject(), + kitk8sobjects.NewConfigMap(kitkyma.MetricGatewayBaseName, kitkyma.SystemNamespaceName).K8sObject(), } Expect(kitk8s.ObjectsToFile(t, objects...)).To(Succeed()) } diff --git a/test/e2e/metrics/shared/resources_test.go b/test/e2e/metrics/shared/resources_test.go index 50bf3cba09..ba841adc36 100644 --- a/test/e2e/metrics/shared/resources_test.go +++ b/test/e2e/metrics/shared/resources_test.go @@ -13,6 +13,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/suite" "github.com/kyma-project/telemetry-manager/test/testkit/unique" @@ -71,16 +72,13 @@ func TestResources(t *testing.T) { secretName = uniquePrefix() ) - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(endpointKey, endpointValue)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(endpointKey, endpointValue)) pipeline := testutils.NewMetricPipelineBuilder(). WithName(pipelineName). WithInput(tc.input). WithOTLPOutput(testutils.OTLPEndpointFromSecret(secret.Name(), secret.Namespace(), endpointKey)). Build() - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(&pipeline)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, &pipeline, secret.K8sObject())).To(Succeed()) assert.ResourcesExist(t, tc.resources...) diff --git a/test/e2e/metrics/shared/secret_missing_test.go b/test/e2e/metrics/shared/secret_missing_test.go index 2e6daaa5e3..71e2ed98c7 100644 --- a/test/e2e/metrics/shared/secret_missing_test.go +++ b/test/e2e/metrics/shared/secret_missing_test.go @@ -13,6 +13,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/suite" "github.com/kyma-project/telemetry-manager/test/testkit/unique" @@ -48,7 +49,7 @@ func TestSecretMissing(t *testing.T) { secretName = uniquePrefix() ) - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(endpointKey, endpointValue)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(endpointKey, endpointValue)) pipeline := testutils.NewMetricPipelineBuilder(). WithName(pipelineName). @@ -64,9 +65,6 @@ func TestSecretMissing(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.MetricPipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/metrics/shared/secret_rotation_test.go b/test/e2e/metrics/shared/secret_rotation_test.go index ccf67107ad..77c211b001 100644 --- a/test/e2e/metrics/shared/secret_rotation_test.go +++ b/test/e2e/metrics/shared/secret_rotation_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/metrics/runtime" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -73,7 +74,7 @@ func TestSecretRotation(t *testing.T) { backend := kitbackend.New(backendNs, kitbackend.SignalTypeMetrics) // Initially, create a secret with an incorrect endpoint - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(endpointKey, endpointValue)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(endpointKey, endpointValue)) pipeline := testutils.NewMetricPipelineBuilder(). WithName(pipelineName). @@ -86,17 +87,14 @@ func TestSecretRotation(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, secret.K8sObject(), } resources = append(resources, tc.generatorBuilder(genNs)...) resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) @@ -110,7 +108,7 @@ func TestSecretRotation(t *testing.T) { assert.MetricsFromNamespaceNotDelivered(t, backend, genNs) // Update the secret to have the correct backend endpoint - secret.UpdateSecret(kitk8s.WithStringData(endpointKey, backend.Endpoint())) + secret.UpdateSecret(kitk8sobjects.WithStringData(endpointKey, backend.Endpoint())) Expect(kitk8s.UpdateObjects(t, secret.K8sObject())).To(Succeed()) assert.DeploymentReady(t, kitkyma.MetricGatewayName) diff --git a/test/e2e/metrics/shared/single_pipeline_test.go b/test/e2e/metrics/shared/single_pipeline_test.go index 12e2c636d9..d99d18173b 100644 --- a/test/e2e/metrics/shared/single_pipeline_test.go +++ b/test/e2e/metrics/shared/single_pipeline_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/metrics/runtime" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -72,16 +73,13 @@ func TestSinglePipeline(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, } resources = append(resources, tc.generatorBuilder(genNs)...) resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/metrics/shared/single_pipeline_v1beta1_test.go b/test/e2e/metrics/shared/single_pipeline_v1beta1_test.go index 8b7d0fdf99..96bbb7991b 100644 --- a/test/e2e/metrics/shared/single_pipeline_v1beta1_test.go +++ b/test/e2e/metrics/shared/single_pipeline_v1beta1_test.go @@ -12,6 +12,7 @@ import ( "github.com/kyma-project/telemetry-manager/internal/otelcollector/ports" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/metrics/runtime" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -85,16 +86,13 @@ func TestSinglePipelineV1Beta1(t *testing.T) { } resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) resources = append(resources, tc.generatorBuilder(genNs)...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/metrics/shared/transform_test.go b/test/e2e/metrics/shared/transform_test.go index a92b60ce0f..1101057847 100644 --- a/test/e2e/metrics/shared/transform_test.go +++ b/test/e2e/metrics/shared/transform_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -179,16 +180,13 @@ func TestTransform(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, } resources = append(resources, tc.generatorBuilder(genNs)...) resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/misc/overrides_test.go b/test/e2e/misc/overrides_test.go index aaa13b2023..00fa9b912a 100644 --- a/test/e2e/misc/overrides_test.go +++ b/test/e2e/misc/overrides_test.go @@ -15,6 +15,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -48,7 +49,7 @@ func TestOverrides(t *testing.T) { tracePipeline := testutils.NewTracePipelineBuilder().WithName(pipelineName).Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), &logPipeline, &metricPipeline, &tracePipeline, @@ -56,9 +57,6 @@ func TestOverrides(t *testing.T) { resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) // Verify that before overrides we don't have any DEBUG logs @@ -81,7 +79,7 @@ func TestOverrides(t *testing.T) { assert.WithOptionalDescription("should NOT have logs from the telemetry-manager pod with DEBUG level")) // Verify that after overrides config we have DEBUG logs - overrides = kitk8s.NewOverrides().WithLogLevel(kitk8s.DEBUG).K8sObject() + overrides = kitk8sobjects.NewOverrides().WithLogLevel(kitk8sobjects.DEBUG).K8sObject() Expect(kitk8s.CreateObjects(t, overrides)).Should(Succeed()) triggerLogPipelineReconcilation(pipelineName) diff --git a/test/e2e/misc/telemetry_log_analysis_test.go b/test/e2e/misc/telemetry_log_analysis_test.go index f1805e5349..e209074b57 100644 --- a/test/e2e/misc/telemetry_log_analysis_test.go +++ b/test/e2e/misc/telemetry_log_analysis_test.go @@ -10,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log" "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit" @@ -73,15 +74,15 @@ func TestTelemetryLogs(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(traceBackendNs).K8sObject(), - kitk8s.NewNamespace(metricBackendNs).K8sObject(), - kitk8s.NewNamespace(fbluentBitLogBackendNs).K8sObject(), - kitk8s.NewNamespace(logBackendNs).K8sObject(), + kitk8sobjects.NewNamespace(traceBackendNs).K8sObject(), + kitk8sobjects.NewNamespace(metricBackendNs).K8sObject(), + kitk8sobjects.NewNamespace(fbluentBitLogBackendNs).K8sObject(), + kitk8sobjects.NewNamespace(logBackendNs).K8sObject(), - kitk8s.NewNamespace(genTraceNs).K8sObject(), - kitk8s.NewNamespace(genMetricNs).K8sObject(), - kitk8s.NewNamespace(genFBNs).K8sObject(), - kitk8s.NewNamespace(genLogNs).K8sObject(), + kitk8sobjects.NewNamespace(genTraceNs).K8sObject(), + kitk8sobjects.NewNamespace(genMetricNs).K8sObject(), + kitk8sobjects.NewNamespace(genFBNs).K8sObject(), + kitk8sobjects.NewNamespace(genLogNs).K8sObject(), telemetrygen.NewPod(genTraceNs, telemetrygen.SignalTypeTraces).K8sObject(), telemetrygen.NewPod(genMetricNs, telemetrygen.SignalTypeMetrics).K8sObject(), @@ -98,11 +99,6 @@ func TestTelemetryLogs(t *testing.T) { resources = append(resources, fluentBitLogBackend.K8sObjects()...) resources = append(resources, logBackend.K8sObjects()...) - t.Cleanup(func() { - if !t.Failed() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - } - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.DeploymentReady(t, kitkyma.MetricGatewayName) diff --git a/test/e2e/misc/telemetry_test.go b/test/e2e/misc/telemetry_test.go index 9e5f9171b4..24ecc384ee 100644 --- a/test/e2e/misc/telemetry_test.go +++ b/test/e2e/misc/telemetry_test.go @@ -15,6 +15,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/periodic" @@ -48,8 +49,8 @@ func TestTelemetry(t *testing.T) { logPipeline := testutils.NewLogPipelineBuilder().WithName(pipelineName).WithOTLPInput(true).WithOTLPOutput().Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &tracePipeline, &metricPipeline, &logPipeline, @@ -57,9 +58,6 @@ func TestTelemetry(t *testing.T) { resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) Eventually(func(g Gomega) { @@ -99,13 +97,11 @@ func TestTelemetryWarning(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), &misconfiguredTracePipeline, } t.Logf("pipeline: %s", misconfiguredTracePipeline.Name) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) + Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) // assert for misconfigured trace pipeline we have correct telemetry state and condition @@ -133,14 +129,11 @@ func TestTelemetryDeletionBlocking(t *testing.T) { logPipeline := testutils.NewLogPipelineBuilder().WithName(pipelineName).Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), &logPipeline, } resources = append(resources, logBackend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).Should(MatchError(ContainSubstring("not found"))) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) var telemetry operatorv1alpha1.Telemetry diff --git a/test/e2e/misc/telemetry_test_v1beta1_test.go b/test/e2e/misc/telemetry_test_v1beta1_test.go index 71df859b1d..2895d4700b 100644 --- a/test/e2e/misc/telemetry_test_v1beta1_test.go +++ b/test/e2e/misc/telemetry_test_v1beta1_test.go @@ -10,6 +10,7 @@ import ( operatorv1beta1 "github.com/kyma-project/telemetry-manager/apis/operator/v1beta1" testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/periodic" @@ -43,8 +44,8 @@ func TestTelemetryV1Beta1(t *testing.T) { logPipeline := testutils.NewLogPipelineBuilder().WithName(pipelineName).WithOTLPInput(true).WithOTLPOutput().Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &tracePipeline, &metricPipeline, &logPipeline, @@ -52,9 +53,6 @@ func TestTelemetryV1Beta1(t *testing.T) { resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) Eventually(func(g Gomega) { diff --git a/test/e2e/traces/endpoint_invalid_test.go b/test/e2e/traces/endpoint_invalid_test.go index 259fe6e53f..11ebffdb5f 100644 --- a/test/e2e/traces/endpoint_invalid_test.go +++ b/test/e2e/traces/endpoint_invalid_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/suite" "github.com/kyma-project/telemetry-manager/test/testkit/unique" @@ -42,7 +43,7 @@ func TestEndpointInvalid(t *testing.T) { ). Build() - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(endpointKey, invalidEndpoint)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(endpointKey, invalidEndpoint)) pipelineInvalidEndpointValueFrom := testutils.NewTracePipelineBuilder(). WithName(pipelineNameValueFrom). WithOTLPOutput(testutils.OTLPEndpointFromSecret(secret.Name(), secret.Namespace(), endpointKey)). @@ -72,9 +73,6 @@ func TestEndpointInvalid(t *testing.T) { &pipelineInvalidPortHTTP, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) for _, pipelineName := range []string{ diff --git a/test/e2e/traces/endpoint_with_path_validation_test.go b/test/e2e/traces/endpoint_with_path_validation_test.go index 86be5ef90a..c38d4cf3b1 100644 --- a/test/e2e/traces/endpoint_with_path_validation_test.go +++ b/test/e2e/traces/endpoint_with_path_validation_test.go @@ -45,10 +45,6 @@ func TestEndpointWithPathValidation(t *testing.T) { &tracePipelineWithHTTPAndWithoutPath, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) - Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) Expect(kitk8s.CreateObjects(t, &tracePipelineWithGRPCAndPath)).ShouldNot(Succeed()) diff --git a/test/e2e/traces/extract_labels_test.go b/test/e2e/traces/extract_labels_test.go index 299b8981b5..65d35a7b51 100644 --- a/test/e2e/traces/extract_labels_test.go +++ b/test/e2e/traces/extract_labels_test.go @@ -1,7 +1,6 @@ package traces import ( - "context" "testing" . "github.com/onsi/gomega" @@ -11,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/trace" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -60,6 +60,8 @@ func TestExtractLabels(t *testing.T) { labelKeyShouldNotMatch: labelValueShouldNotMatch, } + kitk8s.PreserveAndScheduleRestoreOfTelemetryResource(t, kitkyma.TelemetryName) + Eventually(func(g Gomega) { g.Expect(suite.K8sClient.Get(t.Context(), kitkyma.TelemetryName, &telemetry)).NotTo(HaveOccurred()) telemetry.Spec.Enrichments = &operatorv1alpha1.EnrichmentSpec{ @@ -72,22 +74,13 @@ func TestExtractLabels(t *testing.T) { }, periodic.EventuallyTimeout, periodic.TelemetryInterval).Should(Succeed()) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, telemetrygen.NewPod(genNs, telemetrygen.SignalTypeTraces).WithLabels(genLabels).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - - Eventually(func(g Gomega) { - g.Expect(suite.K8sClient.Get(context.Background(), kitkyma.TelemetryName, &telemetry)).To(Succeed()) //nolint:usetesting // Remove ctx from Get - telemetry.Spec.Enrichments = &operatorv1alpha1.EnrichmentSpec{} - g.Expect(suite.K8sClient.Update(context.Background(), &telemetry)).To(Succeed()) //nolint:usetesting // Remove ctx from Update - }, periodic.EventuallyTimeout, periodic.TelemetryInterval).Should(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/traces/filter_invalid_test.go b/test/e2e/traces/filter_invalid_test.go index 7e48914090..37f43d2c15 100644 --- a/test/e2e/traces/filter_invalid_test.go +++ b/test/e2e/traces/filter_invalid_test.go @@ -31,8 +31,5 @@ func TestFilterInvalid(t *testing.T) { WithOTLPOutput(testutils.OTLPEndpoint("https://backend.example.com:4317")). Build() - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(&pipeline)).Should(MatchError(ContainSubstring("not found"))) - }) Expect(kitk8s.CreateObjects(t, &pipeline)).ToNot(Succeed()) } diff --git a/test/e2e/traces/filter_test.go b/test/e2e/traces/filter_test.go index b2afc51aa5..f824cda2fc 100644 --- a/test/e2e/traces/filter_test.go +++ b/test/e2e/traces/filter_test.go @@ -10,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/trace" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -41,16 +42,13 @@ func TestFilter(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, telemetrygen.NewPod(genNs, telemetrygen.SignalTypeTraces).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/traces/mtls_about_to_expire_cert_test.go b/test/e2e/traces/mtls_about_to_expire_cert_test.go index 06a010fadc..feb5e9778c 100644 --- a/test/e2e/traces/mtls_about_to_expire_cert_test.go +++ b/test/e2e/traces/mtls_about_to_expire_cert_test.go @@ -12,6 +12,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" @@ -49,16 +50,13 @@ func TestMTLSAboutToExpireCert(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, telemetrygen.NewPod(genNs, telemetrygen.SignalTypeTraces).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/traces/mtls_cert_key_pair_dont_match_test.go b/test/e2e/traces/mtls_cert_key_pair_dont_match_test.go index 25ae108848..2b29465896 100644 --- a/test/e2e/traces/mtls_cert_key_pair_dont_match_test.go +++ b/test/e2e/traces/mtls_cert_key_pair_dont_match_test.go @@ -50,9 +50,6 @@ func TestMTLSCertKeyPairDontMatch(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.TracePipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/traces/mtls_expired_cert_test.go b/test/e2e/traces/mtls_expired_cert_test.go index 2235150033..d879a7149e 100644 --- a/test/e2e/traces/mtls_expired_cert_test.go +++ b/test/e2e/traces/mtls_expired_cert_test.go @@ -49,9 +49,6 @@ func TestMTLSExpiredCert(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.TracePipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/traces/mtls_invalid_ca_test.go b/test/e2e/traces/mtls_invalid_ca_test.go index 7316d7d20e..7af7e60bce 100644 --- a/test/e2e/traces/mtls_invalid_ca_test.go +++ b/test/e2e/traces/mtls_invalid_ca_test.go @@ -49,9 +49,6 @@ func TestMTLSInvalidCA(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.TracePipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/traces/mtls_invalid_cert_test.go b/test/e2e/traces/mtls_invalid_cert_test.go index ed30bafb1e..018b4f7c98 100644 --- a/test/e2e/traces/mtls_invalid_cert_test.go +++ b/test/e2e/traces/mtls_invalid_cert_test.go @@ -49,9 +49,6 @@ func TestMTLSInvalidCert(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.TracePipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/traces/mtls_test.go b/test/e2e/traces/mtls_test.go index a900bd6c7f..be46aa510c 100644 --- a/test/e2e/traces/mtls_test.go +++ b/test/e2e/traces/mtls_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" @@ -44,16 +45,13 @@ func TestMTLS(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, telemetrygen.NewPod(genNs, telemetrygen.SignalTypeTraces).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/traces/multi_pipeline_broken_test.go b/test/e2e/traces/multi_pipeline_broken_test.go index b66402b6dc..e1fa23f00e 100644 --- a/test/e2e/traces/multi_pipeline_broken_test.go +++ b/test/e2e/traces/multi_pipeline_broken_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" @@ -42,17 +43,14 @@ func TestMultiPipelineBroken(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &healthyPipeline, &brokenPipeline, telemetrygen.NewPod(genNs, telemetrygen.SignalTypeTraces).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/traces/multi_pipeline_fanout_test.go b/test/e2e/traces/multi_pipeline_fanout_test.go index 5ec38ffa2b..21b5c3d0e1 100644 --- a/test/e2e/traces/multi_pipeline_fanout_test.go +++ b/test/e2e/traces/multi_pipeline_fanout_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" @@ -41,8 +42,8 @@ func TestMultiPipelineFanout(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline1, &pipeline2, telemetrygen.NewPod(genNs, telemetrygen.SignalTypeTraces).K8sObject(), @@ -50,9 +51,6 @@ func TestMultiPipelineFanout(t *testing.T) { resources = append(resources, backend1.K8sObjects()...) resources = append(resources, backend2.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend1) diff --git a/test/e2e/traces/multi_pipeline_max_pipeline_test.go b/test/e2e/traces/multi_pipeline_max_pipeline_test.go index 1b1bc97345..7e47367d8c 100644 --- a/test/e2e/traces/multi_pipeline_max_pipeline_test.go +++ b/test/e2e/traces/multi_pipeline_max_pipeline_test.go @@ -13,6 +13,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" @@ -52,17 +53,12 @@ func TestMultiPipelineMaxPipeline(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), telemetrygen.NewPod(genNs, telemetrygen.SignalTypeTraces).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - Expect(kitk8s.DeleteObjects(pipelines[1:]...)).To(Succeed()) - Expect(kitk8s.DeleteObjects(&additionalPipeline)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) Expect(kitk8s.CreateObjects(t, pipelines...)).To(Succeed()) diff --git a/test/e2e/traces/noisy_span_filter_test.go b/test/e2e/traces/noisy_span_filter_test.go index f494c4a1f3..34426235fb 100644 --- a/test/e2e/traces/noisy_span_filter_test.go +++ b/test/e2e/traces/noisy_span_filter_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" @@ -112,23 +113,23 @@ func TestNoisyFilters(t *testing.T) { ).K8sObject() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), &pipeline, } resources = append(resources, backend.K8sObjects()...) resources = append(resources, - kitk8s.NewNamespace(regularSpansNs).K8sObject(), - kitk8s.NewNamespace(vmaScrapeSpansNs).K8sObject(), - kitk8s.NewNamespace(healthzSpansNs).K8sObject(), - kitk8s.NewNamespace(fluentBitSpansNs).K8sObject(), - kitk8s.NewNamespace(metricAgentScrapeSpansNs).K8sObject(), - kitk8s.NewNamespace(metricAgentSpansNs).K8sObject(), - kitk8s.NewNamespace(metricGatewaySpansNs).K8sObject(), - kitk8s.NewNamespace(metricServiceSpansNs).K8sObject(), - kitk8s.NewNamespace(traceGatewaySpansNs).K8sObject(), - kitk8s.NewNamespace(traceServiceSpansNs).K8sObject(), - kitk8s.NewNamespace(traceServiceInternalSpansNs).K8sObject(), + kitk8sobjects.NewNamespace(regularSpansNs).K8sObject(), + kitk8sobjects.NewNamespace(vmaScrapeSpansNs).K8sObject(), + kitk8sobjects.NewNamespace(healthzSpansNs).K8sObject(), + kitk8sobjects.NewNamespace(fluentBitSpansNs).K8sObject(), + kitk8sobjects.NewNamespace(metricAgentScrapeSpansNs).K8sObject(), + kitk8sobjects.NewNamespace(metricAgentSpansNs).K8sObject(), + kitk8sobjects.NewNamespace(metricGatewaySpansNs).K8sObject(), + kitk8sobjects.NewNamespace(metricServiceSpansNs).K8sObject(), + kitk8sobjects.NewNamespace(traceGatewaySpansNs).K8sObject(), + kitk8sobjects.NewNamespace(traceServiceSpansNs).K8sObject(), + kitk8sobjects.NewNamespace(traceServiceInternalSpansNs).K8sObject(), ) resources = append(resources, @@ -145,9 +146,6 @@ func TestNoisyFilters(t *testing.T) { traceServiceInternalSpansGen, ) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/traces/reject_creation_test.go b/test/e2e/traces/reject_creation_test.go index 01172fffcc..7e8853b9c3 100644 --- a/test/e2e/traces/reject_creation_test.go +++ b/test/e2e/traces/reject_creation_test.go @@ -230,10 +230,6 @@ func TestRejectTracePipelineCreation(t *testing.T) { resources := []client.Object{&tc.pipeline} - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).Should(MatchError(ContainSubstring("not found"))) - }) - err := kitk8s.CreateObjects(t, resources...) Expect(err).ShouldNot(Succeed(), "unexpected success for pipeline '%s', this test expects an error", tc.pipeline.Name) diff --git a/test/e2e/traces/resources_test.go b/test/e2e/traces/resources_test.go index 9f31c26231..2b5e2d8825 100644 --- a/test/e2e/traces/resources_test.go +++ b/test/e2e/traces/resources_test.go @@ -12,6 +12,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/suite" "github.com/kyma-project/telemetry-manager/test/testkit/unique" @@ -43,15 +44,12 @@ func TestResources(t *testing.T) { } ) - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(endpointKey, endpointValue)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(endpointKey, endpointValue)) pipeline := testutils.NewTracePipelineBuilder(). WithName(pipelineName). WithOTLPOutput(testutils.OTLPEndpointFromSecret(secret.Name(), secret.Namespace(), endpointKey)). Build() - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(&pipeline)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, &pipeline, secret.K8sObject())).To(Succeed()) assert.ResourcesExist(t, gatewayResources...) diff --git a/test/e2e/traces/secret_missing_test.go b/test/e2e/traces/secret_missing_test.go index 8b63e44d45..12ab1dae17 100644 --- a/test/e2e/traces/secret_missing_test.go +++ b/test/e2e/traces/secret_missing_test.go @@ -12,6 +12,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/suite" "github.com/kyma-project/telemetry-manager/test/testkit/unique" @@ -31,7 +32,7 @@ func TestSecretMissing(t *testing.T) { secretName = uniquePrefix() ) - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(endpointKey, endpointValue)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(endpointKey, endpointValue)) pipeline := testutils.NewTracePipelineBuilder(). WithName(pipelineName). @@ -46,9 +47,6 @@ func TestSecretMissing(t *testing.T) { &pipeline, } - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.TracePipelineHasCondition(t, pipelineName, metav1.Condition{ diff --git a/test/e2e/traces/secret_rotation_test.go b/test/e2e/traces/secret_rotation_test.go index dd9f1d8d0c..23dea8eb19 100644 --- a/test/e2e/traces/secret_rotation_test.go +++ b/test/e2e/traces/secret_rotation_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" @@ -35,7 +36,7 @@ func TestSecretRotation(t *testing.T) { backend := kitbackend.New(backendNs, kitbackend.SignalTypeTraces) // Initially, create a secret with an incorrect endpoint - secret := kitk8s.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8s.WithStringData(endpointKey, endpointValue)) + secret := kitk8sobjects.NewOpaqueSecret(secretName, kitkyma.DefaultNamespaceName, kitk8sobjects.WithStringData(endpointKey, endpointValue)) pipeline := testutils.NewTracePipelineBuilder(). WithName(pipelineName). @@ -47,17 +48,14 @@ func TestSecretRotation(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, telemetrygen.NewPod(genNs, telemetrygen.SignalTypeTraces).K8sObject(), secret.K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) @@ -66,7 +64,7 @@ func TestSecretRotation(t *testing.T) { assert.TracesFromNamespacesNotDelivered(t, backend, []string{genNs}) // Update the secret to have the correct backend endpoint - secret.UpdateSecret(kitk8s.WithStringData(endpointKey, backend.Endpoint())) + secret.UpdateSecret(kitk8sobjects.WithStringData(endpointKey, backend.Endpoint())) Expect(kitk8s.UpdateObjects(t, secret.K8sObject())).To(Succeed()) assert.DeploymentReady(t, kitkyma.TraceGatewayName) diff --git a/test/e2e/traces/service_name_test.go b/test/e2e/traces/service_name_test.go index 7fbdc73818..886fd31aa7 100644 --- a/test/e2e/traces/service_name_test.go +++ b/test/e2e/traces/service_name_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/trace" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -50,18 +51,15 @@ func TestServiceName(t *testing.T) { telemetrygen.WithServiceName(unknownServicePatternName)) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, - kitk8s.NewPod(podWithNoLabelsName, genNs).WithPodSpec(podSpecWithUndefinedService).K8sObject(), - kitk8s.NewPod(podWithUnknownServiceName, genNs).WithPodSpec(podSpecWithUnknownService).K8sObject(), - kitk8s.NewPod(podWithUnknownServicePatternName, genNs).WithPodSpec(podSpecWithUnknownServicePattern).K8sObject(), + kitk8sobjects.NewPod(podWithNoLabelsName, genNs).WithPodSpec(podSpecWithUndefinedService).K8sObject(), + kitk8sobjects.NewPod(podWithUnknownServiceName, genNs).WithPodSpec(podSpecWithUnknownService).K8sObject(), + kitk8sobjects.NewPod(podWithUnknownServicePatternName, genNs).WithPodSpec(podSpecWithUnknownServicePattern).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/traces/single_pipeline_test.go b/test/e2e/traces/single_pipeline_test.go index 9f9b4a9cda..fd7c396842 100644 --- a/test/e2e/traces/single_pipeline_test.go +++ b/test/e2e/traces/single_pipeline_test.go @@ -10,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" @@ -34,16 +35,13 @@ func TestSinglePipeline(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, telemetrygen.NewPod(genNs, telemetrygen.SignalTypeTraces).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/traces/single_pipeline_v1beta1_test.go b/test/e2e/traces/single_pipeline_v1beta1_test.go index 87fb45a4e9..e81cad94b1 100644 --- a/test/e2e/traces/single_pipeline_v1beta1_test.go +++ b/test/e2e/traces/single_pipeline_v1beta1_test.go @@ -11,6 +11,7 @@ import ( "github.com/kyma-project/telemetry-manager/internal/otelcollector/ports" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" @@ -45,16 +46,13 @@ func TestSinglePipelineV1Beta1(t *testing.T) { } resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, telemetrygen.NewPod(genNs, telemetrygen.SignalTypeTraces).K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/traces/transform_invalid_test.go b/test/e2e/traces/transform_invalid_test.go index d34f15ca60..5e6ecf4266 100644 --- a/test/e2e/traces/transform_invalid_test.go +++ b/test/e2e/traces/transform_invalid_test.go @@ -28,8 +28,5 @@ func TestTransformInvalid(t *testing.T) { WithOTLPOutput(testutils.OTLPEndpoint("https://backend.example.com:4317")). Build() - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(&pipeline)).Should(MatchError(ContainSubstring("not found"))) - }) Expect(kitk8s.CreateObjects(t, &pipeline)).ToNot(Succeed()) } diff --git a/test/e2e/traces/transform_test.go b/test/e2e/traces/transform_test.go index 9650307f7f..4a0a6f8221 100644 --- a/test/e2e/traces/transform_test.go +++ b/test/e2e/traces/transform_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/trace" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -87,16 +88,13 @@ func TestTransform(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, tt.tranceGen(genNs), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/e2e/upgrade/logs_fluentbit_upgrade_test.go b/test/e2e/upgrade/logs_fluentbit_upgrade_test.go index 564ad99237..f22c2b27fe 100644 --- a/test/e2e/upgrade/logs_fluentbit_upgrade_test.go +++ b/test/e2e/upgrade/logs_fluentbit_upgrade_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen" @@ -35,8 +36,8 @@ func TestLogsFluentBitUpgrade(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, stdoutloggen.NewDeployment(genNs).K8sObject(), } diff --git a/test/e2e/upgrade/logs_upgrade_test.go b/test/e2e/upgrade/logs_upgrade_test.go index 4971811dab..451fdedcf5 100644 --- a/test/e2e/upgrade/logs_upgrade_test.go +++ b/test/e2e/upgrade/logs_upgrade_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/stdoutloggen" @@ -35,8 +36,8 @@ func TestLogsUpgrade(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, stdoutloggen.NewDeployment(genNs).K8sObject(), } diff --git a/test/e2e/upgrade/metrics_upgrade_test.go b/test/e2e/upgrade/metrics_upgrade_test.go index 617393dd9b..d2b5367a95 100644 --- a/test/e2e/upgrade/metrics_upgrade_test.go +++ b/test/e2e/upgrade/metrics_upgrade_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" @@ -35,8 +36,8 @@ func TestMetricsUpgrade(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, telemetrygen.NewPod(genNs, telemetrygen.SignalTypeMetrics).K8sObject(), } diff --git a/test/e2e/upgrade/traces_upgrade_test.go b/test/e2e/upgrade/traces_upgrade_test.go index 53a77ff5c0..058d44149a 100644 --- a/test/e2e/upgrade/traces_upgrade_test.go +++ b/test/e2e/upgrade/traces_upgrade_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" @@ -35,8 +36,8 @@ func TestTracesUpgrade(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &pipeline, telemetrygen.NewPod(genNs, telemetrygen.SignalTypeTraces).K8sObject(), } diff --git a/test/integration/istio/access_logs_otlp_test.go b/test/integration/istio/access_logs_otlp_test.go index f92138bcc3..d59908be44 100644 --- a/test/integration/istio/access_logs_otlp_test.go +++ b/test/integration/istio/access_logs_otlp_test.go @@ -16,6 +16,7 @@ import ( "github.com/kyma-project/telemetry-manager/test/testkit/assert" "github.com/kyma-project/telemetry-manager/test/testkit/istio" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -52,7 +53,7 @@ func TestAccessLogsOTLP(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs, kitk8s.WithIstioInjection()).K8sObject(), + kitk8sobjects.NewNamespace(backendNs, kitk8sobjects.WithIstioInjection()).K8sObject(), &logPipeline, &tracePipeline, sampleApp.Pod().K8sObject(), @@ -61,7 +62,6 @@ func TestAccessLogsOTLP(t *testing.T) { resources = append(resources, traceBackend.K8sObjects()...) t.Cleanup(func() { - require.NoError(t, kitk8s.DeleteObjects(resources...)) resetAccessLogsProvider(t) // TODO: Remove this once the bug https://github.com/kyma-project/istio/issues/1481 fixed }) require.NoError(t, kitk8s.CreateObjects(t, resources...)) diff --git a/test/integration/istio/access_logs_test.go b/test/integration/istio/access_logs_test.go index d161fc3ca8..6fb9080966 100644 --- a/test/integration/istio/access_logs_test.go +++ b/test/integration/istio/access_logs_test.go @@ -13,6 +13,7 @@ import ( "github.com/kyma-project/telemetry-manager/test/testkit/assert" "github.com/kyma-project/telemetry-manager/test/testkit/istio" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -43,15 +44,12 @@ func TestAccessLogsFluentBit(t *testing.T) { metricPodURL := suite.ProxyClient.ProxyURLForPod(permissiveNs, sampleApp.Name(), sampleApp.MetricsEndpoint(), sampleApp.MetricsPort()) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), &logPipeline, sampleApp.Pod().K8sObject(), } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - require.NoError(t, kitk8s.DeleteObjects(resources...)) - }) require.NoError(t, kitk8s.CreateObjects(t, resources...)) assert.BackendReachable(t, backend) diff --git a/test/integration/istio/metrics_envoy_multi_pipeline_test.go b/test/integration/istio/metrics_envoy_multi_pipeline_test.go index 73af717f1a..e237a220c1 100644 --- a/test/integration/istio/metrics_envoy_multi_pipeline_test.go +++ b/test/integration/istio/metrics_envoy_multi_pipeline_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -46,9 +47,9 @@ func TestMetricsEnvoyMultiPipeline(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(app1Ns, kitk8s.WithIstioInjection()).K8sObject(), - kitk8s.NewNamespace(app2Ns, kitk8s.WithIstioInjection()).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(app1Ns, kitk8sobjects.WithIstioInjection()).K8sObject(), + kitk8sobjects.NewNamespace(app2Ns, kitk8sobjects.WithIstioInjection()).K8sObject(), &pipelineIncludeApp1Ns, &pipelineExcludeApp1Ns, } @@ -57,9 +58,6 @@ func TestMetricsEnvoyMultiPipeline(t *testing.T) { resources = append(resources, trafficgen.K8sObjects(app1Ns)...) resources = append(resources, trafficgen.K8sObjects(app2Ns)...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.DeploymentReady(t, kitkyma.MetricGatewayName) diff --git a/test/integration/istio/metrics_istio_input_envoy_test.go b/test/integration/istio/metrics_istio_input_envoy_test.go index 21e65c3e48..bdcaca671c 100644 --- a/test/integration/istio/metrics_istio_input_envoy_test.go +++ b/test/integration/istio/metrics_istio_input_envoy_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -42,16 +43,13 @@ func TestMetricsIstioInputEnvoy(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(app1Ns, kitk8s.WithIstioInjection()).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(app1Ns, kitk8sobjects.WithIstioInjection()).K8sObject(), &metricPipeline, } resources = append(resources, backend.K8sObjects()...) resources = append(resources, trafficgen.K8sObjects(app1Ns)...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/integration/istio/metrics_istio_input_test.go b/test/integration/istio/metrics_istio_input_test.go index aa6bbeb39d..8a8cc99516 100644 --- a/test/integration/istio/metrics_istio_input_test.go +++ b/test/integration/istio/metrics_istio_input_test.go @@ -11,6 +11,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -92,10 +93,10 @@ func TestMetricsIstioInput(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), - kitk8s.NewNamespace(app1Ns, kitk8s.WithIstioInjection()).K8sObject(), - kitk8s.NewNamespace(app2Ns, kitk8s.WithIstioInjection()).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(app1Ns, kitk8sobjects.WithIstioInjection()).K8sObject(), + kitk8sobjects.NewNamespace(app2Ns, kitk8sobjects.WithIstioInjection()).K8sObject(), &metricPipeline, &logPipeline, } @@ -105,9 +106,6 @@ func TestMetricsIstioInput(t *testing.T) { resources = append(resources, trafficgen.K8sObjects(app2Ns)...) resources = append(resources, telemetrygen.NewDeployment(genNs, telemetrygen.SignalTypeLogs).K8sObject()) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.DeploymentReady(t, kitkyma.MetricGatewayName) diff --git a/test/integration/istio/metrics_istio_same_port_test.go b/test/integration/istio/metrics_istio_same_port_test.go index 767310d864..16c98205f1 100644 --- a/test/integration/istio/metrics_istio_same_port_test.go +++ b/test/integration/istio/metrics_istio_same_port_test.go @@ -4,16 +4,15 @@ import ( "testing" . "github.com/onsi/gomega" - "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/prommetricgen" - "github.com/kyma-project/telemetry-manager/test/testkit/periodic" "github.com/kyma-project/telemetry-manager/test/testkit/suite" "github.com/kyma-project/telemetry-manager/test/testkit/unique" ) @@ -49,8 +48,8 @@ func TestMetricsIstioSamePort(t *testing.T) { istiofiedGenerator := prommetricgen.New(istiofiedBackendNs, prommetricgen.WithMetricsPort(istiofiedBackend.Port())) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(istiofiedBackendNs, kitk8s.WithIstioInjection()).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(istiofiedBackendNs, kitk8sobjects.WithIstioInjection()).K8sObject(), &metricPipeline, &istiofiedMetricPipeline, generator.Pod().WithPrometheusAnnotations(prommetricgen.SchemeHTTP).WithAvalancheLowLoad().K8sObject(), @@ -61,17 +60,6 @@ func TestMetricsIstioSamePort(t *testing.T) { resources = append(resources, backend.K8sObjects()...) resources = append(resources, istiofiedBackend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - - for _, resource := range resources { - Eventually(func(g Gomega) { - key := types.NamespacedName{Name: resource.GetName(), Namespace: resource.GetNamespace()} - err := suite.K8sClient.Get(suite.Ctx, key, resource) - g.Expect(err == nil).To(BeFalse()) - }, periodic.EventuallyTimeout, periodic.DefaultInterval).Should(Succeed()) - } - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.DeploymentReady(t, kitkyma.MetricGatewayName) diff --git a/test/integration/istio/metrics_otlp_input_test.go b/test/integration/istio/metrics_otlp_input_test.go index c4e39a1659..52f9af51bc 100644 --- a/test/integration/istio/metrics_otlp_input_test.go +++ b/test/integration/istio/metrics_otlp_input_test.go @@ -4,16 +4,15 @@ import ( "testing" . "github.com/onsi/gomega" - "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/telemetrygen" - "github.com/kyma-project/telemetry-manager/test/testkit/periodic" "github.com/kyma-project/telemetry-manager/test/testkit/suite" "github.com/kyma-project/telemetry-manager/test/testkit/unique" ) @@ -42,33 +41,22 @@ func TestMetricsOTLPInput(t *testing.T) { WithOTLPOutput(testutils.OTLPEndpoint(istiofiedBackend.Endpoint())). Build() - peerAuth := kitk8s.NewPeerAuthentication(kitbackend.DefaultName, istiofiedBackendNs) + peerAuth := kitk8sobjects.NewPeerAuthentication(kitbackend.DefaultName, istiofiedBackendNs) podSpec := telemetrygen.PodSpec(telemetrygen.SignalTypeMetrics) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(istiofiedBackendNs, kitk8s.WithIstioInjection()).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(istiofiedBackendNs, kitk8sobjects.WithIstioInjection()).K8sObject(), &metricPipeline, &metricPipelineIstiofiedBackend, - peerAuth.K8sObject(kitk8s.WithLabel("app", kitbackend.DefaultName)), - kitk8s.NewDeployment("metric-producer-1", backendNs).WithPodSpec(podSpec).K8sObject(), - kitk8s.NewDeployment("metric-producer-2", istiofiedBackendNs).WithPodSpec(podSpec).K8sObject(), + peerAuth.K8sObject(kitk8sobjects.WithLabel("app", kitbackend.DefaultName)), + kitk8sobjects.NewDeployment("metric-producer-1", backendNs).WithPodSpec(podSpec).K8sObject(), + kitk8sobjects.NewDeployment("metric-producer-2", istiofiedBackendNs).WithPodSpec(podSpec).K8sObject(), } resources = append(resources, backend.K8sObjects()...) resources = append(resources, istiofiedBackend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - - for _, resource := range resources { - Eventually(func(g Gomega) { - key := types.NamespacedName{Name: resource.GetName(), Namespace: resource.GetNamespace()} - err := suite.K8sClient.Get(suite.Ctx, key, resource) - g.Expect(err == nil).To(BeFalse()) - }, periodic.EventuallyTimeout, periodic.DefaultInterval).Should(Succeed()) - } - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.DeploymentReady(t, kitkyma.MetricGatewayName) diff --git a/test/integration/istio/metrics_prometheus_input_test.go b/test/integration/istio/metrics_prometheus_input_test.go index 4db1e34322..e8cb8c6760 100644 --- a/test/integration/istio/metrics_prometheus_input_test.go +++ b/test/integration/istio/metrics_prometheus_input_test.go @@ -10,6 +10,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -45,8 +46,8 @@ func TestMetricsPrometheusInput(t *testing.T) { Build() resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), &metricPipeline, httpsAnnotatedMetricProducer.Pod().WithSidecarInjection().WithPrometheusAnnotations(prommetricgen.SchemeHTTPS).K8sObject(), httpsAnnotatedMetricProducer.Service().WithPrometheusAnnotations(prommetricgen.SchemeHTTPS).K8sObject(), @@ -57,9 +58,6 @@ func TestMetricsPrometheusInput(t *testing.T) { } resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.DeploymentReady(t, kitkyma.MetricGatewayName) diff --git a/test/integration/istio/traces_routing_test.go b/test/integration/istio/traces_routing_test.go index e46bc65f82..4a8d3c4211 100644 --- a/test/integration/istio/traces_routing_test.go +++ b/test/integration/istio/traces_routing_test.go @@ -10,9 +10,9 @@ import ( "github.com/kyma-project/telemetry-manager/internal/otelcollector/ports" testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" - "github.com/kyma-project/telemetry-manager/test/testkit" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/trace" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -56,7 +56,7 @@ func TestTracesRouting(t *testing.T) { WithOTLPOutput(testutils.OTLPEndpoint(istiofiedBackend.Endpoint())). Build() - traceGatewayExternalService := kitk8s.NewService("telemetry-otlp-traces-external", kitkyma.SystemNamespaceName). + traceGatewayExternalService := kitk8sobjects.NewService("telemetry-otlp-traces-external", kitkyma.SystemNamespaceName). WithPort("grpc-otlp", ports.OTLPGRPC). WithPort("http-metrics", ports.Metrics) metricServiceURL := suite.ProxyClient.ProxyURLForService(kitkyma.SystemNamespaceName, "telemetry-otlp-traces-external", "metrics", ports.Metrics) @@ -68,21 +68,18 @@ func TestTracesRouting(t *testing.T) { istiofiedAppURL := istiofiedApp.PodURL(suite.ProxyClient) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(istiofiedBackendNs, kitk8s.WithIstioInjection()).K8sObject(), - kitk8s.NewNamespace(appNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(istiofiedBackendNs, kitk8sobjects.WithIstioInjection()).K8sObject(), + kitk8sobjects.NewNamespace(appNs).K8sObject(), &istioTracePipeline, &tracePipeline, - traceGatewayExternalService.K8sObject(kitk8s.WithLabel("app.kubernetes.io/name", "telemetry-trace-gateway")), + traceGatewayExternalService.K8sObject(kitk8sobjects.WithLabel("app.kubernetes.io/name", "telemetry-trace-gateway")), app.Pod().K8sObject(), istiofiedApp.Pod().K8sObject(), } resources = append(resources, backend.K8sObjects()...) resources = append(resources, istiofiedBackend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) @@ -125,7 +122,7 @@ func TestTracesRouting(t *testing.T) { assertNoIstioNoiseSpans(t, istiofiedBackend) } -func assertSidecarPresent(t testkit.T, namespace string, labelSelector map[string]string) { +func assertSidecarPresent(t *testing.T, namespace string, labelSelector map[string]string) { t.Helper() Eventually(func(g Gomega) { @@ -140,7 +137,7 @@ func assertSidecarPresent(t testkit.T, namespace string, labelSelector map[strin }, periodic.EventuallyTimeout*2, periodic.DefaultInterval).Should(Succeed()) } -func assertAppIsRunning(t testkit.T, namespace string, labelSelector map[string]string) { +func assertAppIsRunning(t *testing.T, namespace string, labelSelector map[string]string) { t.Helper() listOptions := client.ListOptions{ @@ -151,7 +148,7 @@ func assertAppIsRunning(t testkit.T, namespace string, labelSelector map[string] assert.PodsReady(t, listOptions) } -func assertIstioSpans(t testkit.T, backend *kitbackend.Backend, namespace string) { +func assertIstioSpans(t *testing.T, backend *kitbackend.Backend, namespace string) { t.Helper() assert.BackendDataEventuallyMatches(t, backend, @@ -163,7 +160,7 @@ func assertIstioSpans(t testkit.T, backend *kitbackend.Backend, namespace string ) } -func assertNoIstioNoiseSpans(t testkit.T, backend *kitbackend.Backend) { +func assertNoIstioNoiseSpans(t *testing.T, backend *kitbackend.Backend) { t.Helper() assert.BackendDataEventuallyMatches(t, backend, @@ -176,7 +173,7 @@ func assertNoIstioNoiseSpans(t testkit.T, backend *kitbackend.Backend) { ) } -func assertCustomAppSpans(t testkit.T, backend *kitbackend.Backend, name, namespace string) { +func assertCustomAppSpans(t *testing.T, backend *kitbackend.Backend, name, namespace string) { t.Helper() assert.BackendDataEventuallyMatches(t, backend, diff --git a/test/selfmonitor/backpressure_test.go b/test/selfmonitor/backpressure_test.go index 43b69949ae..ae45ede379 100644 --- a/test/selfmonitor/backpressure_test.go +++ b/test/selfmonitor/backpressure_test.go @@ -12,6 +12,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/prommetricgen" @@ -251,16 +252,13 @@ func TestBackpressure(t *testing.T) { generator := tc.generator(genNs) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), pipeline, } resources = append(resources, generator...) resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/selfmonitor/healthy_test.go b/test/selfmonitor/healthy_test.go index 209aad5128..604bfaa4c6 100644 --- a/test/selfmonitor/healthy_test.go +++ b/test/selfmonitor/healthy_test.go @@ -9,6 +9,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/prommetricgen" @@ -183,16 +184,13 @@ func TestHealthy(t *testing.T) { generator := tc.generator(genNs) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), pipeline, } resources = append(resources, generator...) resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.BackendReachable(t, backend) diff --git a/test/selfmonitor/outage_test.go b/test/selfmonitor/outage_test.go index 32d6e146d8..1db5de5bbe 100644 --- a/test/selfmonitor/outage_test.go +++ b/test/selfmonitor/outage_test.go @@ -12,6 +12,7 @@ import ( testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/assert" kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/mocks/prommetricgen" @@ -258,16 +259,13 @@ func TestOutage(t *testing.T) { generator := tc.generator(genNs) resources := []client.Object{ - kitk8s.NewNamespace(backendNs).K8sObject(), - kitk8s.NewNamespace(genNs).K8sObject(), + kitk8sobjects.NewNamespace(backendNs).K8sObject(), + kitk8sobjects.NewNamespace(genNs).K8sObject(), pipeline, } resources = append(resources, generator...) resources = append(resources, backend.K8sObjects()...) - t.Cleanup(func() { - Expect(kitk8s.DeleteObjects(resources...)).To(Succeed()) - }) Expect(kitk8s.CreateObjects(t, resources...)).To(Succeed()) assert.DeploymentReady(t, kitkyma.SelfMonitorName) diff --git a/test/testkit/assert/backend.go b/test/testkit/assert/backend.go index acbdbc0d85..081c4b8c12 100644 --- a/test/testkit/assert/backend.go +++ b/test/testkit/assert/backend.go @@ -3,12 +3,12 @@ package assert import ( "fmt" "net/http" + "testing" "time" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" - "github.com/kyma-project/telemetry-manager/test/testkit" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/periodic" "github.com/kyma-project/telemetry-manager/test/testkit/suite" @@ -63,7 +63,7 @@ func WithCustomQueryInterval(interval time.Duration) BackendAssertionOption { // BackendReachable asserts that the given backend is reachable via the proxy client. // TODO(TeodorSAP): Refactor this function to directly call BackendDataEventuallyMatches with custom query interval. -func BackendReachable(t testkit.T, backend *kitbackend.Backend) { +func BackendReachable(t *testing.T, backend *kitbackend.Backend) { t.Helper() const queryInterval = time.Second * 5 @@ -79,7 +79,7 @@ func BackendReachable(t testkit.T, backend *kitbackend.Backend) { }, periodic.EventuallyTimeout, queryInterval).Should(Succeed(), "Backend should be reachable at %s", queryURL) } -func BackendDataEventuallyMatches(t testkit.T, backend *kitbackend.Backend, httpBodyMatcher types.GomegaMatcher, assertionOptions ...BackendAssertionOption) { +func BackendDataEventuallyMatches(t *testing.T, backend *kitbackend.Backend, httpBodyMatcher types.GomegaMatcher, assertionOptions ...BackendAssertionOption) { t.Helper() assertionOptions = append(assertionOptions, WithOptionalDescription(fmt.Sprintf("Backend data did not match the expected condition. Backend: %s/%s", backend.Namespace(), backend.Name()))) @@ -88,7 +88,7 @@ func BackendDataEventuallyMatches(t testkit.T, backend *kitbackend.Backend, http HTTPResponseEventuallyMatches(t, queryURL, httpBodyMatcher, assertionOptions...) } -func BackendDataConsistentlyMatches(t testkit.T, backend *kitbackend.Backend, httpBodyMatcher types.GomegaMatcher, assertionOptions ...BackendAssertionOption) { +func BackendDataConsistentlyMatches(t *testing.T, backend *kitbackend.Backend, httpBodyMatcher types.GomegaMatcher, assertionOptions ...BackendAssertionOption) { t.Helper() assertionOptions = append(assertionOptions, WithOptionalDescription(fmt.Sprintf("Backend data did not match the expected condition. Backend: %s/%s", backend.Namespace(), backend.Name()))) @@ -98,7 +98,7 @@ func BackendDataConsistentlyMatches(t testkit.T, backend *kitbackend.Backend, ht } //nolint:dupl // This function is similar to BackendDataEventuallyMatches but uses Eventually instead of Consistently. -func HTTPResponseEventuallyMatches(t testkit.T, queryURL string, httpBodyMatcher types.GomegaMatcher, assertionOptions ...BackendAssertionOption) { +func HTTPResponseEventuallyMatches(t *testing.T, queryURL string, httpBodyMatcher types.GomegaMatcher, assertionOptions ...BackendAssertionOption) { t.Helper() backendAssertion := newBackendAssertion(false, assertionOptions...) @@ -115,7 +115,7 @@ func HTTPResponseEventuallyMatches(t testkit.T, queryURL string, httpBodyMatcher } //nolint:dupl // This function is similar to HTTPResponseEventuallyMatches but uses Consistently instead of Eventually. -func HTTPResponseConsistentlyMatches(t testkit.T, queryURL string, httpBodyMatcher types.GomegaMatcher, assertionOptions ...BackendAssertionOption) { +func HTTPResponseConsistentlyMatches(t *testing.T, queryURL string, httpBodyMatcher types.GomegaMatcher, assertionOptions ...BackendAssertionOption) { t.Helper() backendAssertion := newBackendAssertion(true, assertionOptions...) diff --git a/test/testkit/assert/logs.go b/test/testkit/assert/logs.go index dbffdc4f43..231509cf59 100644 --- a/test/testkit/assert/logs.go +++ b/test/testkit/assert/logs.go @@ -1,6 +1,7 @@ package assert import ( + "testing" "time" . "github.com/onsi/gomega" @@ -11,7 +12,6 @@ import ( telemetryv1alpha1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1alpha1" "github.com/kyma-project/telemetry-manager/internal/conditions" - "github.com/kyma-project/telemetry-manager/test/testkit" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log" "github.com/kyma-project/telemetry-manager/test/testkit/matchers/log/fluentbit" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" @@ -19,7 +19,7 @@ import ( "github.com/kyma-project/telemetry-manager/test/testkit/suite" ) -func FluentBitLogsFromContainerDelivered(t testkit.T, backend *kitbackend.Backend, expectedContainerName string, optionalDescription ...any) { +func FluentBitLogsFromContainerDelivered(t *testing.T, backend *kitbackend.Backend, expectedContainerName string, optionalDescription ...any) { t.Helper() BackendDataEventuallyMatches( @@ -30,7 +30,7 @@ func FluentBitLogsFromContainerDelivered(t testkit.T, backend *kitbackend.Backen ) } -func FluentBitLogsFromContainerNotDelivered(t testkit.T, backend *kitbackend.Backend, expectedContainerName string, optionalDescription ...any) { +func FluentBitLogsFromContainerNotDelivered(t *testing.T, backend *kitbackend.Backend, expectedContainerName string, optionalDescription ...any) { t.Helper() BackendDataConsistentlyMatches( @@ -41,7 +41,7 @@ func FluentBitLogsFromContainerNotDelivered(t testkit.T, backend *kitbackend.Bac ) } -func FluentBitLogsFromPodDelivered(t testkit.T, backend *kitbackend.Backend, expectedPodNamePrefix string, optionalDescription ...any) { +func FluentBitLogsFromPodDelivered(t *testing.T, backend *kitbackend.Backend, expectedPodNamePrefix string, optionalDescription ...any) { t.Helper() BackendDataEventuallyMatches( @@ -52,7 +52,7 @@ func FluentBitLogsFromPodDelivered(t testkit.T, backend *kitbackend.Backend, exp ) } -func FluentBitLogsFromNamespaceDelivered(t testkit.T, backend *kitbackend.Backend, namespace string, optionalDescription ...any) { +func FluentBitLogsFromNamespaceDelivered(t *testing.T, backend *kitbackend.Backend, namespace string, optionalDescription ...any) { t.Helper() BackendDataEventuallyMatches( @@ -63,7 +63,7 @@ func FluentBitLogsFromNamespaceDelivered(t testkit.T, backend *kitbackend.Backen ) } -func FluentBitLogsFromNamespaceNotDelivered(t testkit.T, backend *kitbackend.Backend, namespace string, optionalDescription ...any) { +func FluentBitLogsFromNamespaceNotDelivered(t *testing.T, backend *kitbackend.Backend, namespace string, optionalDescription ...any) { t.Helper() BackendDataConsistentlyMatches( @@ -74,7 +74,7 @@ func FluentBitLogsFromNamespaceNotDelivered(t testkit.T, backend *kitbackend.Bac ) } -func OTelLogsFromContainerDelivered(t testkit.T, backend *kitbackend.Backend, containerName string, optionalDescription ...any) { +func OTelLogsFromContainerDelivered(t *testing.T, backend *kitbackend.Backend, containerName string, optionalDescription ...any) { t.Helper() BackendDataEventuallyMatches( @@ -85,7 +85,7 @@ func OTelLogsFromContainerDelivered(t testkit.T, backend *kitbackend.Backend, co ) } -func OTelLogsFromContainerNotDelivered(t testkit.T, backend *kitbackend.Backend, containerName string, optionalDescription ...any) { +func OTelLogsFromContainerNotDelivered(t *testing.T, backend *kitbackend.Backend, containerName string, optionalDescription ...any) { t.Helper() BackendDataConsistentlyMatches( @@ -96,7 +96,7 @@ func OTelLogsFromContainerNotDelivered(t testkit.T, backend *kitbackend.Backend, ) } -func OTelLogsFromNamespaceDelivered(t testkit.T, backend *kitbackend.Backend, namespace string, optionalDescription ...any) { +func OTelLogsFromNamespaceDelivered(t *testing.T, backend *kitbackend.Backend, namespace string, optionalDescription ...any) { t.Helper() BackendDataEventuallyMatches( @@ -107,7 +107,7 @@ func OTelLogsFromNamespaceDelivered(t testkit.T, backend *kitbackend.Backend, na ) } -func OTelLogsFromNamespaceNotDelivered(t testkit.T, backend *kitbackend.Backend, namespace string, optionalDescription ...any) { +func OTelLogsFromNamespaceNotDelivered(t *testing.T, backend *kitbackend.Backend, namespace string, optionalDescription ...any) { t.Helper() BackendDataConsistentlyMatches( @@ -118,7 +118,7 @@ func OTelLogsFromNamespaceNotDelivered(t testkit.T, backend *kitbackend.Backend, ) } -func OTelLogsFromPodNotDelivered(t testkit.T, backend *kitbackend.Backend, podNamePrefix string, optionalDescription ...any) { +func OTelLogsFromPodNotDelivered(t *testing.T, backend *kitbackend.Backend, podNamePrefix string, optionalDescription ...any) { t.Helper() BackendDataConsistentlyMatches( @@ -129,7 +129,7 @@ func OTelLogsFromPodNotDelivered(t testkit.T, backend *kitbackend.Backend, podNa ) } -func OTelLogsFromPodDelivered(t testkit.T, backend *kitbackend.Backend, podNamePrefix string, optionalDescription ...any) { +func OTelLogsFromPodDelivered(t *testing.T, backend *kitbackend.Backend, podNamePrefix string, optionalDescription ...any) { t.Helper() BackendDataEventuallyMatches( @@ -141,7 +141,7 @@ func OTelLogsFromPodDelivered(t testkit.T, backend *kitbackend.Backend, podNameP } //nolint:dupl //LogPipelineHealthy and MetricPipelineHealthy have similarities, but they are not the same -func FluentBitLogPipelineHealthy(t testkit.T, pipelineName string) { +func FluentBitLogPipelineHealthy(t *testing.T, pipelineName string) { t.Helper() Eventually(func(g Gomega) { @@ -156,7 +156,7 @@ func FluentBitLogPipelineHealthy(t testkit.T, pipelineName string) { } //nolint:dupl //LogPipelineOtelHealthy and LogPipelineHealthy have similarities, but they are not the same -func OTelLogPipelineHealthy(t testkit.T, pipelineName string) { +func OTelLogPipelineHealthy(t *testing.T, pipelineName string) { t.Helper() Eventually(func(g Gomega) { @@ -178,7 +178,7 @@ func statusConditionHealthy(g Gomega, pipeline telemetryv1alpha1.LogPipeline, co } //nolint:dupl // This provides a better readability for the test as we can test the TLS condition in a clear way -func LogPipelineHasCondition(t testkit.T, pipelineName string, expectedCond metav1.Condition) { +func LogPipelineHasCondition(t *testing.T, pipelineName string, expectedCond metav1.Condition) { t.Helper() Eventually(func(g Gomega) { @@ -194,7 +194,7 @@ func LogPipelineHasCondition(t testkit.T, pipelineName string, expectedCond meta } //nolint:dupl //LogPipelineConditionReasonsTransition,TracePipelineConditionReasonsTransition, MetricPipelineConditionReasonsTransition have similarities, but they are not the same -func LogPipelineConditionReasonsTransition(t testkit.T, pipelineName, condType string, expected []ReasonStatus) { +func LogPipelineConditionReasonsTransition(t *testing.T, pipelineName, condType string, expected []ReasonStatus) { t.Helper() var currCond *metav1.Condition @@ -220,7 +220,7 @@ func LogPipelineConditionReasonsTransition(t testkit.T, pipelineName, condType s } } -func LogPipelineUnsupportedMode(t testkit.T, pipelineName string, isUnsupportedMode bool) { +func LogPipelineUnsupportedMode(t *testing.T, pipelineName string, isUnsupportedMode bool) { t.Helper() Eventually(func(g Gomega) { @@ -233,7 +233,7 @@ func LogPipelineUnsupportedMode(t testkit.T, pipelineName string, isUnsupportedM } //nolint:dupl // TODO: Find a generic approach to merge this helper function with the other ones for the other telemetry types -func LogPipelineSelfMonitorIsHealthy(t testkit.T, k8sClient client.Client, pipelineName string) { +func LogPipelineSelfMonitorIsHealthy(t *testing.T, k8sClient client.Client, pipelineName string) { t.Helper() Eventually(func(g Gomega) { diff --git a/test/testkit/assert/metrics.go b/test/testkit/assert/metrics.go index a98cd54d94..55731362fe 100644 --- a/test/testkit/assert/metrics.go +++ b/test/testkit/assert/metrics.go @@ -1,6 +1,7 @@ package assert import ( + "testing" "time" . "github.com/onsi/gomega" @@ -11,14 +12,13 @@ import ( telemetryv1alpha1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1alpha1" "github.com/kyma-project/telemetry-manager/internal/conditions" - "github.com/kyma-project/telemetry-manager/test/testkit" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/metric" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/periodic" "github.com/kyma-project/telemetry-manager/test/testkit/suite" ) -func MetricsFromNamespaceDelivered(t testkit.T, backend *kitbackend.Backend, namespace string, metricNames []string) { +func MetricsFromNamespaceDelivered(t *testing.T, backend *kitbackend.Backend, namespace string, metricNames []string) { t.Helper() BackendDataEventuallyMatches( @@ -31,7 +31,7 @@ func MetricsFromNamespaceDelivered(t testkit.T, backend *kitbackend.Backend, nam ) } -func MetricsFromNamespaceNotDelivered(t testkit.T, backend *kitbackend.Backend, namespace string) { +func MetricsFromNamespaceNotDelivered(t *testing.T, backend *kitbackend.Backend, namespace string) { t.Helper() BackendDataConsistentlyMatches( @@ -43,7 +43,7 @@ func MetricsFromNamespaceNotDelivered(t testkit.T, backend *kitbackend.Backend, ) } -func MetricsWithScopeAndNamespaceNotDelivered(t testkit.T, backend *kitbackend.Backend, scope, namespace string, optionalDescription ...any) { +func MetricsWithScopeAndNamespaceNotDelivered(t *testing.T, backend *kitbackend.Backend, scope, namespace string, optionalDescription ...any) { t.Helper() BackendDataConsistentlyMatches( @@ -57,7 +57,7 @@ func MetricsWithScopeAndNamespaceNotDelivered(t testkit.T, backend *kitbackend.B ) } -func MetricPipelineHealthy(t testkit.T, pipelineName string) { +func MetricPipelineHealthy(t *testing.T, pipelineName string) { t.Helper() Eventually(func(g Gomega) { @@ -80,7 +80,7 @@ func MetricPipelineHealthy(t testkit.T, pipelineName string) { }, periodic.EventuallyTimeout, periodic.DefaultInterval).Should(Succeed()) } -func MetricPipelineHasCondition(t testkit.T, pipelineName string, expectedCond metav1.Condition) { +func MetricPipelineHasCondition(t *testing.T, pipelineName string, expectedCond metav1.Condition) { t.Helper() Eventually(func(g Gomega) { @@ -101,7 +101,7 @@ type ReasonStatus struct { } //nolint:dupl //LogPipelineConditionReasonsTransition,TracePipelineConditionReasonsTransition, MetricPipelineConditionReasonsTransition have similarities, but they are not the same -func MetricPipelineConditionReasonsTransition(t testkit.T, pipelineName, condType string, expected []ReasonStatus) { +func MetricPipelineConditionReasonsTransition(t *testing.T, pipelineName, condType string, expected []ReasonStatus) { t.Helper() var currCond *metav1.Condition @@ -128,7 +128,7 @@ func MetricPipelineConditionReasonsTransition(t testkit.T, pipelineName, condTyp } //nolint:dupl // TODO: Find a generic approach to merge this helper function with the other ones for the other telemetry types -func MetricPipelineSelfMonitorIsHealthy(t testkit.T, k8sClient client.Client, pipelineName string) { +func MetricPipelineSelfMonitorIsHealthy(t *testing.T, k8sClient client.Client, pipelineName string) { t.Helper() Eventually(func(g Gomega) { diff --git a/test/testkit/assert/monitoring.go b/test/testkit/assert/monitoring.go index cf7d3cf164..e50d1e07ec 100644 --- a/test/testkit/assert/monitoring.go +++ b/test/testkit/assert/monitoring.go @@ -2,19 +2,19 @@ package assert import ( "net/http" + "testing" "time" . "github.com/onsi/gomega" "github.com/onsi/gomega/types" - "github.com/kyma-project/telemetry-manager/test/testkit" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/prometheus" "github.com/kyma-project/telemetry-manager/test/testkit/periodic" "github.com/kyma-project/telemetry-manager/test/testkit/suite" ) -func EmitsFluentBitMetrics(t testkit.T, metricsURL string) { +func EmitsFluentBitMetrics(t *testing.T, metricsURL string) { t.Helper() HTTPResponseEventuallyMatches(t, metricsURL, HaveFlatMetricFamilies( @@ -22,7 +22,7 @@ func EmitsFluentBitMetrics(t testkit.T, metricsURL string) { )) } -func EmitsOTelCollectorMetrics(t testkit.T, metricsURL string) { +func EmitsOTelCollectorMetrics(t *testing.T, metricsURL string) { t.Helper() HTTPResponseEventuallyMatches(t, metricsURL, HaveFlatMetricFamilies( @@ -30,7 +30,7 @@ func EmitsOTelCollectorMetrics(t testkit.T, metricsURL string) { )) } -func EmitsManagerMetrics(t testkit.T, matchers ...types.GomegaMatcher) { +func EmitsManagerMetrics(t *testing.T, matchers ...types.GomegaMatcher) { t.Helper() Eventually(func(g Gomega) { diff --git a/test/testkit/assert/resources_generic.go b/test/testkit/assert/resources_generic.go index bf5804380c..19f5b41759 100644 --- a/test/testkit/assert/resources_generic.go +++ b/test/testkit/assert/resources_generic.go @@ -1,12 +1,13 @@ package assert import ( + "testing" + . "github.com/onsi/gomega" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kyma-project/telemetry-manager/test/testkit" "github.com/kyma-project/telemetry-manager/test/testkit/periodic" "github.com/kyma-project/telemetry-manager/test/testkit/suite" ) @@ -23,7 +24,7 @@ func NewResource(object client.Object, name types.NamespacedName) Resource { } } -func ResourcesExist(t testkit.T, resources ...Resource) { +func ResourcesExist(t *testing.T, resources ...Resource) { t.Helper() for _, resource := range resources { @@ -33,7 +34,7 @@ func ResourcesExist(t testkit.T, resources ...Resource) { } } -func ResourcesNotExist(t testkit.T, resources ...Resource) { +func ResourcesNotExist(t *testing.T, resources ...Resource) { t.Helper() for _, resource := range resources { diff --git a/test/testkit/assert/resources_workload.go b/test/testkit/assert/resources_workload.go index e8b39e01bc..36cef87468 100644 --- a/test/testkit/assert/resources_workload.go +++ b/test/testkit/assert/resources_workload.go @@ -2,6 +2,7 @@ package assert import ( "fmt" + "testing" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" @@ -12,22 +13,21 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kyma-project/telemetry-manager/test/testkit" "github.com/kyma-project/telemetry-manager/test/testkit/periodic" "github.com/kyma-project/telemetry-manager/test/testkit/suite" ) -func DeploymentReady(t testkit.T, name types.NamespacedName) { +func DeploymentReady(t *testing.T, name types.NamespacedName) { t.Helper() isReady(t, isDeploymentReady, name, "Deployment") } -func DaemonSetReady(t testkit.T, name types.NamespacedName) { +func DaemonSetReady(t *testing.T, name types.NamespacedName) { t.Helper() isReady(t, isDaemonSetReady, name, "DaemonSet") } -func DaemonSetNotFound(t testkit.T, name types.NamespacedName) { +func DaemonSetNotFound(t *testing.T, name types.NamespacedName) { t.Helper() Eventually(func(g Gomega) { _, err := isDaemonSetReady(t, name) @@ -36,22 +36,22 @@ func DaemonSetNotFound(t testkit.T, name types.NamespacedName) { }, periodic.EventuallyTimeout, periodic.DefaultInterval).Should(Succeed()) } -func StatefulSetReady(t testkit.T, name types.NamespacedName) { +func StatefulSetReady(t *testing.T, name types.NamespacedName) { t.Helper() isReady(t, isStatefulSetReady, name, "StatefulSet") } -func JobReady(t testkit.T, name types.NamespacedName) { +func JobReady(t *testing.T, name types.NamespacedName) { t.Helper() isReady(t, isJobSuccessful, name, "Job") } -func PodReady(t testkit.T, name types.NamespacedName) { +func PodReady(t *testing.T, name types.NamespacedName) { t.Helper() isReady(t, isPodReady, name, "Pod") } -func PodsReady(t testkit.T, listOptions client.ListOptions) { +func PodsReady(t *testing.T, listOptions client.ListOptions) { t.Helper() Eventually(func(g Gomega) { ready, err := arePodsReady(t, listOptions) @@ -60,7 +60,7 @@ func PodsReady(t testkit.T, listOptions client.ListOptions) { }, 2*periodic.EventuallyTimeout, periodic.DefaultInterval).Should(Succeed()) } -func PodsHaveContainer(t testkit.T, listOptions client.ListOptions, containerName string) (bool, error) { +func PodsHaveContainer(t *testing.T, listOptions client.ListOptions, containerName string) (bool, error) { t.Helper() var pods corev1.PodList @@ -87,12 +87,9 @@ func PodsHaveContainer(t testkit.T, listOptions client.ListOptions, containerNam return false, nil } -func isReady( - t testkit.T, - readinessCheck func(t testkit.T, name types.NamespacedName) (bool, error), - name types.NamespacedName, - resourceName string, -) { +type readinessCheckFunc func(t *testing.T, name types.NamespacedName) (bool, error) + +func isReady(t *testing.T, readinessCheck readinessCheckFunc, name types.NamespacedName, resourceName string) { t.Helper() Eventually(func(g Gomega) { ready, err := readinessCheck(t, name) @@ -101,7 +98,7 @@ func isReady( }, periodic.EventuallyTimeout, periodic.DefaultInterval).Should(Succeed()) } -func isDeploymentReady(t testkit.T, name types.NamespacedName) (bool, error) { +func isDeploymentReady(t *testing.T, name types.NamespacedName) (bool, error) { t.Helper() var deployment appsv1.Deployment @@ -119,7 +116,7 @@ func isDeploymentReady(t testkit.T, name types.NamespacedName) (bool, error) { return arePodsReady(t, listOptions) } -func isDaemonSetReady(t testkit.T, name types.NamespacedName) (bool, error) { +func isDaemonSetReady(t *testing.T, name types.NamespacedName) (bool, error) { t.Helper() var daemonSet appsv1.DaemonSet @@ -137,7 +134,7 @@ func isDaemonSetReady(t testkit.T, name types.NamespacedName) (bool, error) { return arePodsReady(t, listOptions) } -func isStatefulSetReady(t testkit.T, name types.NamespacedName) (bool, error) { +func isStatefulSetReady(t *testing.T, name types.NamespacedName) (bool, error) { t.Helper() var statefulSet appsv1.StatefulSet @@ -155,7 +152,7 @@ func isStatefulSetReady(t testkit.T, name types.NamespacedName) (bool, error) { return arePodsReady(t, listOptions) } -func isJobSuccessful(t testkit.T, name types.NamespacedName) (bool, error) { +func isJobSuccessful(t *testing.T, name types.NamespacedName) (bool, error) { t.Helper() var job batchv1.Job @@ -168,7 +165,7 @@ func isJobSuccessful(t testkit.T, name types.NamespacedName) (bool, error) { return job.Status.Active > 0, nil } -func isPodReady(t testkit.T, name types.NamespacedName) (bool, error) { +func isPodReady(t *testing.T, name types.NamespacedName) (bool, error) { t.Helper() var pod corev1.Pod @@ -187,7 +184,7 @@ func isPodReady(t testkit.T, name types.NamespacedName) (bool, error) { return true, nil } -func arePodsReady(t testkit.T, listOptions client.ListOptions) (bool, error) { +func arePodsReady(t *testing.T, listOptions client.ListOptions) (bool, error) { t.Helper() var pods corev1.PodList diff --git a/test/testkit/assert/secret.go b/test/testkit/assert/secret.go index 3120e24fac..4bdfd9ed99 100644 --- a/test/testkit/assert/secret.go +++ b/test/testkit/assert/secret.go @@ -2,18 +2,18 @@ package assert import ( "fmt" + "testing" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kyma-project/telemetry-manager/test/testkit" "github.com/kyma-project/telemetry-manager/test/testkit/periodic" "github.com/kyma-project/telemetry-manager/test/testkit/suite" ) -func SecretHasKeyValue(t testkit.T, name types.NamespacedName, dataKey, dataValue string) { +func SecretHasKeyValue(t *testing.T, name types.NamespacedName, dataKey, dataValue string) { t.Helper() Eventually(func(g Gomega) { @@ -27,7 +27,7 @@ func SecretHasKeyValue(t testkit.T, name types.NamespacedName, dataKey, dataValu }, periodic.EventuallyTimeout, periodic.DefaultInterval).Should(Succeed()) } -func secretExists(t testkit.T, k8sClient client.Client, name types.NamespacedName) (*corev1.Secret, error) { +func secretExists(t *testing.T, k8sClient client.Client, name types.NamespacedName) (*corev1.Secret, error) { t.Helper() var secret corev1.Secret diff --git a/test/testkit/assert/telemetry.go b/test/testkit/assert/telemetry.go index dc2e88e2d0..1ebfe743fa 100644 --- a/test/testkit/assert/telemetry.go +++ b/test/testkit/assert/telemetry.go @@ -1,6 +1,8 @@ package assert import ( + "testing" + . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -8,13 +10,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" operatorv1alpha1 "github.com/kyma-project/telemetry-manager/apis/operator/v1alpha1" - "github.com/kyma-project/telemetry-manager/test/testkit" kitkyma "github.com/kyma-project/telemetry-manager/test/testkit/kyma" "github.com/kyma-project/telemetry-manager/test/testkit/periodic" "github.com/kyma-project/telemetry-manager/test/testkit/suite" ) -func TelemetryCRExists(t testkit.T) { +func TelemetryCRExists(t *testing.T) { t.Helper() Eventually(func(g Gomega) { @@ -23,7 +24,7 @@ func TelemetryCRExists(t testkit.T) { }, periodic.EventuallyTimeout, periodic.DefaultInterval).Should(Succeed()) } -func TelemetryHasState(t testkit.T, expectedState operatorv1alpha1.State) { +func TelemetryHasState(t *testing.T, expectedState operatorv1alpha1.State) { t.Helper() Eventually(func(g Gomega) { @@ -33,7 +34,7 @@ func TelemetryHasState(t testkit.T, expectedState operatorv1alpha1.State) { }, periodic.EventuallyTimeout, periodic.DefaultInterval).Should(Succeed()) } -func TelemetryHasCondition(t testkit.T, k8sClient client.Client, expectedCond metav1.Condition) { +func TelemetryHasCondition(t *testing.T, k8sClient client.Client, expectedCond metav1.Condition) { t.Helper() Eventually(func(g Gomega) { diff --git a/test/testkit/assert/traces.go b/test/testkit/assert/traces.go index cdef7c46f9..0e5cc8a72e 100644 --- a/test/testkit/assert/traces.go +++ b/test/testkit/assert/traces.go @@ -1,6 +1,7 @@ package assert import ( + "testing" "time" . "github.com/onsi/gomega" @@ -11,14 +12,13 @@ import ( telemetryv1alpha1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1alpha1" "github.com/kyma-project/telemetry-manager/internal/conditions" - "github.com/kyma-project/telemetry-manager/test/testkit" . "github.com/kyma-project/telemetry-manager/test/testkit/matchers/trace" kitbackend "github.com/kyma-project/telemetry-manager/test/testkit/mocks/backend" "github.com/kyma-project/telemetry-manager/test/testkit/periodic" "github.com/kyma-project/telemetry-manager/test/testkit/suite" ) -func TracesFromNamespaceDelivered(t testkit.T, backend *kitbackend.Backend, namespace string) { +func TracesFromNamespaceDelivered(t *testing.T, backend *kitbackend.Backend, namespace string) { t.Helper() BackendDataEventuallyMatches( @@ -30,7 +30,7 @@ func TracesFromNamespaceDelivered(t testkit.T, backend *kitbackend.Backend, name ) } -func TracesFromNamespacesNotDelivered(t testkit.T, backend *kitbackend.Backend, namespaces []string) { +func TracesFromNamespacesNotDelivered(t *testing.T, backend *kitbackend.Backend, namespaces []string) { t.Helper() BackendDataConsistentlyMatches( @@ -42,7 +42,7 @@ func TracesFromNamespacesNotDelivered(t testkit.T, backend *kitbackend.Backend, ) } -func TracePipelineHealthy(t testkit.T, pipelineName string) { +func TracePipelineHealthy(t *testing.T, pipelineName string) { t.Helper() Eventually(func(g Gomega) { @@ -61,7 +61,7 @@ func TracePipelineHealthy(t testkit.T, pipelineName string) { }, periodic.EventuallyTimeout, periodic.DefaultInterval).Should(Succeed()) } -func TracePipelineHasCondition(t testkit.T, pipelineName string, expectedCond metav1.Condition) { +func TracePipelineHasCondition(t *testing.T, pipelineName string, expectedCond metav1.Condition) { t.Helper() Eventually(func(g Gomega) { @@ -77,7 +77,7 @@ func TracePipelineHasCondition(t testkit.T, pipelineName string, expectedCond me } //nolint:dupl //LogPipelineConditionReasonsTransition,TracePipelineConditionReasonsTransition, MetricPipelineConditionReasonsTransition have similarities, but they are not the same -func TracePipelineConditionReasonsTransition(t testkit.T, pipelineName, condType string, expected []ReasonStatus) { +func TracePipelineConditionReasonsTransition(t *testing.T, pipelineName, condType string, expected []ReasonStatus) { t.Helper() var currCond *metav1.Condition @@ -104,7 +104,7 @@ func TracePipelineConditionReasonsTransition(t testkit.T, pipelineName, condType } //nolint:dupl // TODO: Find a generic approach to merge this helper function with the other ones for the other telemetry types -func TracePipelineSelfMonitorIsHealthy(t testkit.T, k8sClient client.Client, pipelineName string) { +func TracePipelineSelfMonitorIsHealthy(t *testing.T, k8sClient client.Client, pipelineName string) { t.Helper() Eventually(func(g Gomega) { diff --git a/test/testkit/k8s/objects.go b/test/testkit/k8s/objects.go index 89bba21f2e..7508284fa1 100644 --- a/test/testkit/k8s/objects.go +++ b/test/testkit/k8s/objects.go @@ -5,25 +5,47 @@ import ( "context" "os" "reflect" + "slices" "strings" "testing" + "github.com/onsi/gomega" "gopkg.in/yaml.v3" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kyma-project/telemetry-manager/test/testkit" + operatorv1alpha1 "github.com/kyma-project/telemetry-manager/apis/operator/v1alpha1" + telemetryv1alpha1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1alpha1" + telemetryv1beta1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1beta1" + "github.com/kyma-project/telemetry-manager/test/testkit/assert" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" + "github.com/kyma-project/telemetry-manager/test/testkit/periodic" "github.com/kyma-project/telemetry-manager/test/testkit/suite" ) // CreateObjects creates k8s objects passed as a slice. -func CreateObjects(t testkit.T, resources ...client.Object) error { +func CreateObjects(t *testing.T, resources ...client.Object) error { t.Helper() - for _, resource := range resources { + // Sort resources: + // 1. namespaces + // 2. other resources + // 3. pipelines + sortedResources := sortObjects(resources) + + t.Cleanup(func() { + // Delete created objects after test completion. We dont care for not found errors here. + gomega.Expect(deleteObjectsIgnoringNotFound(resources...)).To(gomega.Succeed()) + gomega.Eventually(allObjectsDeleted(resources...), periodic.EventuallyTimeout).Should(gomega.Succeed()) + }) + + for _, resource := range sortedResources { // Skip object creation if it already exists. - if labelMatches(resource.GetLabels(), PersistentLabelName, "true") { + if hasPersistentLabel(resource.GetLabels()) { //nolint:errcheck // The value is guaranteed to be of type client.Object. existingResource := reflect.New(reflect.ValueOf(resource).Elem().Type()).Interface().(client.Object) if err := suite.K8sClient.Get( @@ -38,17 +60,89 @@ func CreateObjects(t testkit.T, resources ...client.Object) error { if err := suite.K8sClient.Create(t.Context(), resource); err != nil { return err } + + // assert object readiness + switch r := resource.(type) { + case *appsv1.Deployment: + assert.DeploymentReady(t, types.NamespacedName{Name: r.Name, Namespace: r.Namespace}) + case *appsv1.DaemonSet: + assert.DaemonSetReady(t, types.NamespacedName{Name: r.Name, Namespace: r.Namespace}) + case *appsv1.StatefulSet: + assert.StatefulSetReady(t, types.NamespacedName{Name: r.Name, Namespace: r.Namespace}) + case *corev1.Pod: + assert.PodReady(t, types.NamespacedName{Name: r.Name, Namespace: r.Namespace}) + } + } + + return nil +} + +func allObjectsDeleted(resources ...client.Object) error { + for _, r := range resources { + if hasPersistentLabel(r.GetLabels()) { + continue + } + + err := suite.K8sClient.Get(context.Background(), types.NamespacedName{Name: r.GetName(), Namespace: r.GetNamespace()}, r) + if !apierrors.IsNotFound(err) { + return err + } } return nil } +func sortObjects(resources []client.Object) []client.Object { + return slices.SortedFunc(slices.Values(resources), func(a, b client.Object) int { + var ( + isNamespaceA, isNamespaceB, isPipelineA, isPipelineB bool + ) + + switch a.(type) { + case *telemetryv1alpha1.MetricPipeline, *telemetryv1alpha1.TracePipeline, *telemetryv1alpha1.LogPipeline: + isPipelineA = true + case *telemetryv1beta1.MetricPipeline, *telemetryv1beta1.TracePipeline, *telemetryv1beta1.LogPipeline: + isPipelineA = true + case *corev1.Namespace: + isNamespaceA = true + } + + switch b.(type) { + case *telemetryv1alpha1.MetricPipeline, *telemetryv1alpha1.TracePipeline, *telemetryv1alpha1.LogPipeline: + isPipelineB = true + case *telemetryv1beta1.MetricPipeline, *telemetryv1beta1.TracePipeline, *telemetryv1beta1.LogPipeline: + isPipelineB = true + case *corev1.Namespace: + isNamespaceB = true + } + + if isNamespaceA && !isNamespaceB { + return -1 + } + + if !isNamespaceA && isNamespaceB { + return 1 + } + + if isPipelineA && !isPipelineB { + return 1 + } + + if !isPipelineA && isPipelineB { + return -1 + } + + return 0 + }, + ) +} + // DeleteObjects deletes k8s objects passed as a slice. // This function directly uses context.Background(), since in go test the context gets canceled before deletion sometimes, func DeleteObjects(resources ...client.Object) error { for _, r := range resources { // Skip object deletion for persistent ones. - if labelMatches(r.GetLabels(), PersistentLabelName, "true") { + if hasPersistentLabel(r.GetLabels()) { continue } @@ -60,8 +154,23 @@ func DeleteObjects(resources ...client.Object) error { return nil } +func deleteObjectsIgnoringNotFound(resources ...client.Object) error { + for _, r := range resources { + // Skip object deletion for persistent ones. + if hasPersistentLabel(r.GetLabels()) { + continue + } + + if err := client.IgnoreNotFound(suite.K8sClient.Delete(context.Background(), r)); err != nil { + return err + } + } + + return nil +} + // ForceDeleteObjects deletes k8s objects including persistent ones. -func ForceDeleteObjects(t testkit.T, resources ...client.Object) error { +func ForceDeleteObjects(t *testing.T, resources ...client.Object) error { for _, r := range resources { if err := suite.K8sClient.Delete(t.Context(), r); err != nil { return err @@ -72,7 +181,7 @@ func ForceDeleteObjects(t testkit.T, resources ...client.Object) error { } // UpdateObjects updates k8s objects passed as a slice. -func UpdateObjects(t testkit.T, resources ...client.Object) error { +func UpdateObjects(t *testing.T, resources ...client.Object) error { for _, resource := range resources { if err := suite.K8sClient.Update(t.Context(), resource); err != nil { return err @@ -117,7 +226,7 @@ func ObjectsToFile(t *testing.T, resources ...client.Object) error { return os.WriteFile(strings.ReplaceAll(t.Name(), "/", "_")+".yaml", buf.Bytes(), 0600) } -func labelMatches(labels Labels, label, value string) bool { +func labelMatches(labels kitk8sobjects.Labels, label, value string) bool { l, ok := labels[label] if !ok { return false @@ -125,3 +234,29 @@ func labelMatches(labels Labels, label, value string) bool { return l == value } + +func hasPersistentLabel(labels kitk8sobjects.Labels) bool { + return labelMatches(labels, kitk8sobjects.PersistentLabelName, "true") +} + +func resetTelemetryResource(t *testing.T, previous operatorv1alpha1.Telemetry) { + t.Helper() + gomega.Eventually(func(g gomega.Gomega) { + var current operatorv1alpha1.Telemetry + g.Expect(suite.K8sClient.Get(context.Background(), types.NamespacedName{Namespace: previous.Namespace, Name: previous.Name}, ¤t)).NotTo(gomega.HaveOccurred()) + current.Spec = previous.Spec + current.Labels = previous.Labels + current.Annotations = previous.Annotations + g.Expect(suite.K8sClient.Update(context.Background(), ¤t)).NotTo(gomega.HaveOccurred(), "should reset Telemetry resource to previous state") + }, periodic.EventuallyTimeout, periodic.TelemetryInterval).Should(gomega.Succeed()) +} + +func PreserveAndScheduleRestoreOfTelemetryResource(t *testing.T, key types.NamespacedName) { + t.Helper() + + var previous operatorv1alpha1.Telemetry + gomega.Expect(suite.K8sClient.Get(t.Context(), key, &previous)).NotTo(gomega.HaveOccurred()) + t.Cleanup(func() { + resetTelemetryResource(t, previous) + }) +} diff --git a/test/testkit/k8s/configmap.go b/test/testkit/k8s/objects/configmap.go similarity index 98% rename from test/testkit/k8s/configmap.go rename to test/testkit/k8s/objects/configmap.go index 4acd306e53..85c4a012ac 100644 --- a/test/testkit/k8s/configmap.go +++ b/test/testkit/k8s/objects/configmap.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( "maps" diff --git a/test/testkit/k8s/daemon_set.go b/test/testkit/k8s/objects/daemon_set.go similarity index 98% rename from test/testkit/k8s/daemon_set.go rename to test/testkit/k8s/objects/daemon_set.go index e22277d0b4..8d3fc46aec 100644 --- a/test/testkit/k8s/daemon_set.go +++ b/test/testkit/k8s/objects/daemon_set.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( "maps" diff --git a/test/testkit/k8s/deployment.go b/test/testkit/k8s/objects/deployment.go similarity index 99% rename from test/testkit/k8s/deployment.go rename to test/testkit/k8s/objects/deployment.go index d0f6c1287e..e2d11ae746 100644 --- a/test/testkit/k8s/deployment.go +++ b/test/testkit/k8s/objects/deployment.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( "maps" diff --git a/test/testkit/k8s/job.go b/test/testkit/k8s/objects/job.go similarity index 98% rename from test/testkit/k8s/job.go rename to test/testkit/k8s/objects/job.go index 5f5a06c844..3bec177cd6 100644 --- a/test/testkit/k8s/job.go +++ b/test/testkit/k8s/objects/job.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( "maps" diff --git a/test/testkit/k8s/label_opts.go b/test/testkit/k8s/objects/label_opts.go similarity index 97% rename from test/testkit/k8s/label_opts.go rename to test/testkit/k8s/objects/label_opts.go index ee8dda1ff2..3492b93a78 100644 --- a/test/testkit/k8s/label_opts.go +++ b/test/testkit/k8s/objects/label_opts.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( "github.com/kyma-project/telemetry-manager/test/testkit" diff --git a/test/testkit/k8s/namespace.go b/test/testkit/k8s/objects/namespace.go similarity index 97% rename from test/testkit/k8s/namespace.go rename to test/testkit/k8s/objects/namespace.go index 9fe2a1e886..430b52d692 100644 --- a/test/testkit/k8s/namespace.go +++ b/test/testkit/k8s/objects/namespace.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( corev1 "k8s.io/api/core/v1" diff --git a/test/testkit/k8s/network_policy.go b/test/testkit/k8s/objects/network_policy.go similarity index 97% rename from test/testkit/k8s/network_policy.go rename to test/testkit/k8s/objects/network_policy.go index dc2c5d9fde..7df7511209 100644 --- a/test/testkit/k8s/network_policy.go +++ b/test/testkit/k8s/objects/network_policy.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( networkingv1 "k8s.io/api/networking/v1" diff --git a/test/testkit/k8s/overrides.go b/test/testkit/k8s/objects/overrides.go similarity index 99% rename from test/testkit/k8s/overrides.go rename to test/testkit/k8s/objects/overrides.go index d92fccebec..3d1a6cdf76 100644 --- a/test/testkit/k8s/overrides.go +++ b/test/testkit/k8s/objects/overrides.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( "strconv" diff --git a/test/testkit/k8s/peer_authentication.go b/test/testkit/k8s/objects/peer_authentication.go similarity index 98% rename from test/testkit/k8s/peer_authentication.go rename to test/testkit/k8s/objects/peer_authentication.go index fe8c71d3dc..89f0fb740c 100644 --- a/test/testkit/k8s/peer_authentication.go +++ b/test/testkit/k8s/objects/peer_authentication.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( istiosecurityv1 "istio.io/api/security/v1" diff --git a/test/testkit/k8s/pod.go b/test/testkit/k8s/objects/pod.go similarity index 98% rename from test/testkit/k8s/pod.go rename to test/testkit/k8s/objects/pod.go index 1d4846ff43..66b2a6938c 100644 --- a/test/testkit/k8s/pod.go +++ b/test/testkit/k8s/objects/pod.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( "maps" diff --git a/test/testkit/k8s/pod_spec.go b/test/testkit/k8s/objects/pod_spec.go similarity index 94% rename from test/testkit/k8s/pod_spec.go rename to test/testkit/k8s/objects/pod_spec.go index deaba0e967..6780ffabb2 100644 --- a/test/testkit/k8s/pod_spec.go +++ b/test/testkit/k8s/objects/pod_spec.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( corev1 "k8s.io/api/core/v1" diff --git a/test/testkit/k8s/secret.go b/test/testkit/k8s/objects/secret.go similarity index 99% rename from test/testkit/k8s/secret.go rename to test/testkit/k8s/objects/secret.go index 7fe5b102e5..3e1dc3c4a2 100644 --- a/test/testkit/k8s/secret.go +++ b/test/testkit/k8s/objects/secret.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( "github.com/google/uuid" diff --git a/test/testkit/k8s/secret_opts.go b/test/testkit/k8s/objects/secret_opts.go similarity index 96% rename from test/testkit/k8s/secret_opts.go rename to test/testkit/k8s/objects/secret_opts.go index b94ff3b6a1..38f3ab244e 100644 --- a/test/testkit/k8s/secret_opts.go +++ b/test/testkit/k8s/objects/secret_opts.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( "github.com/kyma-project/telemetry-manager/test/testkit" diff --git a/test/testkit/k8s/service.go b/test/testkit/k8s/objects/service.go similarity index 98% rename from test/testkit/k8s/service.go rename to test/testkit/k8s/objects/service.go index c6b8fe5cff..63f4a20654 100644 --- a/test/testkit/k8s/service.go +++ b/test/testkit/k8s/objects/service.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( corev1 "k8s.io/api/core/v1" diff --git a/test/testkit/k8s/stateful_set.go b/test/testkit/k8s/objects/stateful_set.go similarity index 98% rename from test/testkit/k8s/stateful_set.go rename to test/testkit/k8s/objects/stateful_set.go index 769db2d8df..85c2bb607e 100644 --- a/test/testkit/k8s/stateful_set.go +++ b/test/testkit/k8s/objects/stateful_set.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( "maps" diff --git a/test/testkit/k8s/telemetry.go b/test/testkit/k8s/objects/telemetry.go similarity index 97% rename from test/testkit/k8s/telemetry.go rename to test/testkit/k8s/objects/telemetry.go index f892ab793b..18ec45c87d 100644 --- a/test/testkit/k8s/telemetry.go +++ b/test/testkit/k8s/objects/telemetry.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/testkit/k8s/virtual_service.go b/test/testkit/k8s/objects/virtual_service.go similarity index 99% rename from test/testkit/k8s/virtual_service.go rename to test/testkit/k8s/objects/virtual_service.go index 1de554577c..ea266626f1 100644 --- a/test/testkit/k8s/virtual_service.go +++ b/test/testkit/k8s/objects/virtual_service.go @@ -1,4 +1,4 @@ -package k8s +package objects import ( "net/http" diff --git a/test/testkit/k8s/objects_test.go b/test/testkit/k8s/objects_test.go new file mode 100644 index 0000000000..c882750d4a --- /dev/null +++ b/test/testkit/k8s/objects_test.go @@ -0,0 +1,123 @@ +package k8s + +import ( + "reflect" + "testing" + + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/controller-runtime/pkg/client" + + telemetryv1alpha1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1alpha1" + telemetryv1beta1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1beta1" +) + +func newNamespace(name string) *corev1.Namespace { + return &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: name}} +} + +const name = "name" + +func newMetricPipelineAlpha() *telemetryv1alpha1.MetricPipeline { + return &telemetryv1alpha1.MetricPipeline{ObjectMeta: metav1.ObjectMeta{Name: name}} +} + +func newTracePipelineAlpha() *telemetryv1alpha1.TracePipeline { + return &telemetryv1alpha1.TracePipeline{ObjectMeta: metav1.ObjectMeta{Name: name}} +} + +func newLogPipelineAlpha() *telemetryv1alpha1.LogPipeline { + return &telemetryv1alpha1.LogPipeline{ObjectMeta: metav1.ObjectMeta{Name: name}} +} + +func newMetricPipelineBeta() *telemetryv1beta1.MetricPipeline { + return &telemetryv1beta1.MetricPipeline{ObjectMeta: metav1.ObjectMeta{Name: name}} +} + +func newTracePipelineBeta() *telemetryv1beta1.TracePipeline { + return &telemetryv1beta1.TracePipeline{ObjectMeta: metav1.ObjectMeta{Name: name}} +} + +func newLogPipelineBeta() *telemetryv1beta1.LogPipeline { + return &telemetryv1beta1.LogPipeline{ObjectMeta: metav1.ObjectMeta{Name: name}} +} + +func newConfigMap(name string) *corev1.ConfigMap { + return &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: name}} +} + +func Test_sortObjects(t *testing.T) { + tests := []struct { + name string + input []client.Object + want []client.Object + }{ + { + name: "namespaces first, pipelines last, mixed types", + input: []client.Object{ + newMetricPipelineAlpha(), + newConfigMap("cfg"), + newNamespace("ns"), + newMetricPipelineBeta(), + newTracePipelineAlpha(), + newLogPipelineBeta(), + }, + want: []client.Object{ + newNamespace("ns"), + newConfigMap("cfg"), + newMetricPipelineAlpha(), + newMetricPipelineBeta(), + newTracePipelineAlpha(), + newLogPipelineBeta(), + }, + }, + { + name: "only namespaces", + input: []client.Object{ + newNamespace("ns1"), + newNamespace("ns2"), + }, + want: []client.Object{ + newNamespace("ns1"), + newNamespace("ns2"), + }, + }, + { + name: "only pipelines", + input: []client.Object{ + newMetricPipelineAlpha(), + newLogPipelineAlpha(), + newTracePipelineBeta(), + }, + want: []client.Object{ + newMetricPipelineAlpha(), + newLogPipelineAlpha(), + newTracePipelineBeta(), + }, + }, + { + name: "only other types", + input: []client.Object{ + newConfigMap("cfg1"), + newConfigMap("cfg2"), + }, + want: []client.Object{ + newConfigMap("cfg1"), + newConfigMap("cfg2"), + }, + }, + { + name: "empty input returns empty", + input: nil, + want: nil, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got := sortObjects(tt.input) + if !reflect.DeepEqual(got, tt.want) { + t.Errorf("sortObjects() = %v, want %v", got, tt.want) + } + }) + } +} diff --git a/test/testkit/mocks/backend/backend.go b/test/testkit/mocks/backend/backend.go index 4e42e4eddc..c6a4ceab02 100644 --- a/test/testkit/mocks/backend/backend.go +++ b/test/testkit/mocks/backend/backend.go @@ -13,7 +13,7 @@ import ( telemetryv1beta1 "github.com/kyma-project/telemetry-manager/apis/telemetry/v1beta1" testutils "github.com/kyma-project/telemetry-manager/internal/utils/test" "github.com/kyma-project/telemetry-manager/test/testkit/apiserverproxy" - kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" ) const ( @@ -54,11 +54,11 @@ type Backend struct { signalType SignalType fluentDConfigMap *fluentdConfigMapBuilder - hostSecret *kitk8s.Secret + hostSecret *kitk8sobjects.Secret collectorConfigMap *collectorConfigMapBuilder collectorDeployment *collectorDeploymentBuilder - collectorService *kitk8s.Service - virtualService *kitk8s.VirtualService + collectorService *kitk8sobjects.Service + virtualService *kitk8sobjects.VirtualService } func New(namespace string, signalType SignalType, opts ...Option) *Backend { @@ -133,8 +133,8 @@ func (b *Backend) K8sObjects() []client.Object { } objects = append(objects, b.collectorConfigMap.K8sObject()) - objects = append(objects, b.collectorDeployment.K8sObject(kitk8s.WithLabel("app", b.name))) - objects = append(objects, b.collectorService.K8sObject(kitk8s.WithLabel("app", b.name))) + objects = append(objects, b.collectorDeployment.K8sObject(kitk8sobjects.WithLabel("app", b.name))) + objects = append(objects, b.collectorService.K8sObject(kitk8sobjects.WithLabel("app", b.name))) objects = append(objects, b.hostSecret.K8sObject()) return objects @@ -162,7 +162,7 @@ func (b *Backend) buildResources() { "traffic.sidecar.istio.io/excludeInboundPorts": strconv.Itoa(int(QueryPort)), }) - b.collectorService = kitk8s.NewService(b.name, b.namespace). + b.collectorService = kitk8sobjects.NewService(b.name, b.namespace). WithPort(otlpGRPCPortName, otlpGRPCPort). WithPort(otlpHTTPPortName, otlpHTTPPort). WithPort(queryPortName, QueryPort) @@ -183,15 +183,15 @@ func (b *Backend) buildResources() { host = b.Host() } - b.hostSecret = kitk8s.NewOpaqueSecret( + b.hostSecret = kitk8sobjects.NewOpaqueSecret( fmt.Sprintf("%s-receiver-hostname", b.name), b.namespace, - kitk8s.WithStringData("host", host), + kitk8sobjects.WithStringData("host", host), ) if b.abortFaultPercentage > 0 { // Configure fault injection for self-monitoring negative tests. - b.virtualService = kitk8s.NewVirtualService( + b.virtualService = kitk8sobjects.NewVirtualService( "fault-injection", b.namespace, b.name, diff --git a/test/testkit/mocks/backend/collector_deployment.go b/test/testkit/mocks/backend/collector_deployment.go index 8a87a03fd1..50b1e889b6 100644 --- a/test/testkit/mocks/backend/collector_deployment.go +++ b/test/testkit/mocks/backend/collector_deployment.go @@ -7,7 +7,7 @@ import ( "k8s.io/utils/ptr" "github.com/kyma-project/telemetry-manager/test/testkit" - kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" ) const ( @@ -48,7 +48,7 @@ func (d *collectorDeploymentBuilder) WithAnnotations(annotations map[string]stri } func (d *collectorDeploymentBuilder) K8sObject(opts ...testkit.OptFunc) *appsv1.Deployment { - labels := kitk8s.ProcessLabelOptions(opts...) + labels := kitk8sobjects.ProcessLabelOptions(opts...) containers := d.containers() volumes := d.volumes() diff --git a/test/testkit/mocks/stdoutloggen/stdoutloggen.go b/test/testkit/mocks/stdoutloggen/stdoutloggen.go index 0bd8921a8a..ddbc568283 100644 --- a/test/testkit/mocks/stdoutloggen/stdoutloggen.go +++ b/test/testkit/mocks/stdoutloggen/stdoutloggen.go @@ -6,7 +6,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" ) const ( @@ -63,8 +63,8 @@ func WithText(text string) Option { } } -func NewDeployment(namespace string, opts ...Option) *kitk8s.Deployment { - return kitk8s.NewDeployment(DefaultName, namespace).WithPodSpec(PodSpec(opts...)) +func NewDeployment(namespace string, opts ...Option) *kitk8sobjects.Deployment { + return kitk8sobjects.NewDeployment(DefaultName, namespace).WithPodSpec(PodSpec(opts...)) } func PodSpec(opts ...Option) corev1.PodSpec { diff --git a/test/testkit/mocks/telemetrygen/telemetrygen.go b/test/testkit/mocks/telemetrygen/telemetrygen.go index e936cf3b5a..16d0cdbcac 100644 --- a/test/testkit/mocks/telemetrygen/telemetrygen.go +++ b/test/testkit/mocks/telemetrygen/telemetrygen.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "github.com/kyma-project/telemetry-manager/test/testkit" - kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" ) type SignalType string @@ -100,12 +100,12 @@ func WithInterval(duration string) Option { spec.Containers[0].Args = append(spec.Containers[0].Args, fmt.Sprintf("%v", duration)) } } -func NewPod(namespace string, signalType SignalType, opts ...Option) *kitk8s.Pod { - return kitk8s.NewPod(DefaultName, namespace).WithPodSpec(PodSpec(signalType, opts...)).WithLabel("app.kubernetes.io/name", DefaultName) +func NewPod(namespace string, signalType SignalType, opts ...Option) *kitk8sobjects.Pod { + return kitk8sobjects.NewPod(DefaultName, namespace).WithPodSpec(PodSpec(signalType, opts...)).WithLabel("app.kubernetes.io/name", DefaultName) } -func NewDeployment(namespace string, signalType SignalType, opts ...Option) *kitk8s.Deployment { - return kitk8s.NewDeployment(DefaultName, namespace).WithPodSpec(PodSpec(signalType, opts...)).WithLabel("app.kubernetes.io/name", DefaultName) +func NewDeployment(namespace string, signalType SignalType, opts ...Option) *kitk8sobjects.Deployment { + return kitk8sobjects.NewDeployment(DefaultName, namespace).WithPodSpec(PodSpec(signalType, opts...)).WithLabel("app.kubernetes.io/name", DefaultName) } func PodSpec(signalType SignalType, opts ...Option) corev1.PodSpec { diff --git a/test/testkit/mocks/trafficgen/trafficgen.go b/test/testkit/mocks/trafficgen/trafficgen.go index cf322b3544..19226f2d65 100644 --- a/test/testkit/mocks/trafficgen/trafficgen.go +++ b/test/testkit/mocks/trafficgen/trafficgen.go @@ -6,7 +6,7 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - kitk8s "github.com/kyma-project/telemetry-manager/test/testkit/k8s" + kitk8sobjects "github.com/kyma-project/telemetry-manager/test/testkit/k8s/objects" ) const ( @@ -53,8 +53,8 @@ func destinationPodSpec() corev1.PodSpec { func K8sObjects(namespace string) []client.Object { return []client.Object{ - kitk8s.NewPod(sourceName, namespace).WithPodSpec(sourcePodSpec()).K8sObject(), - kitk8s.NewPod(destinationName, namespace).WithPodSpec(destinationPodSpec()).WithLabel(appLabelKey, destinationName).K8sObject(), - kitk8s.NewService(destinationName, namespace).WithPort("http", destinationPort).K8sObject(kitk8s.WithLabel(appLabelKey, destinationName)), + kitk8sobjects.NewPod(sourceName, namespace).WithPodSpec(sourcePodSpec()).K8sObject(), + kitk8sobjects.NewPod(destinationName, namespace).WithPodSpec(destinationPodSpec()).WithLabel(appLabelKey, destinationName).K8sObject(), + kitk8sobjects.NewService(destinationName, namespace).WithPort("http", destinationPort).K8sObject(kitk8sobjects.WithLabel(appLabelKey, destinationName)), } } diff --git a/test/testkit/testing.go b/test/testkit/testing.go deleted file mode 100644 index 5842e47c36..0000000000 --- a/test/testkit/testing.go +++ /dev/null @@ -1,12 +0,0 @@ -package testkit - -import "context" - -// T is a temporary interface that abstracts over different test frameworks. -// It allows the use of both testing.T (for migrated tests) and GinkgoT (for tests not yet migrated). -// TODO(TeodorSAP): To be replaced with testing.T after migration is done -type T interface { - Context() context.Context - Helper() - Logf(format string, args ...any) -}