Skip to content

Commit 2aa6e47

Browse files
feat: switched to OSS Argo CD and Argo Helm, removed Argo CD CF specific values from va… (#823)
* oss argo cd and argo helm, removed argo cd CF specific values from values.yaml Signed-off-by: reggie-k <[email protected]> * oss argo cd and argo helm, removed argo cd CF specific values from values.yaml Signed-off-by: reggie-k <[email protected]> * override redis image with 8.2.2-alpine Signed-off-by: reggie-k <[email protected]> * app-proxy: 1.3866.0 with disabled app validation request * override redis-ha image with 8.2.2-alpine Signed-off-by: reggie-k <[email protected]> --------- Signed-off-by: reggie-k <[email protected]> Co-authored-by: Oleksandr Saulyak <[email protected]>
1 parent 60ea3a8 commit 2aa6e47

File tree

3 files changed

+31
-35
lines changed

3 files changed

+31
-35
lines changed

charts/gitops-runtime/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ annotations:
1515
artifacthub.io/alternativeName: "codefresh-gitops-runtime"
1616
dependencies:
1717
- name: argo-cd
18-
repository: https://codefresh-io.github.io/argo-helm
18+
repository: https://argoproj.github.io/argo-helm
1919
condition: argo-cd.enabled
20-
version: 8.0.6-9-cap-v3.0.2-2025-09-08-9b30d922
20+
version: 9.0.2
2121
- name: argo-events
2222
repository: https://codefresh-io.github.io/argo-helm
2323
version: 2.4.9-cap-CR-30841

charts/gitops-runtime/values-ha.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@ cf-argocd-extras:
7070
argo-cd:
7171
redis-ha:
7272
enabled: true
73+
## Redis image
74+
image:
75+
# -- Redis repository
76+
repository: ecr-public.aws.com/docker/library/redis
77+
# -- Redis tag
78+
tag: 8.2.2-alpine
7379

7480
controller:
7581
replicas: 1

charts/gitops-runtime/values.yaml

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -233,45 +233,35 @@ sealed-secrets:
233233
argo-cd:
234234
enabled: true
235235
fullnameOverride: argo-cd
236-
crds:
237-
install: true
236+
237+
notifications:
238+
enabled: false
239+
240+
redis:
241+
## Redis image
242+
image:
243+
# -- Redis repository
244+
repository: ecr-public.aws.com/docker/library/redis
245+
# -- Redis tag
246+
tag: 8.2.2-alpine
247+
248+
redis-ha:
249+
## Redis-ha image
250+
image:
251+
# -- Redis repository
252+
repository: ecr-public.aws.com/docker/library/redis
253+
# -- Redis tag
254+
tag: 8.2.2-alpine
255+
238256
configs:
239257
cm:
240258
timeout.reconciliation: 20s
241259
accounts.admin: apiKey,login
242260
application.resourceTrackingMethod: annotation+label
243-
resource.customizations.actions.argoproj.io_Rollout: |
244-
mergeBuiltinActions: true
245-
discovery.lua: |
246-
actions = {}
247-
local fullyPromoted = obj.status.currentPodHash == obj.status.stableRS
248-
actions["pause"] = {["disabled"] = fullyPromoted or obj.spec.paused == true}
249-
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)}
250-
return actions
251-
definitions:
252-
- name: pause
253-
action.lua: |
254-
obj.spec.paused = true
255-
return obj
256-
- name: skip-current-step
257-
action.lua: |
258-
if obj.status ~= nil then
259-
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
260-
if obj.status.pauseConditions ~= nil and table.getn(obj.status.pauseConditions) > 0 then
261-
obj.status.pauseConditions = nil
262-
end
263-
obj.status.currentStepIndex = obj.status.currentStepIndex + 1
264-
end
265-
end
266-
return obj
261+
application.instanceLabelKey: ""
267262
params:
268263
server.insecure: true
269264
application.namespaces: 'cf-*'
270-
applicationVersioning:
271-
# -- Enable application versioning
272-
enabled: true
273-
# -- Extract application version based on ApplicationConfiguration CRD
274-
useApplicationConfiguration: true
275265
#-----------------------------------------------------------------------------------------------------------------------
276266
# Argo Events
277267
#-----------------------------------------------------------------------------------------------------------------------
@@ -472,14 +462,14 @@ app-proxy:
472462
tag: 1.1.17-main
473463
image:
474464
repository: quay.io/codefresh/cap-app-proxy
475-
tag: 1.3855.0
465+
tag: 1.3866.0
476466
pullPolicy: IfNotPresent
477467
# -- Extra volume mounts for main container
478468
extraVolumeMounts: []
479469
initContainer:
480470
image:
481471
repository: quay.io/codefresh/cap-app-proxy-init
482-
tag: 1.3855.0
472+
tag: 1.3866.0
483473
pullPolicy: IfNotPresent
484474
command:
485475
- ./init.sh

0 commit comments

Comments
 (0)