From 856208283682a3d7c18c09b9e15ffceffe52f085 Mon Sep 17 00:00:00 2001
From: scme0 <scott.merchant@octopus.com>
Date: Wed, 8 Oct 2025 19:37:19 +0200
Subject: [PATCH 1/2] update gitops operator env vars

---
 .../templates/_components/gitops-operator/_env.yaml            | 3 +--
 charts/gitops-runtime/values.yaml                              | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/charts/gitops-runtime/templates/_components/gitops-operator/_env.yaml b/charts/gitops-runtime/templates/_components/gitops-operator/_env.yaml
index 7e14bc0b..395c366d 100644
--- a/charts/gitops-runtime/templates/_components/gitops-operator/_env.yaml
+++ b/charts/gitops-runtime/templates/_components/gitops-operator/_env.yaml
@@ -17,6 +17,7 @@ LEADER_ELECT: true
 LEADER_ELECT: false
   {{- end }}
 MAX_CONCURRENT_RELEASES: {{ .Values.config.maxConcurrentReleases }}
+MAX_RECONCILE_RETRIES: {{ .Values.config.maxReconcileRetries }}
 PROMOTION_WRAPPER_TEMPLATE: {{ .Values.config.promotionWrapperTemplate | quote }}
 RUNTIME: {{ .Values.global.runtime.name }}
 TASK_POLLING_INTERVAL: {{ .Values.config.taskPollingInterval }}
@@ -44,6 +45,4 @@ RUNTIME_VERSION:
     configMapKeyRef:
       name: codefresh-cm
       key: version
-SOURCES_SERVER_URL: http://argo-gateway # TODO: remove and leave only ARGO_GATEWAY_URL
-ARGO_GATEWAY_URL: http://argo-gateway
 {{- end -}}
diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml
index c96b2ab0..d7a558d2 100644
--- a/charts/gitops-runtime/values.yaml
+++ b/charts/gitops-runtime/values.yaml
@@ -626,6 +626,8 @@ gitops-operator:
     workflowMonitorPollingInterval: 10s
     # -- Maximum number of concurrent releases being processed by the operator (this will not affect the number of releases being processed by the gitops runtime)
     maxConcurrentReleases: 100
+    # -- Maximum number of reconcile retries on promotion-related resources before failing a promotion task
+    maxReconcileRetries: 10
     # -- An optional template for the promotion wrapper (empty default will use the embedded one)
     promotionWrapperTemplate: ''
   image:

From b90d19716bd4358930364e548e33ef6448f28d73 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:30:47 +0000
Subject: [PATCH 2/2] [gitops-operator]feat: Remove Sources Server as it's no
 longer required

---
 charts/gitops-runtime/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml
index d7a558d2..ae488f36 100644
--- a/charts/gitops-runtime/values.yaml
+++ b/charts/gitops-runtime/values.yaml
@@ -634,7 +634,7 @@ gitops-operator:
     # -- defaults
     registry: quay.io
     repository: codefresh/codefresh-gitops-operator
-    tag: 5ac8210
+    tag: 09098f6
   env:
     GITOPS_OPERATOR_VERSION: 0.11.1
   serviceAccount: