Skip to content
Snippets Groups Projects
Commit ec34088f authored by Benedikt Wetzel's avatar Benedikt Wetzel
Browse files

simplify resource set declaration

parent 1fab7464
No related branches found
No related tags found
1 merge request!171Introduce ResourceSets to make loading of resource files more flexible
...@@ -130,8 +130,6 @@ spec: ...@@ -130,8 +130,6 @@ spec:
items: items:
type: object type: object
properties: properties:
name:
type: string
ConfigMapResourceSet: ConfigMapResourceSet:
type: object type: object
properties: properties:
...@@ -155,8 +153,6 @@ spec: ...@@ -155,8 +153,6 @@ spec:
items: items:
type: object type: object
properties: properties:
name:
type: string
ConfigMapResourceSet: ConfigMapResourceSet:
type: object type: object
properties: properties:
......
...@@ -129,8 +129,6 @@ spec: ...@@ -129,8 +129,6 @@ spec:
items: items:
type: object type: object
properties: properties:
name:
type: string
ConfigMapResourceSet: ConfigMapResourceSet:
type: object type: object
properties: properties:
...@@ -154,8 +152,6 @@ spec: ...@@ -154,8 +152,6 @@ spec:
items: items:
type: object type: object
properties: properties:
name:
type: string
ConfigMapResourceSet: ConfigMapResourceSet:
type: object type: object
properties: properties:
......
...@@ -31,8 +31,7 @@ spec: ...@@ -31,8 +31,7 @@ spec:
numPartitions: 0 numPartitions: 0
replicationFactor: 0 replicationFactor: 0
appResourceSets: appResourceSets:
- name: TestAppResources - FileSystemResourceSet:
FileSystemResourceSet:
path: ./config path: ./config
files: files:
- "uc1-kstreams-deployment.yaml" - "uc1-kstreams-deployment.yaml"
...@@ -40,8 +39,7 @@ spec: ...@@ -40,8 +39,7 @@ spec:
- "jmx-configmap.yaml" - "jmx-configmap.yaml"
- "uc1-service-monitor.yaml" - "uc1-service-monitor.yaml"
loadGenResourceSets: loadGenResourceSets:
- name: RestGenResources - ConfigMapResourceSet:
ConfigMapResourceSet:
configmap: "test-configmap" configmap: "test-configmap"
files: files:
- uc1-load-generator-service.yaml - uc1-load-generator-service.yaml
......
...@@ -12,10 +12,6 @@ import theodolite.util.DeploymentFailedException ...@@ -12,10 +12,6 @@ import theodolite.util.DeploymentFailedException
@RegisterForReflection @RegisterForReflection
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
class ResourceSets: KubernetesResource { class ResourceSets: KubernetesResource {
@JsonProperty
lateinit var name: String
@JsonProperty("ConfigMapResourceSet") @JsonProperty("ConfigMapResourceSet")
val ConfigMapResourceSet: ConfigMapResourceSet? = null val ConfigMapResourceSet: ConfigMapResourceSet? = null
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment