From 0661a5c3568cdd47716256a404cc612d21e738bd Mon Sep 17 00:00:00 2001
From: odubajDT <ondrej.dubaj@dynatrace.com>
Date: Mon, 18 Sep 2023 07:12:02 +0200
Subject: [PATCH] adapt integration test

Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
---
 .../analysis-controller/00-teststep-template.yaml          | 4 +---
 test/integration/analysis-controller/install.yaml          | 7 -------
 test/integration/analysis-controller/mock-server.yaml      | 3 ---
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/test/integration/analysis-controller/00-teststep-template.yaml b/test/integration/analysis-controller/00-teststep-template.yaml
index ea3f3168fa9..bf3514af5d0 100644
--- a/test/integration/analysis-controller/00-teststep-template.yaml
+++ b/test/integration/analysis-controller/00-teststep-template.yaml
@@ -2,8 +2,6 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
   - script: |
-      envsubst < mock-server.yaml  | kubectl apply -f -
-  #  substitutes current time and namespace, making sure they are changed to env var first
-  # to prevent bad files in case of a test interrupt
+      kubectl apply -f mock-server.yaml
   - script: |
       envsubst < install.yaml | kubectl apply -f -
diff --git a/test/integration/analysis-controller/install.yaml b/test/integration/analysis-controller/install.yaml
index 9b8dd7049c2..7b1986fcb45 100644
--- a/test/integration/analysis-controller/install.yaml
+++ b/test/integration/analysis-controller/install.yaml
@@ -2,23 +2,19 @@ apiVersion: metrics.keptn.sh/v1alpha3
 kind: AnalysisValueTemplate
 metadata:
   name: ready
-  namespace: $NAMESPACE
 spec:
   provider:
     name: my-mocked-provider
-    namespace: $NAMESPACE
   query: 'sum(kube_pod_container_status_ready{namespace="{{.ns}}"})'
 ---
 apiVersion: metrics.keptn.sh/v1alpha3
 kind: AnalysisDefinition
 metadata:
   name: ed-my-proj-dev-svc1
-  namespace: $NAMESPACE
 spec:
   objectives:
     - analysisValueTemplateRef:
         name: ready
-        namespace: $NAMESPACE
       target:
         failure:
           lessThan:
@@ -36,7 +32,6 @@ apiVersion: metrics.keptn.sh/v1alpha3
 kind: Analysis
 metadata:
   name: analysis-sample
-  namespace: $NAMESPACE
 spec:
   timeframe:
     from: 2023-09-14T07:33:19Z
@@ -45,13 +40,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-mocked-provider
-  namespace: $NAMESPACE
 spec:
   type: prometheus
   targetServer: "http://mockserver.$NAMESPACE.svc.cluster.local:1080"
diff --git a/test/integration/analysis-controller/mock-server.yaml b/test/integration/analysis-controller/mock-server.yaml
index 44ddf38d5b3..b01cda4fb31 100644
--- a/test/integration/analysis-controller/mock-server.yaml
+++ b/test/integration/analysis-controller/mock-server.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: mockserver
-  namespace: $NAMESPACE
 spec:
   ports:
     - name: serviceport
@@ -20,7 +19,6 @@ metadata:
   labels:
     app: mockserver
   name: mockserver
-  namespace: $NAMESPACE
 spec:
   replicas: 1
   selector:
@@ -83,7 +81,6 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: mockserver-config
-  namespace: $NAMESPACE
 data:
   initializerJson.json: |-
     [