diff --git a/docs/api-reference/crds.md b/docs/api-reference/crds.md index 87c4e9046396456e2177098c8085aa995534735b..01ffc4a962ef7674f030bac8a55be971ff1bd50c 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 b4602d6f7fd209b5851a9a9db128dfce6369b2a4..e180431dc7bb30f39b2dc396c94ec8166f0fbb40 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 263d630ff2db82927c72d2c2482fcddc09705bfc..e33019a574ec7d4a3486c9ea7778efeb6e959260 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 2b80920bb0d9adbde11be32b710afe436b98bb0e..a01cfd14dff18d61f9d0e7de434fcaf9971280eb 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 5051cb5b685deb17212c1489c585e75262bf9da5..c4459183870d945d159551e54aab10cce7ea372e 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 22b755226f1a76045dfae96821130ac59bf13bde..a76071ad09bc548f2631dc1cab137dcebc14d3de 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 af253482bcbacf628fd718eb70b3b157cc06e3f8..4b0c65de2e82e1c56151bc6b9bfad6d4967eb110 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 b8d4d2d005d5a969c2c72cdca145f829d748e419..8ef55e856b1c93d5fd54841f4291a77faed304bc 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 17266b969b3abfc7a14b4578ba1855f06b830086..9c404da65307d3baf0423fe7af9809b55a1b64d8 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 d3ee8f5242c4740aedf9862dc7be091a920582d1..c1e365ed32e31bf14f659ac30f32dbe3f6a9f911 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 ac89e714018a6d9d68d3459a3b7245475176fd6a..e4c558e12c7c3459676ec138ea4241c056656dc0 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 ad42faedd39e07d52ebb7655d644ea92a7b9e04a..1ed58f97137e5093233773db875473d27e446fe6 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 80352e27dee3c80ae38c558825736bbc17c97283..961ef594b397a870e9ea7d48e6f8a3073672818e 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 f172b33cec4327b7bc5193ee6fea43f5313dee8d..c84212970855adcd239bf2253c5f0f02bd2933c9 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 b45f9d4baa37ab9495adbc82f7f2cd9196d8413d..bd06a1de373c9813bcf5a5723f82908f2e013349 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 0c1408df5d1bd2f5efee8d28567bfe58db32fca8..199fd33666f546e6ad535fd767f714d721f631bb 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 3e9ffd9a20932b99a0d1903c412b417c19a710d3..ccca867441508c57b5ee715e3705ff8f2081e964 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 af899991712bcb51abc204b84a3a48de9d687b25..017d1fa55ac80cf40f8d4241602c107f289bda2c 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 2dd5fcdf32bfc9de143a8a39c7550db912108200..baed76a02b0f0db98b4fd6b0debf82dd7d42d7a8 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 8cdc00a559cc94fe9e9bcf95dd722662880be07e..4d0e0122ae64bcc5e93c73b9f9dee4647a54485c 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 5c50ce87cee65e90dbf393ae0f7dcdf8fdf72a26..7062823219bd2d1cc6388b9453e636028a74a106 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 e34f8707e9a461c7df4fc9361fd95763fcadf784..967f198bf578d708ffe88cf01157fe18dce0ab46 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 3d6e07f4e3049a19f2fbb44ccff5f077d87d2322..d35907c5bde53b2923482a8ba4e8903e9b96b562 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 8835db1d3ff6287d4c9cfb04021881deb65acb39..280e2ccd1d7706089dc10ca3350f238e49f6a2ee 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 2e4011d44d63ce6767e30f5519a41b36fd8b9bc5..41e6da810e4eda8556f26c0089093f16b65f1fb7 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 06c22a1cf69ec4fb747fc10f27e4c08718d6a8c1..bf94eb2f88720fc833ba752bbf0353a8c10e8bc0 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 257c6814dd4ebbec727c0223161ce6649c4d4b42..59da7d95372e91b7e429a103071157fb80ba347c 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 cfc9d3bd6a196cd5740463d41beb64276f4ffa57..27ca9ebfb314f741c62896ce7faabb0280ba0a84 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 0db251864bac3e6f2541534eec8895297b21cf39..fd618e0189a47b3829792d355febe00a2ce36bad 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 be7116c46f8222eeba0f3bffd086f7cc2b6ee227..babc0bde2880b1321c359721a7484bee61f43ed2 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 87e6275a8409177394dd313f2f1f0436e2162577..1d889398e1d018ed9b496ad568f79fd8e38aed44 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 f480177e4482ab48df01593fdc10ea459a87ca43..66c5404591c8f7b2ab0ee011e4f7cb1768ae09de 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 df7b0f0c1ca326db21885beb1c714060aa56b251..dc3da88ce461cb36074180b209a2240b4e4a8275 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 bdaa2692d374b4002a1f890f706e2c1ec0d8733c..4d639fdb98ea4a890a734f8db0deca62d83fb508 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 b81bbcd442834136283dc080f5f6a79bbc1cd415..ce91b1a5b03045152e94650c9ccf912e31ece44f 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 3120d7420065cfe254d1ed76735ddc8b35d2bc21..bdb7cc6ce4c0a6044878496eed3f99efe105c17d 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 ad26f6c658c72231887a8e3cd4c5dc17cc787641..425ac2be616aae958cc20f570c730f7f4b9d6ccd 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 077c4ab410e3fc78a9bb47c563c2b237b922c1ba..b758e9b9b1e39a9722ad9c0d6513f36b9a4961da 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 504a73fe3b325368301897cacdc922e7f6e70430..ccfd0160fc407863544e5b735e595b86a2669eea 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 2bd0bfc4b3602c52fc3cc5cce9729777c21f4ac4..78c01c9e8e241c92a897dc00d024d92ecd9e82d6 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