From e02670c53009b578963f29c65125d147592dbc9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Vonheiden?= <bjoern.vonheiden@hotmail.de>
Date: Mon, 8 Jun 2020 16:05:51 +0200
Subject: [PATCH] Fix workload generator kubernetes yamls using string vor
environment
The environment variables in the kubernetes files need to be a
string in order to be computed by kubernetes.
---
execution/run_uc2-new.sh | 2 +-
execution/run_uc3-new.sh | 4 ++--
execution/run_uc4-new.sh | 2 +-
execution/uc1-workload-generator/deployment.yaml | 2 +-
execution/uc1-workload-generator/kustomization.yaml | 3 ---
execution/uc1-workload-generator/set_paramters.yaml | 4 ++--
execution/uc2-workload-generator/kustomization.yaml | 3 ---
execution/uc2-workload-generator/set_paramters.yaml | 2 +-
execution/uc3-workload-generator/kustomization.yaml | 3 ---
execution/uc3-workload-generator/set_paramters.yaml | 4 ++--
execution/uc4-workload-generator/kustomization.yaml | 3 ---
execution/uc4-workload-generator/set_paramters.yaml | 2 +-
12 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/execution/run_uc2-new.sh b/execution/run_uc2-new.sh
index 06dca8f32..052c8ba5c 100755
--- a/execution/run_uc2-new.sh
+++ b/execution/run_uc2-new.sh
@@ -39,7 +39,7 @@ spec:
- name: workload-generator
env:
- name: NUM_NESTED_GROUPS
- value: $NUM_NESTED_GROUPS
+ value: "$NUM_NESTED_GROUPS"
EOF
kubectl apply -k uc2-workload-generator
diff --git a/execution/run_uc3-new.sh b/execution/run_uc3-new.sh
index 2526791ea..85712030e 100755
--- a/execution/run_uc3-new.sh
+++ b/execution/run_uc3-new.sh
@@ -42,9 +42,9 @@ spec:
- name: workload-generator
env:
- name: NUM_SENSORS
- value: $NUM_SENSORS
+ value: "$NUM_SENSORS"
- name: INSTANCES
- value: $WL_INSTANCES
+ value: "$WL_INSTANCES"
EOF
kubectl apply -k uc3-workload-generator
diff --git a/execution/run_uc4-new.sh b/execution/run_uc4-new.sh
index 76da28d9a..8f44d7247 100755
--- a/execution/run_uc4-new.sh
+++ b/execution/run_uc4-new.sh
@@ -39,7 +39,7 @@ spec:
- name: workload-generator
env:
- name: NUM_SENSORS
- value: $NUM_SENSORS
+ value: "$NUM_SENSORS"
EOF
kubectl apply -k uc4-workload-generator
diff --git a/execution/uc1-workload-generator/deployment.yaml b/execution/uc1-workload-generator/deployment.yaml
index d73248526..0db431d58 100644
--- a/execution/uc1-workload-generator/deployment.yaml
+++ b/execution/uc1-workload-generator/deployment.yaml
@@ -21,7 +21,7 @@ spec:
- name: KAFKA_BOOTSTRAP_SERVERS
value: "my-confluent-cp-kafka:9092"
- name: NUM_SENSORS
- value: 25000
+ value: "25000"
- name: POD_NAME
valueFrom:
fieldRef:
diff --git a/execution/uc1-workload-generator/kustomization.yaml b/execution/uc1-workload-generator/kustomization.yaml
index 17c5d2e19..faf86aa9a 100644
--- a/execution/uc1-workload-generator/kustomization.yaml
+++ b/execution/uc1-workload-generator/kustomization.yaml
@@ -1,9 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
-commonLabels:
- app: titan-ccp-aggregation
-
# Use all resources to compose them into one file
resources:
- deployment.yaml
diff --git a/execution/uc1-workload-generator/set_paramters.yaml b/execution/uc1-workload-generator/set_paramters.yaml
index 9d512893f..a63afa46f 100644
--- a/execution/uc1-workload-generator/set_paramters.yaml
+++ b/execution/uc1-workload-generator/set_paramters.yaml
@@ -10,6 +10,6 @@ spec:
- name: workload-generator
env:
- name: NUM_SENSORS
- value: 25000
+ value: "25000"
- name: INSTANCES
- value: 1
+ value: "1"
diff --git a/execution/uc2-workload-generator/kustomization.yaml b/execution/uc2-workload-generator/kustomization.yaml
index 17c5d2e19..faf86aa9a 100644
--- a/execution/uc2-workload-generator/kustomization.yaml
+++ b/execution/uc2-workload-generator/kustomization.yaml
@@ -1,9 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
-commonLabels:
- app: titan-ccp-aggregation
-
# Use all resources to compose them into one file
resources:
- deployment.yaml
diff --git a/execution/uc2-workload-generator/set_paramters.yaml b/execution/uc2-workload-generator/set_paramters.yaml
index 835568cc4..d585eb437 100644
--- a/execution/uc2-workload-generator/set_paramters.yaml
+++ b/execution/uc2-workload-generator/set_paramters.yaml
@@ -10,4 +10,4 @@ spec:
- name: workload-generator
env:
- name: NUM_NESTED_GROUPS
- value: 25000
+ value: "25000"
diff --git a/execution/uc3-workload-generator/kustomization.yaml b/execution/uc3-workload-generator/kustomization.yaml
index 17c5d2e19..faf86aa9a 100644
--- a/execution/uc3-workload-generator/kustomization.yaml
+++ b/execution/uc3-workload-generator/kustomization.yaml
@@ -1,9 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
-commonLabels:
- app: titan-ccp-aggregation
-
# Use all resources to compose them into one file
resources:
- deployment.yaml
diff --git a/execution/uc3-workload-generator/set_paramters.yaml b/execution/uc3-workload-generator/set_paramters.yaml
index 9d512893f..a63afa46f 100644
--- a/execution/uc3-workload-generator/set_paramters.yaml
+++ b/execution/uc3-workload-generator/set_paramters.yaml
@@ -10,6 +10,6 @@ spec:
- name: workload-generator
env:
- name: NUM_SENSORS
- value: 25000
+ value: "25000"
- name: INSTANCES
- value: 1
+ value: "1"
diff --git a/execution/uc4-workload-generator/kustomization.yaml b/execution/uc4-workload-generator/kustomization.yaml
index 17c5d2e19..faf86aa9a 100644
--- a/execution/uc4-workload-generator/kustomization.yaml
+++ b/execution/uc4-workload-generator/kustomization.yaml
@@ -1,9 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
-commonLabels:
- app: titan-ccp-aggregation
-
# Use all resources to compose them into one file
resources:
- deployment.yaml
diff --git a/execution/uc4-workload-generator/set_paramters.yaml b/execution/uc4-workload-generator/set_paramters.yaml
index 140804368..50ca424fb 100644
--- a/execution/uc4-workload-generator/set_paramters.yaml
+++ b/execution/uc4-workload-generator/set_paramters.yaml
@@ -10,4 +10,4 @@ spec:
- name: workload-generator
env:
- name: NUM_SENSORS
- value: 25000
+ value: "25000"
--
GitLab