fix(metrics-operator): fixed test

Signed-off-by: realanna <anna.reale@dynatrace.com>
keptn · Sep 18, 2023 · 5c6ca30 · 5c6ca30
1 parent d02ff24
commit 5c6ca30
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 21 deletions.
diff --git a/metrics-operator/controllers/analysis/controller_test.go b/metrics-operator/controllers/analysis/controller_test.go
@@ -115,7 +115,6 @@ func TestAnalysisReconciler_ExistingAnalysisStatusIsFlushedWhenEvaluationFinishe
 			},
 		},
 	}
-	require.NotNil(t, analysis.Status.StoredValues)
 
 	mockFactory := func(ctx context.Context, analysisMoqParam *metricsapi.Analysis, obj []metricsapi.Objective, numWorkers int, c client.Client, log logr.Logger, namespace string) (context.Context, IAnalysisPool) {
 		mymock := fake.IAnalysisPoolMock{

diff --git a/test/integration/analysis-controller-existing-status/00-assert.yaml b/test/integration/analysis-controller-existing-status/00-assert.yaml
@@ -0,0 +1,14 @@
+apiVersion: metrics.keptn.sh/v1alpha3
+kind: Analysis
+metadata:
+  name: analysis-sample
+  namespace: testy
+spec:
+  analysisDefinition:
+    name: ed-my-proj-dev-svc1
+status:
+  storedValues:
+    ready-testy:
+      objectiveReference:
+        name: ready
+        namespace: testy
diff --git a/...s-controller-existing-status/install.yaml → ...ontroller-existing-status/00-install.yaml b/...s-controller-existing-status/install.yaml → ...ontroller-existing-status/00-install.yaml
@@ -1,24 +1,29 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: testy
+---
 apiVersion: metrics.keptn.sh/v1alpha3
 kind: AnalysisValueTemplate
 metadata:
   name: ready
-  namespace: $NAMESPACE
+  namespace: testy
 spec:
   provider:
     name: my-mocked-provider
-    namespace: $NAMESPACE
+    namespace: testy
   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
+  namespace: testy
 spec:
   objectives:
     - analysisValueTemplateRef:
         name: ready
-        namespace: $NAMESPACE
+        namespace: testy
       target:
         failure:
           lessThan:
@@ -36,7 +41,7 @@ apiVersion: metrics.keptn.sh/v1alpha3
 kind: Analysis
 metadata:
   name: analysis-sample
-  namespace: $NAMESPACE
+  namespace: testy
 spec:
   timeframe:
     from: 2023-09-14T07:33:19Z
@@ -45,7 +50,7 @@ spec:
     "ns": "keptn-lifecycle-toolkit-system"
   analysisDefinition:
     name: ed-my-proj-dev-svc1
-    namespace: $NAMESPACE
+    namespace: testy
 status:
   storedValues:
     my-provider-query-1:
@@ -59,7 +64,7 @@ apiVersion: metrics.keptn.sh/v1alpha3
 kind: KeptnMetricsProvider
 metadata:
   name: my-mocked-provider
-  namespace: $NAMESPACE
+  namespace: testy
 spec:
   type: prometheus
-  targetServer: "http://mockserver.$NAMESPACE.svc.cluster.local:1080"
+  targetServer: "http://mockserver.testy.svc.cluster.local:1080"
diff --git a/test/integration/analysis-controller-existing-status/00-teststep-template.yaml b/test/integration/analysis-controller-existing-status/00-teststep-template.yaml
diff --git a/test/integration/analysis-controller-existing-status/01-assert.yaml b/test/integration/analysis-controller-existing-status/01-assert.yaml
@@ -2,6 +2,7 @@ apiVersion: metrics.keptn.sh/v1alpha3
 kind: Analysis
 metadata:
   name: analysis-sample
+  namespace: testy
 spec:
   analysisDefinition:
     name: ed-my-proj-dev-svc1

diff --git a/...ntroller-existing-status/mock-server.yaml → ...ontroller-existing-status/01-install.yaml b/...ntroller-existing-status/mock-server.yaml → ...ontroller-existing-status/01-install.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: mockserver
-  namespace: $NAMESPACE
+  namespace: testy
 spec:
   ports:
     - name: serviceport
@@ -20,7 +20,7 @@ metadata:
   labels:
     app: mockserver
   name: mockserver
-  namespace: $NAMESPACE
+  namespace: testy
 spec:
   replicas: 1
   selector:
@@ -83,7 +83,7 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: mockserver-config
-  namespace: $NAMESPACE
+  namespace: testy
 data:
   initializerJson.json: |-
     [

diff --git a/test/integration/analysis-controller-existing-status/02-delete.yaml b/test/integration/analysis-controller-existing-status/02-delete.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+   name: testy