From 34ef183aa2b0fa9f9b826ea152f8702d44aa7f04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Vonheiden?= <bjoern.vonheiden@hotmail.de>
Date: Wed, 16 Sep 2020 16:04:00 +0200
Subject: [PATCH] Fix order of environment variables in application yaml

The order of the environment variables is atm crucial for the
run uc py.
---
 execution/run_uc.py                                       | 2 +-
 execution/uc-application/base/aggregation-deployment.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/execution/run_uc.py b/execution/run_uc.py
index 7a2c2c695..f25d2555e 100644
--- a/execution/run_uc.py
+++ b/execution/run_uc.py
@@ -230,7 +230,7 @@ def start_application(svc_yaml, svc_monitor_yaml, jmx_yaml, deploy_yaml):
     app_container['image'] = 'theodolite/theodolite-uc' + args.uc_id \
         + '-kstreams-app:latest'
     # TODO: acces over name of attribute
-    app_container['env'][1]['value'] = str(args.commit_interval_ms)
+    app_container['env'][0]['value'] = str(args.commit_interval_ms)
     app_container['resources']['limits']['memory'] = args.memory_limit
     app_container['resources']['limits']['cpu'] = args.cpu_limit
     try:
diff --git a/execution/uc-application/base/aggregation-deployment.yaml b/execution/uc-application/base/aggregation-deployment.yaml
index 70f50e0b4..81da3eea7 100644
--- a/execution/uc-application/base/aggregation-deployment.yaml
+++ b/execution/uc-application/base/aggregation-deployment.yaml
@@ -20,12 +20,12 @@ spec:
         - containerPort: 5555
           name: jmx
         env:
+        - name: COMMIT_INTERVAL_MS
+          value: "100"
         - name: KAFKA_BOOTSTRAP_SERVERS
           value: "my-confluent-cp-kafka:9092"
         - name: SCHEMA_REGISTRY_URL
           value: "http://my-confluent-cp-schema-registry:8081"
-        - name: COMMIT_INTERVAL_MS
-          value: "100"
         - name: JAVA_OPTS
           value: "-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=5555"
         resources:
-- 
GitLab