Skip to content

Commit daac0e2

Browse files
Merge branch 'main' into chore/OSS-697
2 parents 5a64f1b + fc251e7 commit daac0e2

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

charts/gitops-runtime/.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
!charts/
1+
!charts/
2+
3+
.DS_Store

charts/gitops-runtime/.helmignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
tests/
22
ci/
33
test-values/
4+
5+
.DS_Store

charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ spec:
164164
- file
165165
- properties
166166
type: object
167-
minItems: 1
168167
type: array
169168
targetApplication:
170169
properties:
@@ -215,7 +214,6 @@ spec:
215214
- file
216215
- properties
217216
type: object
218-
minItems: 1
219217
type: array
220218
targetApplication:
221219
properties:
@@ -373,10 +371,10 @@ spec:
373371
items:
374372
description: StepStatus
375373
properties:
374+
failureSummary:
375+
type: string
376376
getPromotionValues:
377377
properties:
378-
error:
379-
type: string
380378
phase:
381379
description: GetPromotionValuesStatusPhase
382380
enum:
@@ -450,8 +448,6 @@ spec:
450448
minLength: 7
451449
pattern: ^[A-Fa-f0-9]+$
452450
type: string
453-
error:
454-
type: string
455451
phase:
456452
description: PromoteAppWithCommitPhase
457453
enum:
@@ -480,8 +476,6 @@ spec:
480476
- health
481477
- sync
482478
type: object
483-
error:
484-
type: string
485479
phase:
486480
description: PromoteAppWithPRPhase
487481
enum:
@@ -562,7 +556,10 @@ spec:
562556
- health
563557
- sync
564558
type: object
565-
error:
559+
commitSha:
560+
maxLength: 40
561+
minLength: 7
562+
pattern: ^[A-Fa-f0-9]+$
566563
type: string
567564
phase:
568565
description: VerifyAppPhase

charts/gitops-runtime/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ gitops-operator:
726726
# -- defaults
727727
registry: quay.io
728728
repository: codefresh/codefresh-gitops-operator
729-
tag: aa271bd
729+
tag: c409284
730730
env:
731731
GITOPS_OPERATOR_VERSION: 0.11.1
732732
serviceAccount:

0 commit comments

Comments
 (0)