fix integration tests

Signed-off-by: odubajDT <[email protected]>

test/chainsaw/allowed-namespaces/simple-deployment-allowed/00-assert.yaml

@@ -1,9 +1,24 @@
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: lifecycle.keptn.sh/v1
+kind: KeptnWorkload
 metadata:
-  labels:
-    app: test
-  name: test
+  name: waiter-waiter
+  namespace: allowed-ns-test
+---
+apiVersion: lifecycle.keptn.sh/v1
+kind: KeptnWorkloadVersion
+metadata:
+  name: waiter-waiter-0.4
   namespace: allowed-ns-test
 status:
-  readyReplicas: 2
+  currentPhase: Completed
+  deploymentStatus: Succeeded
+  postDeploymentEvaluationStatus: Succeeded
+  postDeploymentStatus: Succeeded
+  postDeploymentTaskStatus:
+    - status: Succeeded
+      definitionName: pre-deployment-hello
+  preDeploymentEvaluationStatus: Succeeded
+  preDeploymentStatus: Succeeded
+  preDeploymentTaskStatus:
+    - status: Succeeded
+      definitionName: pre-deployment-hello

test/chainsaw/allowed-namespaces/simple-deployment-allowed/chainsaw-test.yaml

@@ -12,7 +12,3 @@ spec:
             file: 00-install.yaml
         - assert:
             file: 00-assert.yaml
-    - name: step-01
-      try:
-        - assert:
-            file: 01-assert.yaml

test/chainsaw/allowed-namespaces/simple-deployment-not-allowed/00-assert.yaml

@@ -5,5 +5,3 @@ metadata:
     app: test
   name: test
   namespace: not-allowed-ns-test
-status:
-  readyReplicas: 2

test/chainsaw/integration/simple-deployment-annotated-with-app-context/00-assert.yaml

@@ -1,12 +1,3 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: test
-  name: test
-status:
-  readyReplicas: 2
----
 apiVersion: lifecycle.keptn.sh/v1
 kind: KeptnWorkload
 metadata:

test/chainsaw/integration/simple-deployment-evaluation/00-assert.yaml

@@ -1,12 +1,3 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: test
-  name: test
-status:
-  readyReplicas: 1
----
 apiVersion: lifecycle.keptn.sh/v1
 kind: KeptnWorkload
 metadata:
@@ -16,7 +7,6 @@ spec:
     commit-id: "1234"
     stage: dev
 ---
-
 apiVersion: lifecycle.keptn.sh/v1
 kind: KeptnWorkloadVersion
 metadata:

test/chainsaw/integration/simple-deployment-k8s-recommended-label/00-assert.yaml

@@ -1,12 +1,3 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: test
-  name: test
-status:
-  readyReplicas: 1
----
 apiVersion: lifecycle.keptn.sh/v1
 kind: KeptnWorkload
 metadata:

test/chainsaw/integration/simple-deployment-recursive-task/00-assert.yaml

@@ -1,12 +1,3 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: test
-  name: test
-status:
-  readyReplicas: 1
----
 apiVersion: batch/v1
 kind: Job
 metadata:

test/chainsaw/integration/simple-deployment-revisionhistorylimit/00-assert.yaml

@@ -1,12 +1,3 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: test
-  name: test
-status:
-  readyReplicas: 2
----
 apiVersion: lifecycle.keptn.sh/v1
 kind: KeptnWorkload
 metadata:

test/chainsaw/integration/simple-deployment-revisionhistorylimit/01-assert.yaml

@@ -1,12 +1,3 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: test
-  name: test
-status:
-  readyReplicas: 2
----
 apiVersion: lifecycle.keptn.sh/v1
 kind: KeptnWorkload
 metadata:

test/chainsaw/integration/simple-deployment/00-assert.yaml

@@ -1,12 +1,3 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: test
-  name: test
-status:
-  readyReplicas: 1
----
 apiVersion: lifecycle.keptn.sh/v1
 kind: KeptnWorkload
 metadata:

test/chainsaw/integration/simple-statefulset-annotated/00-assert.yaml

@@ -1,14 +1,3 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  labels:
-    app: statefultest
-  name: statefultest
-status:
-  replicas: 2
-  availableReplicas: 2
-  readyReplicas: 2
----
 apiVersion: lifecycle.keptn.sh/v1
 kind: KeptnWorkload
 metadata:
@@ -18,7 +7,6 @@ spec:
     commit-id: "1234"
     stage: dev
 ---
-
 apiVersion: lifecycle.keptn.sh/v1
 kind: KeptnWorkloadVersion
 metadata:

test/chainsaw/scheduling-gates/simple-deployment-restart-pod/00-assert.yaml

@@ -1,12 +1,3 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: test
-  name: test
-status:
-  readyReplicas: 1
----
 apiVersion: v1
 kind: Pod
 metadata:

test/chainsaw/scheduling-gates/simple-deployment-restart-pod/01-assert.yaml

@@ -27,10 +27,3 @@ apiVersion: lifecycle.keptn.sh/v1
 kind: KeptnAppVersion
 metadata:
   name: waiter-0.4-6b86b273
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: test
-status:
-  readyReplicas: 1

test/chainsaw/scheduling-gates/simple-deployment-restart-pod/02-assert.yaml

@@ -3,4 +3,5 @@ kind: Deployment
 metadata:
   name: test
 status:
-  readyReplicas: 2
+  replicas: 2
+  unavailableReplicas: 0

test/chainsaw/scheduling-gates/simple-deployment/00-assert.yaml

@@ -1,12 +1,3 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: test
-  name: test
-status:
-  readyReplicas: 1
----
 apiVersion: v1
 kind: Pod
 metadata:

test/chainsaw/testcertificate/cert-recreates/00-assert.yaml

@@ -5,15 +5,6 @@ metadata:
   name: keptn-certs
   namespace: keptn-system
 ---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  namespace: keptn-system
-  labels:
-    control-plane: lifecycle-operator
-status:
-  readyReplicas: 1
----
 apiVersion: v1
 kind: Pod
 metadata:

test/chainsaw/testcertificate/cert-recreates/01-assert.yaml

@@ -5,15 +5,6 @@ metadata:
   name: keptn-certs
   namespace: keptn-system
 ---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  namespace: keptn-system
-  labels:
-    control-plane: lifecycle-operator
-status:
-  readyReplicas: 1
----
 apiVersion: v1
 kind: Pod
 metadata:

test/chainsaw/testcertificate/cert-recreates/02-assert.yaml

@@ -7,15 +7,6 @@ metadata:
   annotations:
     mycert: "true"  # make sure this is the latest secret
 ---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    control-plane: lifecycle-operator
-  namespace: keptn-system
-status:
-  readyReplicas: 1
----
 apiVersion: v1
 kind: Pod
 metadata: