resolving conflicts

2020-08-23 12:13:37 -04:00
parent 8d56047830 03e4a9edc5
commit 95c94c03d5
504 changed files with 16169 additions and 11399 deletions
@@ -673,6 +673,8 @@ spec:
                cronSpec:
                  type: string
                  pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$'
+                image:
+                  type: string
                replicas:
                  type: integer
                  minimum: 1
@@ -720,6 +722,8 @@ spec:
            cronSpec:
              type: string
              pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$'
+            image:
+              type: string
            replicas:
              type: integer
              minimum: 1