From 3e1a15f1c1d9dbe6363abd30ef7456cf1029a8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de> Date: Wed, 23 Feb 2022 16:19:46 +0100 Subject: [PATCH] Use Strimzi Kafka --- .../uc1-beam-flink/resources/jobmanager-deployment.yaml | 2 +- .../uc1-beam-flink/resources/taskmanager-deployment.yaml | 2 +- .../uc1-beam-flink/uc1-beam-flink-benchmark-operator.yaml | 2 +- .../uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml | 6 +++--- .../uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml | 2 +- .../uc1-flink/resources/taskmanager-deployment.yaml | 2 +- .../definitions/uc1-flink/uc1-flink-benchmark-operator.yaml | 2 +- .../uc2-beam-flink/resources/jobmanager-deployment.yaml | 2 +- .../uc2-beam-flink/resources/taskmanager-deployment.yaml | 2 +- .../uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml | 2 +- .../uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml | 6 +++--- .../uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml | 2 +- .../uc3-beam-flink/resources/jobmanager-deployment.yaml | 2 +- .../uc3-beam-flink/resources/taskmanager-deployment.yaml | 2 +- .../uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml | 2 +- .../uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml | 6 +++--- .../uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml | 2 +- .../uc4-beam-flink/resources/jobmanager-deployment.yaml | 2 +- .../uc4-beam-flink/resources/taskmanager-deployment.yaml | 2 +- .../uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml | 2 +- .../uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml | 6 +++--- .../uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml | 2 +- 22 files changed, 30 insertions(+), 30 deletions(-) diff --git a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/jobmanager-deployment.yaml index a38cb9658..5108ff272 100644 --- a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/jobmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/jobmanager-deployment.yaml @@ -25,7 +25,7 @@ spec: # optional arguments: ["--job-id", "<job id>", "--fromSavepoint", "/path/to/savepoint", "--allowNonRestoredState"] env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: COMMIT_INTERVAL_MS diff --git a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/taskmanager-deployment.yaml index 87c6465d5..6991aab24 100644 --- a/theodolite-benchmarks/definitions/uc1-beam-flink/resources/taskmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc1-beam-flink/resources/taskmanager-deployment.yaml @@ -21,7 +21,7 @@ spec: args: ["taskmanager"] env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: COMMIT_INTERVAL_MS diff --git a/theodolite-benchmarks/definitions/uc1-beam-flink/uc1-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-beam-flink/uc1-beam-flink-benchmark-operator.yaml index ef4627a46..2e110abfc 100644 --- a/theodolite-benchmarks/definitions/uc1-beam-flink/uc1-beam-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-beam-flink/uc1-beam-flink-benchmark-operator.yaml @@ -50,7 +50,7 @@ spec: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-cp-kafka:9092" + bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml index 9a0916f47..98a0a2631 100644 --- a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml @@ -21,13 +21,13 @@ spec: - name: SAMZA_JOB_COORDINATOR_ZK_CONNECT value: "theodolite-cp-zookeeper:2181" - name: SAMZA_SYSTEMS_KAFKA_PRODUCER_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: MAX_SOURCE_PARALLELISM value: "1024" - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" # - name: JAVA_OPTS diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml index dddac35ab..912bcf954 100644 --- a/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml @@ -46,7 +46,7 @@ spec: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-cp-kafka:9092" + bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml index 9622efa42..9710d44cb 100644 --- a/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml @@ -20,7 +20,7 @@ spec: image: ghcr.io/cau-se/theodolite-uc1-flink:latest env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolitee-kafka-kafka-bootstrap:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: COMMIT_INTERVAL_MS diff --git a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml index b23de5d1f..20953c2d1 100644 --- a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml @@ -50,7 +50,7 @@ spec: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolitee-kafka-kafka-bootstrap:9092" + bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/jobmanager-deployment.yaml index 727f2192d..2f6203c33 100644 --- a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/jobmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/jobmanager-deployment.yaml @@ -25,7 +25,7 @@ spec: # optional arguments: ["--job-id", "<job id>", "--fromSavepoint", "/path/to/savepoint", "--allowNonRestoredState"] env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: COMMIT_INTERVAL_MS diff --git a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/taskmanager-deployment.yaml index ffef5d87a..f6072f9e6 100644 --- a/theodolite-benchmarks/definitions/uc2-beam-flink/resources/taskmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc2-beam-flink/resources/taskmanager-deployment.yaml @@ -21,7 +21,7 @@ spec: args: ["taskmanager"] env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: COMMIT_INTERVAL_MS diff --git a/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml index 3c0851983..ffe613b40 100644 --- a/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml @@ -50,7 +50,7 @@ spec: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-cp-kafka:9092" + bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml index 49e5b37ab..6b10e34eb 100644 --- a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml @@ -20,13 +20,13 @@ spec: - name: SAMZA_JOB_COORDINATOR_ZK_CONNECT value: "theodolite-cp-zookeeper:2181" - name: SAMZA_SYSTEMS_KAFKA_PRODUCER_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: MAX_SOURCE_PARALLELISM value: "1024" - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: COMMIT_INTERVAL_MS # Set as default for the applications diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml index f338d1497..1702c025a 100644 --- a/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml @@ -64,7 +64,7 @@ spec: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-cp-kafka:9092" + bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/jobmanager-deployment.yaml index 0f801fb47..24572528b 100644 --- a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/jobmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/jobmanager-deployment.yaml @@ -25,7 +25,7 @@ spec: # optional arguments: ["--job-id", "<job id>", "--fromSavepoint", "/path/to/savepoint", "--allowNonRestoredState"] env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: COMMIT_INTERVAL_MS diff --git a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/taskmanager-deployment.yaml index fb98cbc0e..a753b9e06 100644 --- a/theodolite-benchmarks/definitions/uc3-beam-flink/resources/taskmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc3-beam-flink/resources/taskmanager-deployment.yaml @@ -21,7 +21,7 @@ spec: args: ["taskmanager"] env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: COMMIT_INTERVAL_MS diff --git a/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml index dc31f2d36..4449252c0 100644 --- a/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml @@ -50,7 +50,7 @@ spec: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-cp-kafka:9092" + bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml index 8b59dfbd9..b36d00093 100644 --- a/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml @@ -21,13 +21,13 @@ spec: - name: SAMZA_JOB_COORDINATOR_ZK_CONNECT value: "theodolite-cp-zookeeper:2181" - name: SAMZA_SYSTEMS_KAFKA_PRODUCER_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: MAX_SOURCE_PARALLELISM value: "1024" - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: COMMIT_INTERVAL_MS # Set as default for the applications diff --git a/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml index ecfab8d80..52e1f9a3a 100644 --- a/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml @@ -46,7 +46,7 @@ spec: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-cp-kafka:9092" + bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/jobmanager-deployment.yaml index b67b4d559..90e81074c 100644 --- a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/jobmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/jobmanager-deployment.yaml @@ -25,7 +25,7 @@ spec: # optional arguments: ["--job-id", "<job id>", "--fromSavepoint", "/path/to/savepoint", "--allowNonRestoredState"] env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: COMMIT_INTERVAL_MS diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/taskmanager-deployment.yaml index 09065ee9f..6d61c9bd6 100644 --- a/theodolite-benchmarks/definitions/uc4-beam-flink/resources/taskmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc4-beam-flink/resources/taskmanager-deployment.yaml @@ -21,7 +21,7 @@ spec: args: ["taskmanager"] env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: COMMIT_INTERVAL_MS diff --git a/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml index bb14b04f8..738b1c837 100644 --- a/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml @@ -51,7 +51,7 @@ spec: loadGenMaxRecords: "150000" numSensors: "4.0" kafkaConfig: - bootstrapServer: "theodolite-cp-kafka:9092" + bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml index cc7adba54..3e2da71fa 100644 --- a/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml @@ -21,13 +21,13 @@ spec: - name: SAMZA_JOB_COORDINATOR_ZK_CONNECT value: "theodolite-cp-zookeeper:2181" - name: SAMZA_SYSTEMS_KAFKA_PRODUCER_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: MAX_SOURCE_PARALLELISM value: "1024" - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-cp-kafka:9092" + value: "theodolite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: COMMIT_INTERVAL_MS # Set as default for the applications diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml index 8d4bf259d..aae76e2cf 100644 --- a/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml @@ -47,7 +47,7 @@ spec: loadGenMaxRecords: "150000" numSensors: "4.0" kafkaConfig: - bootstrapServer: "theodolite-cp-kafka:9092" + bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 -- GitLab