Skip to content

Commit 098dc5d

Browse files
Merge branch 'main' into refactor/cf-argocd-extras
2 parents 65e3e67 + e510cd3 commit 098dc5d

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,16 @@ spec:
7777
properties:
7878
getPromotionValues:
7979
properties:
80+
commitAuthorId:
81+
properties:
82+
email:
83+
type: string
84+
username:
85+
type: string
86+
required:
87+
- email
88+
- username
89+
type: object
8090
commitSha:
8191
maxLength: 40
8292
minLength: 7
@@ -155,7 +165,6 @@ spec:
155165
minLength: 1
156166
type: string
157167
value:
158-
minLength: 1
159168
type: string
160169
required:
161170
- path
@@ -212,7 +221,6 @@ spec:
212221
minLength: 1
213222
type: string
214223
value:
215-
minLength: 1
216224
type: string
217225
required:
218226
- path
@@ -395,6 +403,8 @@ spec:
395403
type: string
396404
getPromotionValues:
397405
properties:
406+
commitAuthorAvatarUrl:
407+
type: string
398408
phase:
399409
description: GetPromotionValuesStatusPhase
400410
enum:
@@ -416,7 +426,6 @@ spec:
416426
minLength: 1
417427
type: string
418428
value:
419-
minLength: 1
420429
type: string
421430
required:
422431
- path

charts/gitops-runtime/values.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ global:
103103
# tokenSecretKeyRef:
104104
# name: argocd-token
105105
# key: token
106-
107106
# -- Configuration for external ArgoCD
108107
# Should be used when `argo-cd.enabled` is set to false
109108
external-argo-cd:
@@ -127,7 +126,6 @@ global:
127126
svc: argocd-repo-server
128127
# -- Port of the ArgoCD repo server
129128
port: 8081
130-
131129
# -- Configuration for external Argo Rollouts
132130
external-argo-rollouts:
133131
# -- Rollout reporter settings
@@ -639,7 +637,7 @@ gitops-operator:
639637
# -- defaults
640638
registry: quay.io
641639
repository: codefresh/codefresh-gitops-operator
642-
tag: 8bd2a64
640+
tag: a1316ff
643641
env:
644642
GITOPS_OPERATOR_VERSION: 0.11.1
645643
serviceAccount:

0 commit comments

Comments
 (0)