Skip to content

Commit 039b343

Browse files
Merge branch 'main' into CR-31385-security
2 parents 81712bb + 09c0038 commit 039b343

File tree

2 files changed

+57
-8
lines changed

2 files changed

+57
-8
lines changed

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

Lines changed: 52 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,8 @@ spec:
487487
type: string
488488
healthMessage:
489489
type: string
490+
revision:
491+
type: string
490492
sync:
491493
description: SyncStatusCode is a type which represents
492494
possible comparison results
@@ -500,11 +502,29 @@ spec:
500502
- healthMessage
501503
- sync
502504
type: object
503-
commitSha:
504-
maxLength: 40
505-
minLength: 7
506-
pattern: (^[A-Fa-f0-9]+$|^<any-commit>$)
507-
type: string
505+
commitInfo:
506+
properties:
507+
commitAuthorId:
508+
properties:
509+
email:
510+
type: string
511+
username:
512+
type: string
513+
required:
514+
- email
515+
- username
516+
type: object
517+
commitDate:
518+
format: date-time
519+
type: string
520+
commitMessage:
521+
type: string
522+
commitSha:
523+
maxLength: 40
524+
minLength: 7
525+
pattern: (^[A-Fa-f0-9]+$|^<any-commit>$)
526+
type: string
527+
type: object
508528
phase:
509529
description: PromoteAppWithCommitPhase
510530
enum:
@@ -525,6 +545,8 @@ spec:
525545
type: string
526546
healthMessage:
527547
type: string
548+
revision:
549+
type: string
528550
sync:
529551
description: SyncStatusCode is a type which represents
530552
possible comparison results
@@ -538,6 +560,29 @@ spec:
538560
- healthMessage
539561
- sync
540562
type: object
563+
commitInfo:
564+
properties:
565+
commitAuthorId:
566+
properties:
567+
email:
568+
type: string
569+
username:
570+
type: string
571+
required:
572+
- email
573+
- username
574+
type: object
575+
commitDate:
576+
format: date-time
577+
type: string
578+
commitMessage:
579+
type: string
580+
commitSha:
581+
maxLength: 40
582+
minLength: 7
583+
pattern: (^[A-Fa-f0-9]+$|^<any-commit>$)
584+
type: string
585+
type: object
541586
phase:
542587
description: PromoteAppWithPRPhase
543588
enum:
@@ -613,6 +658,8 @@ spec:
613658
type: string
614659
healthMessage:
615660
type: string
661+
revision:
662+
type: string
616663
sync:
617664
description: SyncStatusCode is a type which represents
618665
possible comparison results

charts/gitops-runtime/values.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ global:
4949
cluster: https://kubernetes.default.svc
5050
# -- Defines whether this is a Codefresh hosted runtime. Should not be changed.
5151
codefreshHosted: false
52+
# -- Defines if runtime is namespace scoped. Required for running multiple runtimes in the same cluster
53+
singleNamespace: false
5254
# -- Ingress settings
5355
ingress:
5456
# -- if set to true, the pre-install hook will validate the existance of appropriate values, but *will not* attempt to make a web request to the ingress host
@@ -146,7 +148,7 @@ global:
146148
image:
147149
registry: quay.io
148150
repository: codefresh/cf-argocd-extras
149-
tag: 695977c
151+
tag: d4fefcb
150152
nodeSelector: {}
151153
tolerations: []
152154
affinity: {}
@@ -634,7 +636,7 @@ gitops-operator:
634636
# -- defaults
635637
registry: quay.io
636638
repository: codefresh/codefresh-gitops-operator
637-
tag: "6881890"
639+
tag: "2784cd5"
638640
env:
639641
GITOPS_OPERATOR_VERSION: 0.11.1
640642
serviceAccount:
@@ -664,7 +666,7 @@ argo-gateway:
664666
image:
665667
registry: quay.io
666668
repository: codefresh/cf-argocd-extras
667-
tag: 695977c
669+
tag: d4fefcb
668670
nodeSelector: {}
669671
tolerations: []
670672
affinity: {}

0 commit comments

Comments
 (0)