From e4b7ad3225d362a5a81e51dc35c61fdc4b07bbbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de> Date: Thu, 16 Jun 2022 18:47:04 +0200 Subject: [PATCH] Update CRD group and version --- docs/api-reference/crds.md | 8 ++++---- docs/creating-a-benchmark.md | 2 +- docs/creating-an-execution.md | 2 +- docs/installation.md | 4 ++-- docs/running-benchmarks.md | 2 +- execution/infrastructure/kubernetes/rbac/role.yaml | 2 +- helm/README.md | 4 ++-- helm/templates/theodolite/role.yaml | 2 +- .../uc1-beam-flink/uc1-beam-flink-benchmark-operator.yaml | 2 +- .../uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml | 2 +- .../uc1-flink/uc1-flink-benchmark-operator.yaml | 2 +- .../uc1-hazelcastjet/uc1-benchmark-operator.yaml | 2 +- .../uc1-kstreams/uc1-kstreams-benchmark-operator.yaml | 2 +- .../uc2-beam-flink/uc2-beam-flink-benchmark-operator.yaml | 2 +- .../uc2-flink/uc2-flink-benchmark-operator.yaml | 2 +- .../uc2-hazelcastjet/uc2-benchmark-operator.yaml | 2 +- .../uc2-kstreams/uc2-kstreams-benchmark-operator.yaml | 2 +- .../uc3-beam-flink/uc3-beam-flink-benchmark-operator.yaml | 2 +- .../uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml | 2 +- .../uc3-flink/uc3-flink-benchmark-operator.yaml | 2 +- .../uc3-hazelcastjet/uc3-benchmark-operator.yaml | 2 +- .../uc3-kstreams/uc3-kstreams-benchmark-operator.yaml | 2 +- .../uc4-beam-flink/uc4-beam-flink-benchmark-operator.yaml | 2 +- .../uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml | 2 +- .../uc4-flink/uc4-flink-benchmark-operator.yaml | 2 +- .../uc4-hazelcastjet/uc4-benchmark-operator.yaml | 2 +- .../uc4-kstreams/uc4-kstreams-benchmark-operator.yaml | 2 +- theodolite/crd/crd-benchmark.yaml | 6 +++--- theodolite/crd/crd-execution.yaml | 6 +++--- theodolite/examples/operator/example-benchmark.yaml | 2 +- theodolite/examples/operator/example-execution.yaml | 2 +- .../rocks/theodolite/kubernetes/model/crd/BenchmarkCRD.kt | 4 ++-- .../rocks/theodolite/kubernetes/model/crd/ExecutionCRD.kt | 4 ++-- .../theodolite/kubernetes/operator/TheodoliteOperator.kt | 4 ++-- .../operator/example-execution-k8s-resource.yaml | 2 +- .../theodolite/kubernetes/operator/ControllerTest.kt | 4 ++-- .../test/resources/k8s-resource-files/test-benchmark.yaml | 2 +- .../resources/k8s-resource-files/test-execution-1.yaml | 2 +- .../k8s-resource-files/test-execution-update.yaml | 2 +- .../test/resources/k8s-resource-files/test-execution.yaml | 2 +- 40 files changed, 53 insertions(+), 53 deletions(-) diff --git a/docs/api-reference/crds.md b/docs/api-reference/crds.md index 87c4e9046..01ffc4a96 100644 --- a/docs/api-reference/crds.md +++ b/docs/api-reference/crds.md @@ -10,9 +10,9 @@ nav_order: 1 Packages: -- [theodolite.com/v1](#theodolitecomv1) +- [theodolite.rocks/v1beta1](#theodolitecomv1) -# theodolite.com/v1 +# theodolite.rocks/v1beta1 Resource Types: @@ -45,7 +45,7 @@ Resource Types: <tbody><tr> <td><b>apiVersion</b></td> <td>string</td> - <td>theodolite.com/v1</td> + <td>theodolite.rocks/v1beta1</td> <td>true</td> </tr> <tr> @@ -2230,7 +2230,7 @@ Contains the Kafka configuration. <tbody><tr> <td><b>apiVersion</b></td> <td>string</td> - <td>theodolite.com/v1</td> + <td>theodolite.rocks/v1beta1</td> <td>true</td> </tr> <tr> diff --git a/docs/creating-a-benchmark.md b/docs/creating-a-benchmark.md index b4602d6f7..e180431dc 100644 --- a/docs/creating-a-benchmark.md +++ b/docs/creating-a-benchmark.md @@ -11,7 +11,7 @@ Please note that to simply run a benchmark, it is not required to define one. Th A typical benchmark looks like this: ```yaml -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: example-benchmark diff --git a/docs/creating-an-execution.md b/docs/creating-an-execution.md index 263d630ff..e33019a57 100644 --- a/docs/creating-an-execution.md +++ b/docs/creating-an-execution.md @@ -11,7 +11,7 @@ Theodolite Executions look similar to the following example. <!-- TODO align with upstream --> ```yaml -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: execution metadata: name: theodolite-example-execution diff --git a/docs/installation.md b/docs/installation.md index 2b80920bb..a01cfd14d 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -91,8 +91,8 @@ Helm does not remove any CRDs created by this chart. You can remove them manuall ```sh # CRDs for Theodolite -kubectl delete crd executions.theodolite.com -kubectl delete crd benchmarks.theodolite.com +kubectl delete crd executions.theodolite.rocks +kubectl delete crd benchmarks.theodolite.rocks # CRDs for Prometheus operator (see https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack#uninstall-chart) kubectl delete crd alertmanagerconfigs.monitoring.coreos.com kubectl delete crd alertmanagers.monitoring.coreos.com diff --git a/docs/running-benchmarks.md b/docs/running-benchmarks.md index 5051cb5b6..c44591838 100644 --- a/docs/running-benchmarks.md +++ b/docs/running-benchmarks.md @@ -56,7 +56,7 @@ The status of a benchmark tells you whether executions of it are ready to run: To run a benchmark, an Execution YAML file needs to be created such as the following one. ```yaml -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: execution metadata: name: theodolite-example-execution # (1) give your execution a name diff --git a/execution/infrastructure/kubernetes/rbac/role.yaml b/execution/infrastructure/kubernetes/rbac/role.yaml index 22b755226..a76071ad0 100644 --- a/execution/infrastructure/kubernetes/rbac/role.yaml +++ b/execution/infrastructure/kubernetes/rbac/role.yaml @@ -40,7 +40,7 @@ rules: - create - get - apiGroups: - - theodolite.com + - theodolite.rocks resources: - executions - benchmarks diff --git a/helm/README.md b/helm/README.md index af253482b..4b0c65de2 100644 --- a/helm/README.md +++ b/helm/README.md @@ -48,8 +48,8 @@ Helm does not remove any CRDs created by this chart. You can remove them manuall ```sh # CRDs from Theodolite -kubectl delete crd executions.theodolite.com -kubectl delete crd benchmarks.theodolite.com +kubectl delete crd executions.theodolite.rocks +kubectl delete crd benchmarks.theodolite.rocks # CRDs from Prometheus operator (see https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack#uninstall-chart) kubectl delete crd alertmanagerconfigs.monitoring.coreos.com kubectl delete crd alertmanagers.monitoring.coreos.com diff --git a/helm/templates/theodolite/role.yaml b/helm/templates/theodolite/role.yaml index b8d4d2d00..8ef55e856 100644 --- a/helm/templates/theodolite/role.yaml +++ b/helm/templates/theodolite/role.yaml @@ -60,7 +60,7 @@ rules: {{- end }} {{- if .Values.operator.enabled }} - apiGroups: - - theodolite.com + - theodolite.rocks resources: - benchmarks - benchmarks/status 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 17266b969..9c404da65 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 @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc1-beam-flink 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 d3ee8f524..c1e365ed3 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 @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc1-beam-samza 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 ac89e7140..e4c558e12 100644 --- a/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-flink/uc1-flink-benchmark-operator.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc1-flink diff --git a/theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-benchmark-operator.yaml index ad42faedd..1ed58f971 100644 --- a/theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-hazelcastjet/uc1-benchmark-operator.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc1-hazelcastjet 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 80352e27d..961ef594b 100644 --- a/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc1-kstreams/uc1-kstreams-benchmark-operator.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc1-kstreams 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 f172b33ce..c84212970 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 @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc2-beam-flink 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 b45f9d4ba..bd06a1de3 100644 --- a/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-flink/uc2-flink-benchmark-operator.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc2-flink diff --git a/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-benchmark-operator.yaml index 0c1408df5..199fd3366 100644 --- a/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-hazelcastjet/uc2-benchmark-operator.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc2-hazelcastjet 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 3e9ffd9a2..ccca86744 100644 --- a/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc2-kstreams/uc2-kstreams-benchmark-operator.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc2-kstreams 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 af8999917..017d1fa55 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 @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc3-beam-flink 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 2dd5fcdf3..baed76a02 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 @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc3-beam-samza 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 8cdc00a55..4d0e0122a 100644 --- a/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-flink/uc3-flink-benchmark-operator.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc3-flink diff --git a/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-benchmark-operator.yaml index 5c50ce87c..706282321 100644 --- a/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-hazelcastjet/uc3-benchmark-operator.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc3-hazelcastjet 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 e34f8707e..967f198bf 100644 --- a/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc3-kstreams/uc3-kstreams-benchmark-operator.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc3-kstreams 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 3d6e07f4e..d35907c5b 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 @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc4-beam-flink 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 8835db1d3..280e2ccd1 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 @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc4-beam-samza 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 2e4011d44..41e6da810 100644 --- a/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-flink/uc4-flink-benchmark-operator.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc4-flink diff --git a/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-benchmark-operator.yaml index 06c22a1cf..bf94eb2f8 100644 --- a/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-hazelcastjet/uc4-benchmark-operator.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc4-hazelcastjet 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 257c6814d..59da7d953 100644 --- a/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml +++ b/theodolite-benchmarks/definitions/uc4-kstreams/uc4-kstreams-benchmark-operator.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: uc4-kstreams diff --git a/theodolite/crd/crd-benchmark.yaml b/theodolite/crd/crd-benchmark.yaml index cfc9d3bd6..27ca9ebfb 100644 --- a/theodolite/crd/crd-benchmark.yaml +++ b/theodolite/crd/crd-benchmark.yaml @@ -1,16 +1,16 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: benchmarks.theodolite.com + name: benchmarks.theodolite.rocks spec: - group: theodolite.com + group: theodolite.rocks names: kind: benchmark plural: benchmarks shortNames: - bench versions: - - name: v1 + - name: v1beta1 served: true storage: true schema: diff --git a/theodolite/crd/crd-execution.yaml b/theodolite/crd/crd-execution.yaml index 0db251864..fd618e018 100644 --- a/theodolite/crd/crd-execution.yaml +++ b/theodolite/crd/crd-execution.yaml @@ -1,16 +1,16 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: executions.theodolite.com + name: executions.theodolite.rocks spec: - group: theodolite.com + group: theodolite.rocks names: kind: execution plural: executions shortNames: - exec versions: - - name: v1 + - name: v1beta1 served: true storage: true schema: diff --git a/theodolite/examples/operator/example-benchmark.yaml b/theodolite/examples/operator/example-benchmark.yaml index be7116c46..babc0bde2 100644 --- a/theodolite/examples/operator/example-benchmark.yaml +++ b/theodolite/examples/operator/example-benchmark.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: example-benchmark diff --git a/theodolite/examples/operator/example-execution.yaml b/theodolite/examples/operator/example-execution.yaml index 87e6275a8..1d889398e 100644 --- a/theodolite/examples/operator/example-execution.yaml +++ b/theodolite/examples/operator/example-execution.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: execution metadata: name: theodolite-example-execution diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/model/crd/BenchmarkCRD.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/model/crd/BenchmarkCRD.kt index f480177e4..66c540459 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/model/crd/BenchmarkCRD.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/model/crd/BenchmarkCRD.kt @@ -9,8 +9,8 @@ import io.fabric8.kubernetes.model.annotation.Version import rocks.theodolite.kubernetes.model.KubernetesBenchmark @JsonDeserialize -@Version("v1") -@Group("theodolite.com") +@Version("v1beta1") +@Group("theodolite.rocks") @Kind("benchmark") class BenchmarkCRD : CustomResource<KubernetesBenchmark, BenchmarkStatus>(), Namespaced { diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/model/crd/ExecutionCRD.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/model/crd/ExecutionCRD.kt index df7b0f0c1..dc3da88ce 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/model/crd/ExecutionCRD.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/model/crd/ExecutionCRD.kt @@ -9,8 +9,8 @@ import io.fabric8.kubernetes.model.annotation.Version import rocks.theodolite.kubernetes.model.BenchmarkExecution @JsonDeserialize -@Version("v1") -@Group("theodolite.com") +@Version("v1beta1") +@Group("theodolite.rocks") @Kind("execution") class ExecutionCRD: CustomResource<BenchmarkExecution, ExecutionStatus>(), Namespaced { diff --git a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/operator/TheodoliteOperator.kt b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/operator/TheodoliteOperator.kt index bdaa2692d..4d639fdb9 100644 --- a/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/operator/TheodoliteOperator.kt +++ b/theodolite/src/main/kotlin/rocks/theodolite/kubernetes/operator/TheodoliteOperator.kt @@ -15,9 +15,9 @@ import rocks.theodolite.kubernetes.model.crd.KubernetesBenchmarkList private const val EXECUTION_SINGULAR = "execution" private const val BENCHMARK_SINGULAR = "benchmark" -private const val API_VERSION = "v1" +private const val API_VERSION = "v1beta1" private const val RESYNC_PERIOD = 10 * 60 * 1000.toLong() -private const val GROUP = "theodolite.com" +private const val GROUP = "theodolite.rocks" private val logger = KotlinLogging.logger {} /** diff --git a/theodolite/src/main/resources/operator/example-execution-k8s-resource.yaml b/theodolite/src/main/resources/operator/example-execution-k8s-resource.yaml index b81bbcd44..ce91b1a5b 100644 --- a/theodolite/src/main/resources/operator/example-execution-k8s-resource.yaml +++ b/theodolite/src/main/resources/operator/example-execution-k8s-resource.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: execution metadata: name: theodolite-example-execution diff --git a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/operator/ControllerTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/operator/ControllerTest.kt index 3120d7420..bdb7cc6ce 100644 --- a/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/operator/ControllerTest.kt +++ b/theodolite/src/test/kotlin/rocks/theodolite/kubernetes/operator/ControllerTest.kt @@ -55,14 +55,14 @@ class ControllerTest { server .expect() .get() - .withPath("/apis/theodolite.com/v1/namespaces/test/benchmarks") + .withPath("/apis/theodolite.rocks/v1beta1/namespaces/test/benchmarks") .andReturn(200, benchmarkResourceList) .always() server .expect() .get() - .withPath("/apis/theodolite.com/v1/namespaces/test/executions") + .withPath("/apis/theodolite.rocks/v1beta1/namespaces/test/executions") .andReturn(200, executionResourceList) .always() } 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 ad26f6c65..425ac2be6 100644 --- a/theodolite/src/test/resources/k8s-resource-files/test-benchmark.yaml +++ b/theodolite/src/test/resources/k8s-resource-files/test-benchmark.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: benchmark metadata: name: example-benchmark diff --git a/theodolite/src/test/resources/k8s-resource-files/test-execution-1.yaml b/theodolite/src/test/resources/k8s-resource-files/test-execution-1.yaml index 077c4ab41..b758e9b9b 100644 --- a/theodolite/src/test/resources/k8s-resource-files/test-execution-1.yaml +++ b/theodolite/src/test/resources/k8s-resource-files/test-execution-1.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: Execution metadata: name: example-execution diff --git a/theodolite/src/test/resources/k8s-resource-files/test-execution-update.yaml b/theodolite/src/test/resources/k8s-resource-files/test-execution-update.yaml index 504a73fe3..ccfd0160f 100644 --- a/theodolite/src/test/resources/k8s-resource-files/test-execution-update.yaml +++ b/theodolite/src/test/resources/k8s-resource-files/test-execution-update.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: execution metadata: name: example-execution diff --git a/theodolite/src/test/resources/k8s-resource-files/test-execution.yaml b/theodolite/src/test/resources/k8s-resource-files/test-execution.yaml index 2bd0bfc4b..78c01c9e8 100644 --- a/theodolite/src/test/resources/k8s-resource-files/test-execution.yaml +++ b/theodolite/src/test/resources/k8s-resource-files/test-execution.yaml @@ -1,4 +1,4 @@ -apiVersion: theodolite.com/v1 +apiVersion: theodolite.rocks/v1beta1 kind: execution metadata: name: example-execution -- GitLab