Skip to content

Commit

Permalink
job image now taken from env var
Browse files Browse the repository at this point in the history
  • Loading branch information
MariusDieckmann committed May 11, 2021
1 parent 338bc3c commit cdebe2b
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 1 deletion.
91 changes: 91 additions & 0 deletions .kube/dev-deployment.yaml
Original file line number Diff line number Diff line change
@@ -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
5 changes: 4 additions & 1 deletion scheduler/startJob.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package scheduler
import (
"fmt"
"log"
"os"

"github.com/spf13/viper"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down Expand Up @@ -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),
Expand All @@ -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{
Expand Down

0 comments on commit cdebe2b

Please sign in to comment.