From ec34088f3ea1ad72c866340d87a50177b9975c78 Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Thu, 12 Aug 2021 18:42:40 +0200
Subject: [PATCH] simplify resource set declaration
---
helm/templates/theodolite/crd-benchmark.yaml | 4 ----
theodolite/crd/crd-benchmark.yaml | 4 ----
theodolite/examples/operator/example-benchmark.yaml | 6 ++----
.../src/main/kotlin/theodolite/benchmark/ResourceSets.kt | 4 ----
4 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/helm/templates/theodolite/crd-benchmark.yaml b/helm/templates/theodolite/crd-benchmark.yaml
index 455b9b7c0..b096f9d27 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 55c11a200..ed604816a 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 71bcba778..7bcfee993 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 b3ecf49c0..1d5a2dc0e 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
--
GitLab