From 73020f58df44ae671fe3ed0a0aacbc8f11a14bb8 Mon Sep 17 00:00:00 2001 From: reggie-k Date: Mon, 20 Oct 2025 15:11:12 +0300 Subject: [PATCH 1/5] oss argo cd and argo helm, removed argo cd CF specific values from values.yaml Signed-off-by: reggie-k --- charts/gitops-runtime/Chart.yaml | 4 ++-- charts/gitops-runtime/values.yaml | 32 +------------------------------ 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 50212b65..92835134 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -15,9 +15,9 @@ annotations: artifacthub.io/alternativeName: "codefresh-gitops-runtime" dependencies: - name: argo-cd - repository: https://codefresh-io.github.io/argo-helm + repository: https://argoproj.github.io/argo-helm condition: argo-cd.enabled - version: 8.0.6-9-cap-v3.0.2-2025-09-08-9b30d922 + version: 9.0.2 - name: argo-events repository: https://codefresh-io.github.io/argo-helm version: 2.4.9-cap-CR-30841 diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 63a07799..b041c549 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -231,45 +231,15 @@ sealed-secrets: argo-cd: enabled: true fullnameOverride: argo-cd - crds: - install: true + configs: cm: timeout.reconciliation: 20s accounts.admin: apiKey,login application.resourceTrackingMethod: annotation+label - resource.customizations.actions.argoproj.io_Rollout: | - mergeBuiltinActions: true - discovery.lua: | - actions = {} - local fullyPromoted = obj.status.currentPodHash == obj.status.stableRS - actions["pause"] = {["disabled"] = fullyPromoted or obj.spec.paused == true} - actions["skip-current-step"] = {["disabled"] = obj.spec.strategy.canary == nil or obj.spec.strategy.canary.steps == nil or obj.status.currentStepIndex == table.getn(obj.spec.strategy.canary.steps)} - return actions - definitions: - - name: pause - action.lua: | - obj.spec.paused = true - return obj - - name: skip-current-step - action.lua: | - if obj.status ~= nil then - if obj.spec.strategy.canary ~= nil and obj.spec.strategy.canary.steps ~= nil and obj.status.currentStepIndex < table.getn(obj.spec.strategy.canary.steps) then - if obj.status.pauseConditions ~= nil and table.getn(obj.status.pauseConditions) > 0 then - obj.status.pauseConditions = nil - end - obj.status.currentStepIndex = obj.status.currentStepIndex + 1 - end - end - return obj params: server.insecure: true application.namespaces: 'cf-*' - applicationVersioning: - # -- Enable application versioning - enabled: true - # -- Extract application version based on ApplicationConfiguration CRD - useApplicationConfiguration: true #----------------------------------------------------------------------------------------------------------------------- # Argo Events #----------------------------------------------------------------------------------------------------------------------- From 23b3c3af3d2f25e23620d7bbfa1c508b17cd9fbc Mon Sep 17 00:00:00 2001 From: reggie-k Date: Mon, 20 Oct 2025 15:41:52 +0300 Subject: [PATCH 2/5] oss argo cd and argo helm, removed argo cd CF specific values from values.yaml Signed-off-by: reggie-k --- charts/gitops-runtime/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index b041c549..5aa60175 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -232,11 +232,15 @@ argo-cd: enabled: true fullnameOverride: argo-cd + notifications: + enabled: false + configs: cm: timeout.reconciliation: 20s accounts.admin: apiKey,login application.resourceTrackingMethod: annotation+label + application.instanceLabelKey: "" params: server.insecure: true application.namespaces: 'cf-*' From bd34de06f2738fbfa1df8d4449f550a12d3e8916 Mon Sep 17 00:00:00 2001 From: reggie-k Date: Tue, 28 Oct 2025 16:12:05 +0200 Subject: [PATCH 3/5] override redis image with 8.2.2-alpine Signed-off-by: reggie-k --- charts/gitops-runtime/values-ha.yaml | 6 ++++++ charts/gitops-runtime/values.yaml | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/charts/gitops-runtime/values-ha.yaml b/charts/gitops-runtime/values-ha.yaml index 8b84a3d5..1d0ab31e 100644 --- a/charts/gitops-runtime/values-ha.yaml +++ b/charts/gitops-runtime/values-ha.yaml @@ -70,6 +70,12 @@ cf-argocd-extras: argo-cd: redis-ha: enabled: true + ## Redis image + image: + # -- Redis repository + repository: ecr-public.aws.com/docker/library/redis + # -- Redis tag + tag: 8.2.2-alpine controller: replicas: 1 diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 509eb0db..235154c4 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -237,6 +237,14 @@ argo-cd: notifications: enabled: false + redis: + ## Redis image + image: + # -- Redis repository + repository: ecr-public.aws.com/docker/library/redis + # -- Redis tag + tag: 8.2.2-alpine + configs: cm: timeout.reconciliation: 20s From fda4899134e09afebe0e26060410580e71d43213 Mon Sep 17 00:00:00 2001 From: Oleksandr Saulyak Date: Tue, 28 Oct 2025 18:40:01 +0200 Subject: [PATCH 4/5] app-proxy: 1.3866.0 with disabled app validation request --- charts/gitops-runtime/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 0a41a701..b14b2186 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -454,14 +454,14 @@ app-proxy: tag: 1.1.17-main image: repository: quay.io/codefresh/cap-app-proxy - tag: 1.3855.0 + tag: 1.3866.0 pullPolicy: IfNotPresent # -- Extra volume mounts for main container extraVolumeMounts: [] initContainer: image: repository: quay.io/codefresh/cap-app-proxy-init - tag: 1.3855.0 + tag: 1.3866.0 pullPolicy: IfNotPresent command: - ./init.sh From a9fa7d9558d010f97b41ba071579475664470388 Mon Sep 17 00:00:00 2001 From: reggie-k Date: Wed, 29 Oct 2025 10:23:07 +0200 Subject: [PATCH 5/5] override redis-ha image with 8.2.2-alpine Signed-off-by: reggie-k --- charts/gitops-runtime/values.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 235154c4..131e6920 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -245,6 +245,14 @@ argo-cd: # -- Redis tag tag: 8.2.2-alpine + redis-ha: + ## Redis-ha image + image: + # -- Redis repository + repository: ecr-public.aws.com/docker/library/redis + # -- Redis tag + tag: 8.2.2-alpine + configs: cm: timeout.reconciliation: 20s