diff --git a/helm/templates/theodolite/crd-benchmark.yaml b/helm/templates/theodolite/crd-benchmark.yaml index 455b9b7c05f22a9a08222765d95c451aa9cfece4..b096f9d277fb9771640c980e31666484e92641bb 100644 --- a/helm/templates/theodolite/crd-benchmark.yaml +++ b/helm/templates/theodolite/crd-benchmark.yaml @@ -130,8 +130,6 @@ spec: items: type: object properties: - name: - type: string ConfigMapResourceSet: type: object properties: @@ -155,8 +153,6 @@ spec: items: type: object properties: - name: - type: string ConfigMapResourceSet: type: object properties: diff --git a/theodolite/crd/crd-benchmark.yaml b/theodolite/crd/crd-benchmark.yaml index 55c11a2004ef282152ceabb3058e6f18dca4258d..ed604816acec576e586c0bc4435578fac6a02894 100644 --- a/theodolite/crd/crd-benchmark.yaml +++ b/theodolite/crd/crd-benchmark.yaml @@ -129,8 +129,6 @@ spec: items: type: object properties: - name: - type: string ConfigMapResourceSet: type: object properties: @@ -154,8 +152,6 @@ spec: items: type: object properties: - name: - type: string ConfigMapResourceSet: type: object properties: diff --git a/theodolite/examples/operator/example-benchmark.yaml b/theodolite/examples/operator/example-benchmark.yaml index 71bcba77894421ed31def9831663bbac68aa6ac9..7bcfee9932b65cf66b8d8dd457d10d65848eff91 100644 --- a/theodolite/examples/operator/example-benchmark.yaml +++ b/theodolite/examples/operator/example-benchmark.yaml @@ -31,8 +31,7 @@ spec: numPartitions: 0 replicationFactor: 0 appResourceSets: - - name: TestAppResources - FileSystemResourceSet: + - FileSystemResourceSet: path: ./config files: - "uc1-kstreams-deployment.yaml" @@ -40,8 +39,7 @@ spec: - "jmx-configmap.yaml" - "uc1-service-monitor.yaml" loadGenResourceSets: - - name: RestGenResources - ConfigMapResourceSet: + - ConfigMapResourceSet: configmap: "test-configmap" files: - uc1-load-generator-service.yaml diff --git a/theodolite/src/main/kotlin/theodolite/benchmark/ResourceSets.kt b/theodolite/src/main/kotlin/theodolite/benchmark/ResourceSets.kt index b3ecf49c097af742faa9ad5574b1f9c96f630542..1d5a2dc0e90a0bd14b7c0cc426f90aaed2a6cada 100644 --- a/theodolite/src/main/kotlin/theodolite/benchmark/ResourceSets.kt +++ b/theodolite/src/main/kotlin/theodolite/benchmark/ResourceSets.kt @@ -12,10 +12,6 @@ import theodolite.util.DeploymentFailedException @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_NULL) class ResourceSets: KubernetesResource { - - @JsonProperty - lateinit var name: String - @JsonProperty("ConfigMapResourceSet") val ConfigMapResourceSet: ConfigMapResourceSet? = null