From a7cf29263e71ae22adced8e7ba36b843fd18f514 Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Wed, 14 Apr 2021 19:06:40 +0200
Subject: [PATCH] clean up

---
 execution/README.md              |  2 +-
 execution/theodolite-kotlin.yaml | 56 --------------------------------
 execution/theodolite.yaml        |  2 +-
 3 files changed, 2 insertions(+), 58 deletions(-)
 delete mode 100644 execution/theodolite-kotlin.yaml

diff --git a/execution/README.md b/execution/README.md
index cdb46a5c7..7b0a4dc6b 100644
--- a/execution/README.md
+++ b/execution/README.md
@@ -245,7 +245,7 @@ Kubernetes volume.
 
 ### Configuration
 
-Be sure, that the names of the configmap corresponds correctly to the specifications of the mounted `configmaps`, `volumes`, `mountPath`.
+Be sure, that the names of the configmap corresponds correctly to the specifications of the mounted `configmaps`, `volumes`, `mountPath`. In particular: The name of the execution file and the benchmark file must match the value of the corresponding environment variable.
 
 ### Domain Restriction
 
diff --git a/execution/theodolite-kotlin.yaml b/execution/theodolite-kotlin.yaml
deleted file mode 100644
index a6f0c09b3..000000000
--- a/execution/theodolite-kotlin.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: theodolite-kotlin-test
-spec:
-  template:
-    spec:
-      securityContext:
-        runAsUser: 0
-      containers:
-        - name: lag-analysis
-          image: ghcr.io/cau-se/theodolite-slo-checker-lag-trend:theodolite-kotlin-latest
-          ports:
-          - containerPort: 80
-            name: analysis
-        - name: theodolite
-          image: benediktwetzel/theodolite-test #ghcr.io/cau-se/theodolite:theodolite-kotlin-latest
-          imagePullPolicy: Always
-          # command: ["/bin/sh", "-ec", "while :; do echo '.'; sleep 5 ; done"]
-          env:
-            - name: NAMESPACE
-              value: theodolite-she
-            - name: MODE
-              value: yaml-executor
-            - name: THEODOLITE_EXECUTION
-              value: /etc/execution/example-execution-yaml-resource.yaml
-            - name: THEODOLITE_BENCHMARK
-              value: /etc/benchmark/example-benchmark-yaml-resource.yaml
-            - name: THEODOLITE_APP_RESOURCES
-              value: /etc/app-resources
-          volumeMounts:
-            - mountPath: "/deployments/results"
-              name: theodolite-pv-storage
-            - mountPath: "/etc/app-resources"
-              name: app-resources
-            - mountPath: "/etc/benchmark" 
-              name: benchmark
-            - mountPath: "/etc/execution"
-              name: execution
-      restartPolicy: Never
-      # Uncomment if RBAC is enabled and configured
-      serviceAccountName: theodolite
-      volumes:
-        - name: theodolite-pv-storage
-          persistentVolumeClaim:
-            claimName: theodolite-pv-claim
-        - name: app-resources
-          configMap:
-            name: app-resources-configmap
-        - name: benchmark
-          configMap:
-            name: benchmark-configmap
-        - name: execution
-          configMap:
-            name: execution-configmap
-  backoffLimit: 4
\ No newline at end of file
diff --git a/execution/theodolite.yaml b/execution/theodolite.yaml
index bf40f2f4f..c9fcf7e3f 100644
--- a/execution/theodolite.yaml
+++ b/execution/theodolite.yaml
@@ -14,7 +14,7 @@ spec:
           - containerPort: 80
             name: analysis
         - name: theodolite
-          image: lorenzboguhn/thedolite #benediktwetzel/theodolite-test #ghcr.io/cau-se/theodolite:theodolite-kotlin-latest
+          image: ghcr.io/cau-se/theodolite:theodolite-kotlin-latest
           imagePullPolicy: Always
           env:
             - name: NAMESPACE
-- 
GitLab