diff --git a/docs/creating-a-benchmark.md b/docs/creating-a-benchmark.md index 5a19be2ef840e9da45ce330eb95e4c25f5e3ac28..b09c989e59d910fc352af9d1c5690b224e3346e6 100644 --- a/docs/creating-a-benchmark.md +++ b/docs/creating-a-benchmark.md @@ -42,7 +42,7 @@ spec: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodolite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 @@ -54,7 +54,7 @@ spec: ## System under Test (SUT), Load Generator and Infrastructure -In Thedolite, the system under test (SUT), the load generator as well as additional infrastructure (e.g., a middleware) are described by Kubernetes resources files. +In Theodolite, the system under test (SUT), the load generator as well as additional infrastructure (e.g., a middleware) are described by Kubernetes resources files. All resources defined for the SUT and the load generator are started and stopped for each SLO experiment, with SUT resources being started before the load generator. Infrastructure resources live over the entire duration of a benchmark run. They avoid time-consuming recreation of software components like middlewares, but should be used with caution to not let previous SLO experiments influence latte ones. diff --git a/helm/templates/strimzi/kafka-cluster.yaml b/helm/templates/strimzi/kafka-cluster.yaml index f8c0112b54249fec6d301a892cbf74b36c2d5cec..0d7eccfd279c62f7d996a8e3e41a55a5ebdd4e96 100644 --- a/helm/templates/strimzi/kafka-cluster.yaml +++ b/helm/templates/strimzi/kafka-cluster.yaml @@ -2,7 +2,7 @@ apiVersion: kafka.strimzi.io/v1beta2 kind: Kafka metadata: - name: {{ template "theodolite.fullname" . }}-strimzi + name: {{ template "theodolite.fullname" . }}-kafka spec: kafka: jmxOptions: {} diff --git a/helm/templates/strimzi/kafka-exporter-podmonitor.yaml b/helm/templates/strimzi/kafka-exporter-podmonitor.yaml index e672c140ca59b8aaa8b8b5185d5babd1ada7b0d7..6da9643726c59e476d4d75f49f6744c5d2f8c48f 100644 --- a/helm/templates/strimzi/kafka-exporter-podmonitor.yaml +++ b/helm/templates/strimzi/kafka-exporter-podmonitor.yaml @@ -9,7 +9,7 @@ spec: selector: selector: matchLabels: - strimzi.io/name: {{ template "theodolite.fullname" . }}-strimzi-kafka-exporter + strimzi.io/name: {{ template "theodolite.fullname" . }}-kafka-kafka-exporter namespaceSelector: matchNames: - default diff --git a/helm/templates/strimzi/kafka-podmonitor.yaml b/helm/templates/strimzi/kafka-podmonitor.yaml index b1d9f37596137e05f0e9fa4a0e4eb4ca5eb07b5b..522f23f305b53615251d80e8cb13eac50e5530ad 100644 --- a/helm/templates/strimzi/kafka-podmonitor.yaml +++ b/helm/templates/strimzi/kafka-podmonitor.yaml @@ -9,7 +9,7 @@ spec: selector: selector: matchLabels: - strimzi.io/name: {{ template "theodolite.fullname" . }}-strimzi-kafka + strimzi.io/name: {{ template "theodolite.fullname" . }}-kafka-kafka podMetricsEndpoints: - path: /metrics port: tcp-prometheus diff --git a/helm/values.yaml b/helm/values.yaml index 874bfc670752562fb6f6b17b16253c96985fca6c..b84d532cbfc18f4bfe5d6c527610bbbfdf54565e 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -138,7 +138,7 @@ cp-helm-charts: annotations: {} kafka: - bootstrapServers: theodolite-strimzi-kafka-bootstrap:9092 + bootstrapServers: theodlite-kafka-kafka-bootstrap:9092 cp-kafka-rest: enabled: false diff --git a/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml index ff4d5cb5445ba029e9021d1761fa6196561aca35..bbc3d3661d4501de2c58ca61ad3b00febd10e9ff 100644 --- a/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc1-flink/resources/jobmanager-deployment.yaml @@ -20,7 +20,7 @@ spec: image: ghcr.io/cau-se/theodolite-uc1-flink:latest env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-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/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc1-flink/resources/taskmanager-deployment.yaml index d178ec9d63b938fbcf7dee45d038792bf0a3ab92..d703e9c3b0c08f207de7fee083d85669792af59e 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: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-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 40565db4ea7f85beb373143c87844ccc59c64738..fd50024b8a1644a1db963b9ccef136371b81b20a 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: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml index c1820500d440894b391e76350614694555c4a2e5..6be09af036547509cbedaca75b5f67a256008050 100644 --- a/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc1-kstreams/resources/uc1-kstreams-deployment.yaml @@ -21,7 +21,7 @@ spec: name: jmx env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-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-kstreams/uc1-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml index 88cc383dd44c3e238148e2787df04361f6858be4..690fb5accc21c68302fb820b41a8858ca6d2efcc 100644 --- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml @@ -37,7 +37,7 @@ spec: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-standalone.yaml index 8bb89b5d364729709a5d63926b610edc91cb63ce..3bd5e95da8ef07a6432555c4dc5f401c8cae1dbb 100644 --- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-standalone.yaml +++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-standalone.yaml @@ -32,7 +32,7 @@ loadTypes: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-deployment.yaml index 424dddafb9b9131bd5afdbde6785f02ee082844b..16af84649ac47f75706ae6fe983585293e224f12 100644 --- a/theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc1-load-generator/resources/uc1-load-generator-deployment.yaml @@ -27,6 +27,6 @@ spec: - name: KUBERNETES_DNS_NAME value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local" - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" diff --git a/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml index 1b31959b1a01bf484147c19441069a216b182bd1..51317b89419d4761a344ae80d37833d234560aa1 100644 --- a/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc2-flink/resources/jobmanager-deployment.yaml @@ -20,7 +20,7 @@ spec: image: ghcr.io/cau-se/theodolite-uc2-flink:latest env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-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-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml index 2fce935d5ac617394f7212dc14576b9a7ea821a9..34066f4aedd102d30a730aae3f2214e9c1de1cb0 100644 --- a/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc2-flink/resources/taskmanager-deployment.yaml @@ -20,7 +20,7 @@ spec: image: ghcr.io/cau-se/theodolite-uc2-flink:latest env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-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-flink/uc2-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml index e0bbc8180132c6af32bfc73fd192739ad51afa9f..c3c89d35b2b4e85658ea116a819b66750c9c9188 100644 --- a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml @@ -50,7 +50,7 @@ spec: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml index af6f9f8eb4848d5b5a125ed86c57fce308c06ab2..30b50aa13238701922f5472ff7978051d4dbae38 100644 --- a/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc2-kstreams/resources/uc2-kstreams-deployment.yaml @@ -21,7 +21,7 @@ spec: name: jmx env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: JAVA_OPTS diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml index d7da5d0fcf08a48b50993f3b5eed87e9659cdc9c..f69e5c29f125b596526b5858751ad8500ce80e1c 100644 --- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml @@ -37,7 +37,7 @@ spec: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-standalone.yaml index d2ad077f0c2f46ca0d887f2271153347658e1736..391c4518505b4508bae5fcfb03c7d7d95e8b595c 100644 --- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-standalone.yaml +++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-standalone.yaml @@ -33,7 +33,7 @@ loadTypes: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-deployment.yaml index 86cbc7321d23a77e25422deb89564c63e2eebb4b..246918f18a21f9bfe86e950fc18ba1ed6bc81f88 100644 --- a/theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc2-load-generator/resources/uc2-load-generator-deployment.yaml @@ -27,6 +27,6 @@ spec: - name: KUBERNETES_DNS_NAME value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local" - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" diff --git a/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml index c2acc46ffd4e5c9912dc9a9bb3e5ae65e4186c00..3ae5c50fadd9c5231a90cba31278d08cfe68d043 100644 --- a/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc3-flink/resources/jobmanager-deployment.yaml @@ -20,7 +20,7 @@ spec: image: ghcr.io/cau-se/theodolite-uc3-flink:latest env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-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-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml index b8f1f84adb7753ea395ba7a284326e65c6267f4f..83e9e0626bb3207ba9ca9fe792ea069fe9014d29 100644 --- a/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc3-flink/resources/taskmanager-deployment.yaml @@ -20,7 +20,7 @@ spec: image: ghcr.io/cau-se/theodolite-uc3-flink:latest env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-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-flink/uc3-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml index 4137ff1c1634522b14a47bd13da48956c061d7fe..a9dc29d60a7c1aa010115b8b31f16536f32388be 100644 --- a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml @@ -50,7 +50,7 @@ spec: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml index 22085aa1948a3f06e3310d48d576cc7553907a96..30c7fb3b101cbb30d4f3ad1cadc94a9b1d478a47 100644 --- a/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc3-kstreams/resources/uc3-kstreams-deployment.yaml @@ -21,7 +21,7 @@ spec: name: jmx env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: JAVA_OPTS diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml index 63976a83b519a8fb3a2750948c5bcf70b48d68b7..8bb18b80b20a7cf9ab50b1bbcd8fed8a30fc9cfd 100644 --- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml @@ -37,7 +37,7 @@ spec: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-standalone.yaml index be79d9c827a3c94fcbabf172508273388c5b35bb..fe8f68741cf8be07e3f095aeabe270b724174ebd 100644 --- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-standalone.yaml +++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-standalone.yaml @@ -33,7 +33,7 @@ loadTypes: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml index af073b7668b3e50b9e7252245d6b9c1b4aa81a5a..c548d58f19e029722c83df2e35b5f725d7b8161d 100644 --- a/theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc3-load-generator/resources/uc3-load-generator-deployment.yaml @@ -27,6 +27,6 @@ spec: - name: KUBERNETES_DNS_NAME value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local" - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" diff --git a/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml index cf659cb31bf0a434126226767d34bc90a82a9c2a..c258d8315cdc427b9eda741593d59b4152ceaba7 100644 --- a/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc4-flink/resources/jobmanager-deployment.yaml @@ -20,7 +20,7 @@ spec: image: ghcr.io/cau-se/theodolite-uc4-flink:latest env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-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-flink/resources/taskmanager-deployment.yaml b/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml index baf00f87855006fa2903fa0dcff67360ceca4890..9e10bcecbd8b7fcb8176b44af7e045031cbed780 100644 --- a/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc4-flink/resources/taskmanager-deployment.yaml @@ -20,7 +20,7 @@ spec: image: ghcr.io/cau-se/theodolite-uc4-flink:latest env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-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-flink/uc4-flink-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml index c01534c4b8b7f74696b6a6eda2bf9ef41b55288e..75aed27cad45c5469fa6805cd31b88329714bd84 100644 --- a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml @@ -51,7 +51,7 @@ spec: loadGenMaxRecords: "150000" numSensors: "4.0" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml index 13542cb29c54fbf12574497d4c8a11e3084719e5..346f47e746de788eec037cc1c9f45d2cb76ce89e 100644 --- a/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc4-kstreams/resources/uc4-kstreams-deployment.yaml @@ -21,7 +21,7 @@ spec: name: jmx env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: JAVA_OPTS diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml index 2fbb5d9f6af0ff5398171f3ea9c5544b0a0a0a20..2c2c39096015fccce977054fb7ebc3aa8e9f697e 100644 --- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml @@ -38,7 +38,7 @@ spec: loadGenMaxRecords: "150000" numSensors: "4.0" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-standalone.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-standalone.yaml index 0c69aaaafcebf1d3471f9c40baa63b55f9701d38..f6bd33c2f1dae9bf22f66ee5957c075cbd947a82 100644 --- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-standalone.yaml +++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-standalone.yaml @@ -34,7 +34,7 @@ loadTypes: loadGenMaxRecords: "150000" numSensors: "4.0" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml b/theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml index 1101f9e412a6d75c7798644709895f4675a596f9..6c87f95cfbdea7d351705117c5531fe0042bee82 100644 --- a/theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml +++ b/theodolite-benchmarks/definitions/uc4-load-generator/resources/uc4-load-generator-deployment.yaml @@ -27,7 +27,7 @@ spec: - name: KUBERNETES_DNS_NAME value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local" - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: NUM_NESTED_GROUPS diff --git a/theodolite/examples/operator/example-benchmark.yaml b/theodolite/examples/operator/example-benchmark.yaml index 54df10f818e0438e655fd957c79128e2630bb79e..e62fd1a5d4b420d6848ed0f8cb474476af430d44 100644 --- a/theodolite/examples/operator/example-benchmark.yaml +++ b/theodolite/examples/operator/example-benchmark.yaml @@ -34,7 +34,7 @@ spec: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite/examples/operator/example-configmap.yaml b/theodolite/examples/operator/example-configmap.yaml index 4baee15860728e00bd5e1f1b6b6d7a14fe2dd950..380786750b95c4197e36e844a6a47f9abc856f45 100644 --- a/theodolite/examples/operator/example-configmap.yaml +++ b/theodolite/examples/operator/example-configmap.yaml @@ -24,7 +24,7 @@ data: image: ghcr.io/cau-se/theodolite-uc1-kstreams-app:latest env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: JAVA_OPTS @@ -65,7 +65,7 @@ data: - name: KUBERNETES_DNS_NAME value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local" - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" uc1-load-generator-service.yaml: | diff --git a/theodolite/examples/resources/uc1-kstreams-deployment.yaml b/theodolite/examples/resources/uc1-kstreams-deployment.yaml index de8c32eba24e9601eb8e9deffd8801d6a4bb5d5e..3c23a7ccdf043ba6aa8469b600d8a556b7110f26 100644 --- a/theodolite/examples/resources/uc1-kstreams-deployment.yaml +++ b/theodolite/examples/resources/uc1-kstreams-deployment.yaml @@ -21,7 +21,7 @@ spec: name: jmx env: - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" - name: JAVA_OPTS diff --git a/theodolite/examples/resources/uc1-load-generator-deployment.yaml b/theodolite/examples/resources/uc1-load-generator-deployment.yaml index 424dddafb9b9131bd5afdbde6785f02ee082844b..16af84649ac47f75706ae6fe983585293e224f12 100644 --- a/theodolite/examples/resources/uc1-load-generator-deployment.yaml +++ b/theodolite/examples/resources/uc1-load-generator-deployment.yaml @@ -27,6 +27,6 @@ spec: - name: KUBERNETES_DNS_NAME value: "titan-ccp-load-generator.$(KUBERNETES_NAMESPACE).svc.cluster.local" - name: KAFKA_BOOTSTRAP_SERVERS - value: "theodolite-strimzi-kafka-bootstrap:9092" + value: "theodlite-kafka-kafka-bootstrap:9092" - name: SCHEMA_REGISTRY_URL value: "http://theodolite-cp-schema-registry:8081" diff --git a/theodolite/examples/standalone/example-benchmark.yaml b/theodolite/examples/standalone/example-benchmark.yaml index a6915cf289e2feb7dd86ccccfdf76fe9e3e35636..380376b842b047b46945186dded2f29a8729bc2a 100644 --- a/theodolite/examples/standalone/example-benchmark.yaml +++ b/theodolite/examples/standalone/example-benchmark.yaml @@ -31,7 +31,7 @@ loadTypes: properties: loadGenMaxRecords: "150000" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40 diff --git a/theodolite/src/test/resources/k8s-resource-files/test-benchmark.yaml b/theodolite/src/test/resources/k8s-resource-files/test-benchmark.yaml index a7b298c9263ba9345d74e0de683b7aa2009b3c16..57b2696f01adbe09a4e68e8511de210e7099382a 100644 --- a/theodolite/src/test/resources/k8s-resource-files/test-benchmark.yaml +++ b/theodolite/src/test/resources/k8s-resource-files/test-benchmark.yaml @@ -29,7 +29,7 @@ spec: properties: loadGenMaxRecords: "15000" kafkaConfig: - bootstrapServer: "theodolite-strimzi-kafka-bootstrap:9092" + bootstrapServer: "theodlite-kafka-kafka-bootstrap:9092" topics: - name: "input" numPartitions: 40