From cdebe2b4b31a5356f9782520c32cd3725a9f01fc Mon Sep 17 00:00:00 2001
From: Marius <mariusdieckmann90@gmail.com>
Date: Tue, 11 May 2021 17:54:30 +0200
Subject: [PATCH] job image now taken from env var

---
 .kube/dev-deployment.yaml | 91 +++++++++++++++++++++++++++++++++++++++
 scheduler/startJob.go     |  5 ++-
 2 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/.kube/dev-deployment.yaml b/.kube/dev-deployment.yaml
index e69de29..6f670f8 100644
--- a/.kube/dev-deployment.yaml
+++ b/.kube/dev-deployment.yaml
@@ -0,0 +1,91 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: bakta-backend
+  labels:
+    app.kubernetes.io/name: backend
+    app.kubernetes.io/part-of: bakta-web
+    app.kubernetes.io/version: v0.1.0
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: backend
+      app.kubernetes.io/part-of: bakta-web
+      app.kubernetes.io/version: v0.1.0
+  template:
+    metadata:
+      annotations:
+        linkerd.io/inject: enabled
+      labels:
+        app.kubernetes.io/name: backend
+        app.kubernetes.io/part-of: bakta-web
+        app.kubernetes.io/version: v0.1.0
+    spec:
+      containers:
+      - env:
+        - name: JobContainer
+          value: harbor.computational.bio.uni-giessen.de/bakta/bakta-web-job:0.1.0-beta.1 
+        - name: BaseKey
+          value: data/dev
+        - name: DBName
+          value: bakta-dev
+        - name: DBPort
+          value: "5432"
+        - name: DBUser
+          value: bakta-dev
+        - name: DataBucket
+          value: baktadata
+        - name: DatabaseHost
+          value: bakta-postgres-postgresql.bakta-dev.svc.cluster.local
+        - name: GRPC_GO_LOG_SEVERITY_LEVEL
+          value: debug
+        - name: GRPC_GO_LOG_VERBOSITY_LEVEL
+          value: "2"
+        - name: InCluster
+          value: "true"
+        - name: DBPassword
+          valueFrom:
+            secretKeyRef:
+              key: postgresql-password
+              name: bakta-postgres-postgresql
+        - name: AWS_ACCESS_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              key: AccessKey
+              name: s3
+        - name: AWS_SECRET_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              key: SecretKey
+              name: s3
+        - name: ApiToken
+          valueFrom:
+            secretKeyRef:
+              key: Token
+              name: authhandler
+        image: harbor.computational.bio.uni-giessen.de/bakta/bakta-web-backend:0.2.4
+        imagePullPolicy: Always
+        name: baktabackend
+        ports:
+        - containerPort: 8080
+          name: 8080tcp2
+          protocol: TCP
+        - containerPort: 8081
+          name: 8081tcp2
+          protocol: TCP
+        volumeMounts:
+        - mountPath: /tmp
+          name: tmp-volume
+        - mountPath: /config
+          name: config
+          readOnly: true
+      serviceAccount: bakta-runner
+      serviceAccountName: bakta-runner
+      volumes:
+      - emptyDir: {}
+        name: tmp-volume
+      - configMap:
+          defaultMode: 420
+          name: baktabackendconf
+        name: config
diff --git a/scheduler/startJob.go b/scheduler/startJob.go
index 5244611..5d3d10b 100644
--- a/scheduler/startJob.go
+++ b/scheduler/startJob.go
@@ -3,6 +3,7 @@ package scheduler
 import (
 	"fmt"
 	"log"
+	"os"
 
 	"github.com/spf13/viper"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -56,6 +57,8 @@ func createBaseJobConf(
 	var TmpTTLValue int32
 	TmpTTLValue = JOBTTL
 
+	job_image := os.Getenv("JobContainer")
+
 	job := &batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      fmt.Sprintf("bakta-job-%v", id),
@@ -69,7 +72,7 @@ func createBaseJobConf(
 					Containers: []v1.Container{
 						{
 							Name:  "bakta-job",
-							Image: "quay.io/mariusdieckmann/bakta-web-job:latest",
+							Image: job_image,
 							Lifecycle: &v1.Lifecycle{
 								PostStart: &v1.Handler{
 									Exec: &v1.ExecAction{