From c2066f95b40a2b9eedd4d8d06f51ccabf4307d90 Mon Sep 17 00:00:00 2001 From: scme0 Date: Fri, 3 Oct 2025 15:31:08 +0200 Subject: [PATCH 1/4] update crd for warnings and failure props --- .../gitops-operator/crds/promotiontasks.yaml | 42 ++++++++++++++++++- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml index c0f31bd03..dec43194b 100644 --- a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml +++ b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml @@ -381,6 +381,25 @@ spec: createdAt: format: date-time type: string + failure: + properties: + code: + type: string + context: + type: string + message: + type: string + stepIndex: + type: integer + transient: + type: boolean + required: + - code + - context + - message + - stepIndex + - transient + type: object observedGeneration: format: int64 type: integer @@ -399,8 +418,6 @@ spec: items: description: StepStatus properties: - failureSummary: - type: string getPromotionValues: properties: commitAuthorAvatarUrl: @@ -633,6 +650,27 @@ spec: updatedAt: format: date-time type: string + warnings: + items: + properties: + code: + type: string + context: + type: string + message: + type: string + stepIndex: + type: integer + transient: + type: boolean + required: + - code + - context + - message + - stepIndex + - transient + type: object + type: array required: - createdAt - phase From b62b2f842eb1c6e7cec33f3100b82199e5b28403 Mon Sep 17 00:00:00 2001 From: scme0 Date: Fri, 3 Oct 2025 17:52:53 +0200 Subject: [PATCH 2/4] update promotion task crd --- .../gitops-operator/crds/promotiontasks.yaml | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml index dec43194b..b6ec93c99 100644 --- a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml +++ b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml @@ -391,14 +391,11 @@ spec: type: string stepIndex: type: integer - transient: - type: boolean required: - code - context - message - stepIndex - - transient type: object observedGeneration: format: int64 @@ -653,22 +650,27 @@ spec: warnings: items: properties: - code: - type: string - context: - type: string - message: - type: string - stepIndex: + count: type: integer - transient: - type: boolean + error: + properties: + code: + type: string + context: + type: string + message: + type: string + stepIndex: + type: integer + required: + - code + - context + - message + - stepIndex + type: object required: - - code - - context - - message - - stepIndex - - transient + - count + - error type: object type: array required: From 5aa787acebff2a0a3296cc730850c5f37eeb2d66 Mon Sep 17 00:00:00 2001 From: scme0 Date: Tue, 7 Oct 2025 12:10:30 +0200 Subject: [PATCH 3/4] update promotion task crd --- .../gitops-operator/crds/promotiontasks.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml index b6ec93c99..ef3c67a9c 100644 --- a/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml +++ b/charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml @@ -385,17 +385,17 @@ spec: properties: code: type: string - context: - type: string message: type: string stepIndex: type: integer + while: + type: string required: - code - - context - message - stepIndex + - while type: object observedGeneration: format: int64 @@ -656,17 +656,17 @@ spec: properties: code: type: string - context: - type: string message: type: string stepIndex: type: integer + while: + type: string required: - code - - context - message - stepIndex + - while type: object required: - count From adffef3156ca4f9200e4aa8c22f15f0ea3ffa869 Mon Sep 17 00:00:00 2001 From: "codefresh-v2-pipelines[bot]" <109073600+codefresh-v2-pipelines[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 14:00:47 +0000 Subject: [PATCH 4/4] [gitops-operator]fix: align reconciler requeue and error handling logic, add failure and warning error properties --- charts/gitops-runtime/values.yaml | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index d4512c928..c96b2ab0f 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -139,7 +139,6 @@ global: # -- global NO_PROXY for all components noProxy: '' imageRegistry: "" - # -- Global settings for event reporters # Event reporters are used for reporting runtime and cluster resources to Codefresh platform event-reporters: @@ -188,7 +187,6 @@ global: scrapeTimeout: 10s labels: {} config: {} - # ------------------------------------------------------------------------------------------------------------------------- # Installer # ------------------------------------------------------------------------------------------------------------------------- @@ -634,7 +632,7 @@ gitops-operator: # -- defaults registry: quay.io repository: codefresh/codefresh-gitops-operator - tag: a1316ff + tag: 5ac8210 env: GITOPS_OPERATOR_VERSION: 0.11.1 serviceAccount: @@ -658,7 +656,6 @@ gitops-operator: enabled: false minAvailable: 1 maxUnavailable: "" - # -- Argo Gateway # Argo Gateway is used to perform operations on ArgoCD from Codefresh platform argo-gateway: @@ -703,7 +700,6 @@ argo-gateway: interval: 30s scrapeTimeout: 10s labels: {} - # -- Enable hook job to create redis secret redis-secret-init: image: @@ -713,7 +709,6 @@ redis-secret-init: nodeSelector: {} tolerations: [] affinity: {} - # -- Standalone redis deployment # Will be replaced by redis-ha subchart when `redis-ha.enabled=true` redis: @@ -803,11 +798,9 @@ redis: create: true name: "" annotations: {} - event-reporters: cluster-event-reporter: {} runtime-event-reporter: {} - # -- Redis-HA subchart replaces custom redis deployment when `redis-ha.enabled=true` # Ref: https://github.com/DandyDeveloper/charts/blob/master/charts/redis-ha/values.yaml redis-ha: @@ -854,33 +847,26 @@ redis-ha: # -- Additional affinities to add to the haproxy pods. additionalAffinities: {} # -- Assign custom [affinity] rules to the haproxy pods. - affinity: | - + affinity: "" # -- [Tolerations] for use with node taints for haproxy pods. tolerations: [] # -- HAProxy container-level security context # @default -- See [values.yaml] containerSecurityContext: readOnlyRootFilesystem: true - # -- Configures redis-ha with AUTH auth: true # -- Existing Secret to use for redis-ha authentication. # By default the redis-secret-init Job is generating this Secret. existingSecret: gitops-runtime-redis - # -- Whether the Redis server pods should be forced to run on separate nodes. hardAntiAffinity: true - # -- Additional affinities to add to the Redis server pods. additionalAffinities: {} - # -- Assign custom [affinity] rules to the Redis pods. - affinity: | - + affinity: "" # -- [Tolerations] for use with node taints for Redis pods. tolerations: [] - # -- Assign custom [TopologySpreadConstraints] rules to the Redis pods. ## https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/ topologySpreadConstraints: