Skip to content

Commit 546452e

Browse files
fix: align reconciler requeue and error handling logic, add failure and warning error properties (codefresh-io#780)
* update crd for warnings and failure props * update promotion task crd * update promotion task crd * [gitops-operator]fix: align reconciler requeue and error handling logic, add failure and warning error properties --------- Co-authored-by: codefresh-v2-pipelines[bot] <109073600+codefresh-v2-pipelines[bot]@users.noreply.github.com>
1 parent f542a15 commit 546452e

File tree

2 files changed

+45
-19
lines changed

2 files changed

+45
-19
lines changed

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

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,22 @@ spec:
381381
createdAt:
382382
format: date-time
383383
type: string
384+
failure:
385+
properties:
386+
code:
387+
type: string
388+
message:
389+
type: string
390+
stepIndex:
391+
type: integer
392+
while:
393+
type: string
394+
required:
395+
- code
396+
- message
397+
- stepIndex
398+
- while
399+
type: object
384400
observedGeneration:
385401
format: int64
386402
type: integer
@@ -399,8 +415,6 @@ spec:
399415
items:
400416
description: StepStatus
401417
properties:
402-
failureSummary:
403-
type: string
404418
getPromotionValues:
405419
properties:
406420
commitAuthorAvatarUrl:
@@ -633,6 +647,32 @@ spec:
633647
updatedAt:
634648
format: date-time
635649
type: string
650+
warnings:
651+
items:
652+
properties:
653+
count:
654+
type: integer
655+
error:
656+
properties:
657+
code:
658+
type: string
659+
message:
660+
type: string
661+
stepIndex:
662+
type: integer
663+
while:
664+
type: string
665+
required:
666+
- code
667+
- message
668+
- stepIndex
669+
- while
670+
type: object
671+
required:
672+
- count
673+
- error
674+
type: object
675+
type: array
636676
required:
637677
- createdAt
638678
- phase

charts/gitops-runtime/values.yaml

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ global:
139139
# -- global NO_PROXY for all components
140140
noProxy: ''
141141
imageRegistry: ""
142-
143142
# -- Global settings for event reporters
144143
# Event reporters are used for reporting runtime and cluster resources to Codefresh platform
145144
event-reporters:
@@ -188,7 +187,6 @@ global:
188187
scrapeTimeout: 10s
189188
labels: {}
190189
config: {}
191-
192190
# -------------------------------------------------------------------------------------------------------------------------
193191
# Installer
194192
# -------------------------------------------------------------------------------------------------------------------------
@@ -634,7 +632,7 @@ gitops-operator:
634632
# -- defaults
635633
registry: quay.io
636634
repository: codefresh/codefresh-gitops-operator
637-
tag: a1316ff
635+
tag: 5ac8210
638636
env:
639637
GITOPS_OPERATOR_VERSION: 0.11.1
640638
serviceAccount:
@@ -658,7 +656,6 @@ gitops-operator:
658656
enabled: false
659657
minAvailable: 1
660658
maxUnavailable: ""
661-
662659
# -- Argo Gateway
663660
# Argo Gateway is used to perform operations on ArgoCD from Codefresh platform
664661
argo-gateway:
@@ -703,7 +700,6 @@ argo-gateway:
703700
interval: 30s
704701
scrapeTimeout: 10s
705702
labels: {}
706-
707703
# -- Enable hook job to create redis secret
708704
redis-secret-init:
709705
image:
@@ -713,7 +709,6 @@ redis-secret-init:
713709
nodeSelector: {}
714710
tolerations: []
715711
affinity: {}
716-
717712
# -- Standalone redis deployment
718713
# Will be replaced by redis-ha subchart when `redis-ha.enabled=true`
719714
redis:
@@ -803,11 +798,9 @@ redis:
803798
create: true
804799
name: ""
805800
annotations: {}
806-
807801
event-reporters:
808802
cluster-event-reporter: {}
809803
runtime-event-reporter: {}
810-
811804
# -- Redis-HA subchart replaces custom redis deployment when `redis-ha.enabled=true`
812805
# Ref: https://github.com/DandyDeveloper/charts/blob/master/charts/redis-ha/values.yaml
813806
redis-ha:
@@ -854,33 +847,26 @@ redis-ha:
854847
# -- Additional affinities to add to the haproxy pods.
855848
additionalAffinities: {}
856849
# -- Assign custom [affinity] rules to the haproxy pods.
857-
affinity: |
858-
850+
affinity: ""
859851
# -- [Tolerations] for use with node taints for haproxy pods.
860852
tolerations: []
861853
# -- HAProxy container-level security context
862854
# @default -- See [values.yaml]
863855
containerSecurityContext:
864856
readOnlyRootFilesystem: true
865-
866857
# -- Configures redis-ha with AUTH
867858
auth: true
868859
# -- Existing Secret to use for redis-ha authentication.
869860
# By default the redis-secret-init Job is generating this Secret.
870861
existingSecret: gitops-runtime-redis
871-
872862
# -- Whether the Redis server pods should be forced to run on separate nodes.
873863
hardAntiAffinity: true
874-
875864
# -- Additional affinities to add to the Redis server pods.
876865
additionalAffinities: {}
877-
878866
# -- Assign custom [affinity] rules to the Redis pods.
879-
affinity: |
880-
867+
affinity: ""
881868
# -- [Tolerations] for use with node taints for Redis pods.
882869
tolerations: []
883-
884870
# -- Assign custom [TopologySpreadConstraints] rules to the Redis pods.
885871
## https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/
886872
topologySpreadConstraints:

0 commit comments

Comments
 (0)