Change QueueConsumer to not have an array for k8s

metalbear-co · Aug 9, 2024 · 9f0e418 · 9f0e418
1 parent ef238e9
commit 9f0e418
Showing 1 changed file with 30 additions and 46 deletions.
diff --git a/mirrord-operator/templates/crd.yaml b/mirrord-operator/templates/crd.yaml
@@ -114,30 +114,22 @@ spec:
             properties:
               consumer:
                 description: The resource (deployment or Argo rollout) that reads from the queues.
-                oneOf:
-                - required:
-                  - deployment
-                - required:
-                  - rollout
                 properties:
-                  deployment:
-                    description: The name of the deployment and an optional container. If a container is not specified, the workload queue registry will apply to every run that targets any of the workload's containers.
-                    items:
-                    - type: string
-                    - nullable: true
-                      type: string
-                    maxItems: 2
-                    minItems: 2
-                    type: array
-                  rollout:
-                    description: The name of the rollout and an optional container. If a container is not specified, the workload queue registry will apply to every run that targets any of the workload's containers.
-                    items:
-                    - type: string
-                    - nullable: true
-                      type: string
-                    maxItems: 2
-                    minItems: 2
-                    type: array
+                  container:
+                    description: If a container is not specified, the workload queue registry will apply to every run that targets any of the workload's containers.
+                    nullable: true
+                    type: string
+                  name:
+                    type: string
+                  workload_type:
+                    description: A workload that is a consumer of a queue that is being split.
+                    enum:
+                    - Deployment
+                    - Rollout
+                    type: string
+                required:
+                - name
+                - workload_type
                 type: object
               queues:
                 additionalProperties:
@@ -250,30 +242,22 @@ spec:
             properties:
               queueConsumer:
                 description: The target of this session.
-                oneOf:
-                - required:
-                  - deployment
-                - required:
-                  - rollout
                 properties:
-                  deployment:
-                    description: The name of the deployment and an optional container. If a container is not specified, the workload queue registry will apply to every run that targets any of the workload's containers.
-                    items:
-                    - type: string
-                    - nullable: true
-                      type: string
-                    maxItems: 2
-                    minItems: 2
-                    type: array
-                  rollout:
-                    description: The name of the rollout and an optional container. If a container is not specified, the workload queue registry will apply to every run that targets any of the workload's containers.
-                    items:
-                    - type: string
-                    - nullable: true
-                      type: string
-                    maxItems: 2
-                    minItems: 2
-                    type: array
+                  container:
+                    description: If a container is not specified, the workload queue registry will apply to every run that targets any of the workload's containers.
+                    nullable: true
+                    type: string
+                  name:
+                    type: string
+                  workload_type:
+                    description: A workload that is a consumer of a queue that is being split.
+                    enum:
+                    - Deployment
+                    - Rollout
+                    type: string
+                required:
+                - name
+                - workload_type
                 type: object
               queueFilters:
                 additionalProperties: