diff --git a/execution/theodolite.yaml b/execution/theodolite.yaml index ff8eecb312d052eab6f2e66a0bd57d8a983d38e1..749c94b12736b2d8546fa3cb46559ec1b4ea0f27 100644 --- a/execution/theodolite.yaml +++ b/execution/theodolite.yaml @@ -9,12 +9,12 @@ spec: runAsUser: 0 # Set the permissions for write access to the volumes. containers: - name: lag-analysis - image: ghcr.io/cau-se/theodolite-slo-checker-lag-trend:theodolite-kotlin-latest + image: ghcr.io/cau-se/theodolite-slo-checker-lag-trend:latest ports: - containerPort: 80 name: analysis - name: theodolite - image: ghcr.io/cau-se/theodolite:theodolite-kotlin-latest + image: ghcr.io/cau-se/theodolite:latest imagePullPolicy: Always env: - name: NAMESPACE diff --git a/helm/templates/theodolite/random-scheduler/deployment.yaml b/helm/templates/theodolite/random-scheduler/deployment.yaml index 35a6ad027b93446a2bb97e2ebd67f2e27652e99a..a1ea535d52d3dce971806dd638a90e9acb81c5d0 100644 --- a/helm/templates/theodolite/random-scheduler/deployment.yaml +++ b/helm/templates/theodolite/random-scheduler/deployment.yaml @@ -22,7 +22,7 @@ spec: serviceAccount: {{ include "theodolite.fullname" . }}-random-scheduler containers: - name: random-scheduler - image: ghcr.io/cau-se/theodolite-random-scheduler:theodolite-kotlin-latest + image: ghcr.io/cau-se/theodolite-random-scheduler:latest #imagePullPolicy: Always env: - name: TARGET_NAMESPACE diff --git a/helm/values.yaml b/helm/values.yaml index 4b970bf868092bca5571cb1ea0ba2360945c8ebf..917ec5cdbda7541b56b366aff2412ccf7d856f3b 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -247,7 +247,7 @@ operator: enabled: true image: ghcr.io/cau-se/theodolite - imageTag: theodolite-kotlin-latest + imageTag: latest imagePullPolicy: Always executionCRD: @@ -259,7 +259,7 @@ operator: lagTrend: enabled: true image: ghcr.io/cau-se/theodolite-slo-checker-lag-trend - imageTag: theodolite-kotlin-latest + imageTag: latest imagePullPolicy: Always resultsVolume: diff --git a/slope-evaluator/requirements.txt b/slope-evaluator/requirements.txt index 670815f35b18361951a2fa7b2142eee6bc86b01d..8b6c3863226c2bd5e8bcd7982b2674dee593f192 100644 --- a/slope-evaluator/requirements.txt +++ b/slope-evaluator/requirements.txt @@ -1,4 +1,4 @@ -fastapi==0.55.1 +fastapi==0.65.2 scikit-learn==0.20.3 pandas==1.0.3 uvicorn 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 30e2d6bcae0156d08aa71c428934f420b4085e38..3e16e486446d568d2cac0fe5196ab7446be25978 100644 --- a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml @@ -39,6 +39,8 @@ spec: variableName: "NUM_SENSORS" - type: NumSensorsLoadGeneratorReplicaPatcher resource: "uc1-kstreams/uc1-load-generator-deployment.yaml" + properties: + loadGenMaxRecords: "150000" kafkaConfig: bootstrapServer: "theodolite-cp-kafka:9092" topics: diff --git a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml index 4ec3b08d8f20b6b4e4f108b43c9375179b7aee81..8bcc7d5a1d750eed140527e7c6176a881bc9e6e1 100644 --- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-benchmark-operator.yaml @@ -24,10 +24,10 @@ spec: properties: container: "workload-generator" variableName: "NUM_SENSORS" - - type: "NumSensorsLoadGeneratorReplicaPatcher" + - type: NumSensorsLoadGeneratorReplicaPatcher resource: "uc1-kstreams/uc1-load-generator-deployment.yaml" properties: - loadGenMaxRecords: "15000" + loadGenMaxRecords: "150000" kafkaConfig: bootstrapServer: "theodolite-cp-kafka:9092" topics: 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 4bc67808c5f4ba391650a2f9884444c2dca20cc6..ab335cc4f9f8413dd7871fc2184491235aad67e4 100644 --- a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml @@ -39,6 +39,8 @@ spec: variableName: "NUM_SENSORS" - type: NumSensorsLoadGeneratorReplicaPatcher resource: "uc2-kstreams/uc2-load-generator-deployment.yaml" + properties: + loadGenMaxRecords: "150000" kafkaConfig: bootstrapServer: "theodolite-cp-kafka:9092" topics: diff --git a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml index aa25c53d793fd319ba16e15f8e8a152f177e799e..c71318c95ceb9d462f64e19b135ce59b43b03099 100644 --- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-benchmark-operator.yaml @@ -27,7 +27,7 @@ spec: - type: NumSensorsLoadGeneratorReplicaPatcher resource: "uc2-kstreams/uc2-load-generator-deployment.yaml" properties: - loadGenMaxRecords: "15000" + loadGenMaxRecords: "150000" kafkaConfig: bootstrapServer: "theodolite-cp-kafka:9092" topics: 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 f7a05c1371089126d5e39b91f48ac9df42ef05e1..bc881d83d622f49409c4b2023b7fd9445038c2e8 100644 --- a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml @@ -39,6 +39,8 @@ spec: variableName: "NUM_SENSORS" - type: NumSensorsLoadGeneratorReplicaPatcher resource: "uc3-kstreams/uc3-load-generator-deployment.yaml" + properties: + loadGenMaxRecords: "150000" kafkaConfig: bootstrapServer: "theodolite-cp-kafka:9092" topics: diff --git a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml index e2679ed864d4b8673bf0d44a96683ccb86f44090..cc10020b17c7a31b61f5fdaf6963be9fda75865f 100644 --- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-benchmark-operator.yaml @@ -27,7 +27,7 @@ spec: - type: NumSensorsLoadGeneratorReplicaPatcher resource: "uc3-kstreams/uc3-load-generator-deployment.yaml" properties: - loadGenMaxRecords: "15000" + loadGenMaxRecords: "150000" kafkaConfig: bootstrapServer: "theodolite-cp-kafka:9092" topics: 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 523167286f04e3ec0a66a43eabda618908ae3f11..9979f540ae343a065d8ca483fa9c5934fc550a46 100644 --- a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml @@ -37,8 +37,11 @@ spec: properties: container: "workload-generator" variableName: "NUM_NESTED_GROUPS" - - type: "NumNestedGroupsLoadGeneratorReplicaPatcher" + - type: NumNestedGroupsLoadGeneratorReplicaPatcher resource: "uc4-kstreams/uc4-load-generator-deployment.yaml" + properties: + loadGenMaxRecords: "150000" + numSensors: "4.0" kafkaConfig: bootstrapServer: "theodolite-cp-kafka:9092" topics: diff --git a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml index 3e10fd1aebf071e854cb31501030a50c11eab01d..61cdfeeea5298d05cca5f5a44cdb4bdf9f108b7c 100644 --- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-benchmark-operator.yaml @@ -27,7 +27,7 @@ spec: - type: NumNestedGroupsLoadGeneratorReplicaPatcher resource: "uc4-kstreams/uc4-load-generator-deployment.yaml" properties: - loadGenMaxRecords: "15000" + loadGenMaxRecords: "150000" numSensors: "4.0" kafkaConfig: bootstrapServer: "theodolite-cp-kafka:9092" diff --git a/theodolite/src/main/kotlin/theodolite/patcher/PatcherFactory.kt b/theodolite/src/main/kotlin/theodolite/patcher/PatcherFactory.kt index 29723355ce23810c709fe4537242d1fd7e195d25..566335a660d14a0fb5fec3f8a244d4be321f3043 100644 --- a/theodolite/src/main/kotlin/theodolite/patcher/PatcherFactory.kt +++ b/theodolite/src/main/kotlin/theodolite/patcher/PatcherFactory.kt @@ -78,6 +78,10 @@ class PatcherFactory { k8sResource = resource, container = patcherDefinition.properties["container"]!! ) + "ImagePatcher" -> ImagePatcher( + k8sResource = resource, + container = patcherDefinition.properties["container"]!! + ) else -> throw InvalidPatcherConfigurationException("Patcher type ${patcherDefinition.type} not found.") } } catch (e: Exception) {