From cedd173ed1fa38e0a59f9db6c8cfc87687ec5322 Mon Sep 17 00:00:00 2001
From: Florian Bacher <florian.bacher@dynatrace.com>
Date: Tue, 19 Sep 2023 08:46:22 +0200
Subject: [PATCH] adapt integration tests

Signed-off-by: Florian Bacher <florian.bacher@dynatrace.com>
---
 .../00-teststep-template.yaml                        |  2 +-
 .../install.yaml                                     | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/test/integration/analysis-controller-multiple-providers/00-teststep-template.yaml b/test/integration/analysis-controller-multiple-providers/00-teststep-template.yaml
index ea3f3168fa..d38e50fe8d 100644
--- a/test/integration/analysis-controller-multiple-providers/00-teststep-template.yaml
+++ b/test/integration/analysis-controller-multiple-providers/00-teststep-template.yaml
@@ -6,4 +6,4 @@ commands:
   #  substitutes current time and namespace, making sure they are changed to env var first
   # to prevent bad files in case of a test interrupt
   - script: |
-      envsubst < install.yaml | kubectl apply -f -
+      envsubst < install.yaml | kubectl apply -f - -n $NAMESPACE
diff --git a/test/integration/analysis-controller-multiple-providers/install.yaml b/test/integration/analysis-controller-multiple-providers/install.yaml
index ca9d34a25a..1acfc304e8 100644
--- a/test/integration/analysis-controller-multiple-providers/install.yaml
+++ b/test/integration/analysis-controller-multiple-providers/install.yaml
@@ -2,40 +2,33 @@ apiVersion: metrics.keptn.sh/v1alpha3
 kind: AnalysisValueTemplate
 metadata:
   name: value-1
-  namespace: $NAMESPACE
 spec:
   provider:
     name: my-first-mocked-provider
-    namespace: $NAMESPACE
   query: 'query-1'
 ---
 apiVersion: metrics.keptn.sh/v1alpha3
 kind: AnalysisValueTemplate
 metadata:
   name: value-2
-  namespace: $NAMESPACE
 spec:
   provider:
     name: my-second-mocked-provider
-    namespace: $NAMESPACE
   query: 'query-2'
 ---
 apiVersion: metrics.keptn.sh/v1alpha3
 kind: AnalysisValueTemplate
 metadata:
   name: value-3
-  namespace: $NAMESPACE
 spec:
   provider:
     name: my-third-mocked-provider
-    namespace: $NAMESPACE
   query: 'query-3'
 ---
 apiVersion: metrics.keptn.sh/v1alpha3
 kind: AnalysisDefinition
 metadata:
   name: ed-my-proj-dev-svc1
-  namespace: $NAMESPACE
 spec:
   objectives:
     - analysisValueTemplateRef:
@@ -80,7 +73,6 @@ apiVersion: metrics.keptn.sh/v1alpha3
 kind: Analysis
 metadata:
   name: analysis-sample
-  namespace: $NAMESPACE
 spec:
   timeframe:
     from: 2023-09-14T07:33:19Z
@@ -89,13 +81,11 @@ spec:
     "ns": "keptn-lifecycle-toolkit-system"
   analysisDefinition:
     name: ed-my-proj-dev-svc1
-    namespace: $NAMESPACE
 ---
 apiVersion: metrics.keptn.sh/v1alpha3
 kind: KeptnMetricsProvider
 metadata:
   name: my-first-mocked-provider
-  namespace: $NAMESPACE
 spec:
   type: prometheus
   targetServer: "http://mockserver.$NAMESPACE.svc.cluster.local:1080"
@@ -104,7 +94,6 @@ apiVersion: metrics.keptn.sh/v1alpha3
 kind: KeptnMetricsProvider
 metadata:
   name: my-second-mocked-provider
-  namespace: $NAMESPACE
 spec:
   type: prometheus
   targetServer: "http://mockserver.$NAMESPACE.svc.cluster.local:1080"
@@ -113,7 +102,6 @@ apiVersion: metrics.keptn.sh/v1alpha3
 kind: KeptnMetricsProvider
 metadata:
   name: my-third-mocked-provider
-  namespace: $NAMESPACE
 spec:
   type: prometheus
   targetServer: "http://mockserver.$NAMESPACE.svc.cluster.local:1080"