fix(operator): make sure there is exactly one job per task execution (#…

…1672)

Signed-off-by: Florian Bacher <florian.bacher@dynatrace.com>

operator/controllers/lifecycle/keptntask/controller.go

@@ -29,7 +29,6 @@ import (
 	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/trace"
-	batchv1 "k8s.io/api/batch/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
@@ -136,7 +135,6 @@ func (r *KeptnTaskReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		// predicate disabling the auto reconciliation after updating the object status
 		For(&klcv1alpha3.KeptnTask{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
-		Owns(&batchv1.Job{}).
 		Complete(r)
 }
 

operator/test/component/task/task_test.go

@@ -76,9 +76,9 @@ var _ = Describe("Task", Ordered, func() {
 					}, task)
 					g.Expect(err).To(BeNil())
 					g.Expect(task.Status.Status).To(Equal(apicommon.StateFailed))
-				}, "10s").Should(Succeed())
+				}, "20s").Should(Succeed())
 			})
-			It("succeed task if taskDefiniton for Deno is present in default KLT namespace", func() {
+			It("succeed task if taskDefinition for Deno is present in default KLT namespace", func() {
 				By("create default KLT namespace")
 
 				ns := &v1.Namespace{

test/integration/simple-task/00-install.yaml

@@ -0,0 +1,29 @@
+apiVersion: lifecycle.keptn.sh/v1alpha3
+kind: KeptnTaskDefinition
+metadata:
+  name: pre-deployment-hello
+spec:
+  function:
+    inline:
+      code: |
+        console.log("Pre-Deployment Task has been executed");
+---
+apiVersion: lifecycle.keptn.sh/v1alpha3
+kind: KeptnTask
+metadata:
+  name: pre-deployment-hello-1234
+spec:
+  app: podtato-head
+  appVersion: 0.1.2
+  checkType: pre
+  taskDefinition: pre-deployment-hello
+  timeout: 5m0s
+  workload: ""
+  workloadVersion: ""
+  context:
+    appName: ""
+    appVersion: ""
+    objectType: ""
+    taskType: ""
+    workloadName: ""
+    workloadVersion: ""

test/integration/simple-task/01-teststep.yaml

@@ -0,0 +1,4 @@
+apiVersion: kuttl.dev/v1
+kind: TestStep
+commands:
+  - script: ./verify-tasks.sh

test/integration/simple-task/verify-tasks.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+RETRY_COUNT=3
+SLEEP_TIME=5
+
+for i in $(seq 1 $RETRY_COUNT); do
+    NR_JOBS=$(kubectl get jobs -n ${NAMESPACE} --no-headers | wc -l)
+
+    if [[ ${NR_JOBS} -eq 1 ]]; then
+      echo "Found exactly 1 job"
+      exit 0
+    else
+      echo "Number of jobs is not equal to 1"
+    fi
+
+    if [ "$i" -lt "$RETRY_COUNT" ]; then
+        echo "Sleeping for ${SLEEP_TIME} seconds before retrying..."
+        sleep ${SLEEP_TIME}
+    fi
+done
+
+echo "Retried ${RETRY_COUNT} times, but expected number of resources could not be verified. Exiting..."
+exit 1