From aa7644d6653161120b007d3c8dabc2598793caff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de> Date: Thu, 11 Feb 2021 19:15:51 +0100 Subject: [PATCH] Prepare 0.3 release --- docker-test/uc1-docker-compose/docker-compose.yml | 4 ++-- docker-test/uc2-docker-compose/docker-compose.yml | 4 ++-- docker-test/uc3-docker-compose/docker-compose.yml | 4 ++-- docker-test/uc4-docker-compose/docker-compose.yml | 4 ++-- execution/run_uc.py | 4 ++-- execution/theodolite.yaml | 2 +- execution/uc-application/aggregation-deployment.yaml | 2 +- execution/uc-workload-generator/workloadGenerator.yaml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docker-test/uc1-docker-compose/docker-compose.yml b/docker-test/uc1-docker-compose/docker-compose.yml index 905e6e30b..ee3dc0622 100755 --- a/docker-test/uc1-docker-compose/docker-compose.yml +++ b/docker-test/uc1-docker-compose/docker-compose.yml @@ -32,14 +32,14 @@ services: SCHEMA_REGISTRY_HOST_NAME: schema-registry SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181' uc-app: - image: theodolite/theodolite-uc1-kstreams-app:latest + image: theodolite/theodolite-uc1-kstreams-app:v0.3.0 depends_on: - schema-registry - kafka environment: KAFKA_BOOTSTRAP_SERVERS: kafka:9092 uc-wg: - image: theodolite/theodolite-uc1-workload-generator:latest + image: theodolite/theodolite-uc1-workload-generator:v0.3.0 depends_on: - schema-registry - kafka diff --git a/docker-test/uc2-docker-compose/docker-compose.yml b/docker-test/uc2-docker-compose/docker-compose.yml index e6511bfd9..89759f3f9 100755 --- a/docker-test/uc2-docker-compose/docker-compose.yml +++ b/docker-test/uc2-docker-compose/docker-compose.yml @@ -32,14 +32,14 @@ services: SCHEMA_REGISTRY_HOST_NAME: schema-registry SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181' uc-app: - image: theodolite/theodolite-uc2-kstreams-app:latest + image: theodolite/theodolite-uc2-kstreams-app:v0.3.0 depends_on: - schema-registry - kafka environment: KAFKA_BOOTSTRAP_SERVERS: kafka:9092 uc-wg: - image: theodolite/theodolite-uc2-workload-generator:latest + image: theodolite/theodolite-uc2-workload-generator:v0.3.0 depends_on: - schema-registry - kafka diff --git a/docker-test/uc3-docker-compose/docker-compose.yml b/docker-test/uc3-docker-compose/docker-compose.yml index 9d2da8e87..facc3cf52 100755 --- a/docker-test/uc3-docker-compose/docker-compose.yml +++ b/docker-test/uc3-docker-compose/docker-compose.yml @@ -35,7 +35,7 @@ services: SCHEMA_REGISTRY_HOST_NAME: schema-registry SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181' uc-app: - image: theodolite/theodolite-uc3-kstreams-app:latest + image: theodolite/theodolite-uc3-kstreams-app:v0.3.0 depends_on: - schema-registry - kafka @@ -44,7 +44,7 @@ services: SCHEMA_REGISTRY_URL: http://schema-registry:8081 KAFKA_WINDOW_DURATION_MINUTES: 60 uc-wg: - image: theodolite/theodolite-uc3-workload-generator:latest + image: theodolite/theodolite-uc3-workload-generator:v0.3.0 depends_on: - schema-registry - kafka diff --git a/docker-test/uc4-docker-compose/docker-compose.yml b/docker-test/uc4-docker-compose/docker-compose.yml index 530852b2d..a17b12796 100755 --- a/docker-test/uc4-docker-compose/docker-compose.yml +++ b/docker-test/uc4-docker-compose/docker-compose.yml @@ -33,7 +33,7 @@ services: SCHEMA_REGISTRY_HOST_NAME: schema-registry SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181' uc-app: - image: theodolite/theodolite-uc4-kstreams-app:latest + image: theodolite/theodolite-uc4-kstreams-app:v0.3.0 depends_on: - schema-registry - kafka @@ -41,7 +41,7 @@ services: KAFKA_BOOTSTRAP_SERVERS: kafka:9092 SCHEMA_REGISTRY_URL: http://schema-registry:8081 uc-wg: - image: theodolite/theodolite-uc4-workload-generator:latest + image: theodolite/theodolite-uc4-workload-generator:v0.3.0 depends_on: - schema-registry - kafka diff --git a/execution/run_uc.py b/execution/run_uc.py index 9bbb28764..09334fdb3 100644 --- a/execution/run_uc.py +++ b/execution/run_uc.py @@ -143,7 +143,7 @@ def start_workload_generator(wg_yaml, dim_value, uc_id): wg_containter = next(filter( lambda x: x['name'] == 'workload-generator', wg_yaml['spec']['template']['spec']['containers'])) wg_containter['image'] = 'ghcr.io/cau-se/theodolite-uc' + uc_id + \ - '-workload-generator:latest' + '-workload-generator:v0.3.0' # Set environment variables replace_env_value(wg_containter['env'], 'NUM_SENSORS', str(num_sensors)) @@ -226,7 +226,7 @@ def start_application(svc_yaml, svc_monitor_yaml, jmx_yaml, deploy_yaml, lambda x: x['name'] == 'uc-application', deploy_yaml['spec']['template']['spec']['containers'])) app_container['image'] = 'ghcr.io/cau-se/theodolite-uc' + uc_id \ - + '-kstreams-app:latest' + + '-kstreams-app:v0.3.0' # Set configurations environment parameters for SPE for k, v in configurations.items(): diff --git a/execution/theodolite.yaml b/execution/theodolite.yaml index 06d14a0f5..f8211beee 100644 --- a/execution/theodolite.yaml +++ b/execution/theodolite.yaml @@ -11,7 +11,7 @@ spec: claimName: theodolite-pv-claim containers: - name: theodolite - image: ghcr.io/cau-se/theodolite:latest + image: ghcr.io/cau-se/theodolite:v0.3.0 # imagePullPolicy: Never # Used to pull "own" local image env: - name: UC # mandatory diff --git a/execution/uc-application/aggregation-deployment.yaml b/execution/uc-application/aggregation-deployment.yaml index 07732ca1d..f978e0e95 100644 --- a/execution/uc-application/aggregation-deployment.yaml +++ b/execution/uc-application/aggregation-deployment.yaml @@ -15,7 +15,7 @@ spec: terminationGracePeriodSeconds: 0 containers: - name: uc-application - image: uc-app:latest + image: uc-app:v0.3.0 ports: - containerPort: 5555 name: jmx diff --git a/execution/uc-workload-generator/workloadGenerator.yaml b/execution/uc-workload-generator/workloadGenerator.yaml index 794468b18..2f60f16e7 100644 --- a/execution/uc-workload-generator/workloadGenerator.yaml +++ b/execution/uc-workload-generator/workloadGenerator.yaml @@ -15,7 +15,7 @@ spec: terminationGracePeriodSeconds: 0 containers: - name: workload-generator - image: workload-generator:latest + image: workload-generator:v0.3.0 env: # Order need to be preserved for run_uc.py - name: NUM_SENSORS -- GitLab