fixed name of the job in delete function

ag-computational-bio · May 17, 2021 · 28c8e25 · 28c8e25
1 parent 6c4d1ad
commit 28c8e25
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.kube/dev-deployment.yaml b/.kube/dev-deployment.yaml
@@ -29,15 +29,15 @@ spec:
         - name: BaseKey
           value: data/dev
         - name: DBName
-          value: bakta-dev
+          value: bakta
         - name: DBPort
-          value: "5432"
+          value: "3306"
         - name: DBUser
-          value: bakta-dev
+          value: bakta
         - name: DataBucket
           value: baktadata
         - name: DatabaseHost
-          value: bakta-postgres-postgresql.bakta-dev.svc.cluster.local
+          value: bakta-mysql.bakta-dev.svc.cluster.local
         - name: GRPC_GO_LOG_SEVERITY_LEVEL
           value: debug
         - name: GRPC_GO_LOG_VERBOSITY_LEVEL
@@ -47,8 +47,8 @@ spec:
         - name: DBPassword
           valueFrom:
             secretKeyRef:
-              key: postgresql-password
-              name: bakta-postgres-postgresql
+              key: mysql-password
+              name: bakta-mysql
         - name: AWS_ACCESS_KEY_ID
           valueFrom:
             secretKeyRef:
@@ -64,7 +64,7 @@ spec:
             secretKeyRef:
               key: Token
               name: authhandler
-        image: harbor.computational.bio.uni-giessen.de/bakta/bakta-web-backend:0.2.9-beta.6
+        image: harbor.computational.bio.uni-giessen.de/bakta/bakta-web-backend:0.2.9-beta.7
         imagePullPolicy: Always
         name: baktabackend
         ports:

diff --git a/scheduler/SimpleScheduler.go b/scheduler/SimpleScheduler.go
@@ -3,6 +3,7 @@ package scheduler
 import (
 	"context"
 	"flag"
+	"fmt"
 	"log"
 	"os"
 	"path/filepath"
@@ -105,7 +106,9 @@ func (scheduler *SimpleScheduler) StartJob(jobID string, jobConfig *api.JobConfi
 }
 
 func (scheduler *SimpleScheduler) DeleteJob(jobName string) error {
-	err := scheduler.k8sClient.BatchV1().Jobs(scheduler.namespace).Delete(context.TODO(), jobName, metav1.DeleteOptions{})
+	k8sJobName := fmt.Sprintf("%s%s", "bakta-job-", jobName)
+
+	err := scheduler.k8sClient.BatchV1().Jobs(scheduler.namespace).Delete(context.TODO(), k8sJobName, metav1.DeleteOptions{})
 	if err != nil && !errors.IsNotFound(err) {
 		log.Println(err.Error())
 		return err