resolve conflicts

2026-10-05 04:31:42 +02:00 · 2020-04-28 08:12:19 +02:00
parent 0aee1e3148 168abfe37b
commit 9d64f6d644
17 changed files with 480 additions and 158 deletions
@@ -86,6 +86,12 @@ spec:
              type: object
              additionalProperties:
                type: string
+            sidecars:
+              type: array
+              nullable: true
+              items:
+                type: object
+                additionalProperties: true
            workers:
              type: integer
              minimum: 1