Skip to content

Commit b04cc22

Browse files
mikhail-klimkomikhail-klimko
authored
Merge branch 'main' into feat/ext-argocd-under-integrations
2 parents 7fca368 + 9beab32 commit b04cc22

File tree

6 files changed

+98
-55
lines changed

6 files changed

+98
-55
lines changed

‎CODEOWNERS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@
55
# any change to the chart should go through devops
66
/charts/gitops-runtime/templates @codefresh-io/DevOps
77
/charts/gitops-runtime/tests @codefresh-io/DevOps
8+
9+
# gitops operator crd changes can be approved by some other people
10+
/charts/gitops-runtime/templates/_components/gitops-operator/crds @codefresh-io/DevOps @dmaizel @eti-codefresh @chen-keinan @scme0

‎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/templates/_components/gitops-operator/crds/promotiontasks.yaml‎

Lines changed: 54 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ spec:
420420
- Failed
421421
- Terminated
422422
- Suspended
423+
- Skipped
423424
type: string
424425
steps:
425426
items:
@@ -477,6 +478,7 @@ spec:
477478
- Failed
478479
- Terminated
479480
- Suspended
481+
- Skipped
480482
type: string
481483
promoteAppWithCommit:
482484
properties:
@@ -487,6 +489,8 @@ spec:
487489
type: string
488490
healthMessage:
489491
type: string
492+
revision:
493+
type: string
490494
sync:
491495
description: SyncStatusCode is a type which represents
492496
possible comparison results
@@ -500,11 +504,29 @@ spec:
500504
- healthMessage
501505
- sync
502506
type: object
503-
commitSha:
504-
maxLength: 40
505-
minLength: 7
506-
pattern: (^[A-Fa-f0-9]+$|^<any-commit>$)
507-
type: string
507+
commitInfo:
508+
properties:
509+
commitAuthorId:
510+
properties:
511+
email:
512+
type: string
513+
username:
514+
type: string
515+
required:
516+
- email
517+
- username
518+
type: object
519+
commitDate:
520+
format: date-time
521+
type: string
522+
commitMessage:
523+
type: string
524+
commitSha:
525+
maxLength: 40
526+
minLength: 7
527+
pattern: (^[A-Fa-f0-9]+$|^<no-changes>$)
528+
type: string
529+
type: object
508530
phase:
509531
description: PromoteAppWithCommitPhase
510532
enum:
@@ -525,6 +547,8 @@ spec:
525547
type: string
526548
healthMessage:
527549
type: string
550+
revision:
551+
type: string
528552
sync:
529553
description: SyncStatusCode is a type which represents
530554
possible comparison results
@@ -538,6 +562,29 @@ spec:
538562
- healthMessage
539563
- sync
540564
type: object
565+
commitInfo:
566+
properties:
567+
commitAuthorId:
568+
properties:
569+
email:
570+
type: string
571+
username:
572+
type: string
573+
required:
574+
- email
575+
- username
576+
type: object
577+
commitDate:
578+
format: date-time
579+
type: string
580+
commitMessage:
581+
type: string
582+
commitSha:
583+
maxLength: 40
584+
minLength: 7
585+
pattern: (^[A-Fa-f0-9]+$|^<no-changes>$)
586+
type: string
587+
type: object
541588
phase:
542589
description: PromoteAppWithPRPhase
543590
enum:
@@ -613,6 +660,8 @@ spec:
613660
type: string
614661
healthMessage:
615662
type: string
663+
revision:
664+
type: string
616665
sync:
617666
description: SyncStatusCode is a type which represents
618667
possible comparison results

‎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: 30 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ global:
4949
cluster: https://kubernetes.default.svc
5050
# -- Defines whether this is a Codefresh hosted runtime. Should not be changed.
5151
codefreshHosted: false
52+
# -- Defines if runtime is namespace scoped. Required for running multiple runtimes in the same cluster
53+
singleNamespace: false
5254
# -- Ingress settings
5355
ingress:
5456
# -- if set to true, the pre-install hook will validate the existance of appropriate values, but *will not* attempt to make a web request to the ingress host
@@ -141,7 +143,7 @@ global:
141143
image:
142144
registry: quay.io
143145
repository: codefresh/cf-argocd-extras
144-
tag: 695977c
146+
tag: d4fefcb
145147
nodeSelector: {}
146148
tolerations: []
147149
affinity: {}
@@ -225,58 +227,41 @@ sealed-secrets:
225227
#-----------------------------------------------------------------------------------------------------------------------
226228
argo-cd:
227229
enabled: true
228-
fullnameOverride: argocd
229-
server:
230-
name: server
231-
repoServer:
232-
name: repo-server
233-
service:
234-
port: 8081
235-
crds:
236-
install: true
230+
fullnameOverride: argo-cd
231+
232+
notifications:
233+
enabled: false
234+
235+
redis:
236+
## Redis image
237+
image:
238+
# -- Redis repository
239+
repository: ecr-public.aws.com/docker/library/redis
240+
# -- Redis tag
241+
tag: 8.2.2-alpine
242+
243+
redis-ha:
244+
## Redis-ha image
245+
image:
246+
# -- Redis repository
247+
repository: ecr-public.aws.com/docker/library/redis
248+
# -- Redis tag
249+
tag: 8.2.2-alpine
250+
237251
configs:
238252
cm:
239253
timeout.reconciliation: 20s
240254
accounts.admin: apiKey,login
241255
application.resourceTrackingMethod: annotation+label
242-
resource.customizations.actions.argoproj.io_Rollout: |
243-
mergeBuiltinActions: true
244-
discovery.lua: |
245-
actions = {}
246-
local fullyPromoted = obj.status.currentPodHash == obj.status.stableRS
247-
actions["pause"] = {["disabled"] = fullyPromoted or obj.spec.paused == true}
248-
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)}
249-
return actions
250-
definitions:
251-
- name: pause
252-
action.lua: |
253-
obj.spec.paused = true
254-
return obj
255-
- name: skip-current-step
256-
action.lua: |
257-
if obj.status ~= nil then
258-
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
259-
if obj.status.pauseConditions ~= nil and table.getn(obj.status.pauseConditions) > 0 then
260-
obj.status.pauseConditions = nil
261-
end
262-
obj.status.currentStepIndex = obj.status.currentStepIndex + 1
263-
end
264-
end
265-
return obj
256+
application.instanceLabelKey: ""
266257
params:
267258
server.insecure: true
268259
application.namespaces: 'cf-*'
269-
server.rootpath: ''
270-
applicationVersioning:
271-
# -- Enable application versioning
272-
enabled: true
273-
# -- Extract application version based on ApplicationConfiguration CRD
274-
useApplicationConfiguration: true
275260
#-----------------------------------------------------------------------------------------------------------------------
276261
# Argo Events
277262
#-----------------------------------------------------------------------------------------------------------------------
278263
argo-events:
279-
enabled: false
264+
enabled: true
280265
fullnameOverride: argo-events
281266
crds:
282267
install: false
@@ -472,14 +457,14 @@ app-proxy:
472457
tag: 1.1.17-main
473458
image:
474459
repository: quay.io/codefresh/cap-app-proxy
475-
tag: 1.3820.0
460+
tag: 1.3883.0
476461
pullPolicy: IfNotPresent
477462
# -- Extra volume mounts for main container
478463
extraVolumeMounts: []
479464
initContainer:
480465
image:
481466
repository: quay.io/codefresh/cap-app-proxy-init
482-
tag: 1.3820.0
467+
tag: 1.3883.0
483468
pullPolicy: IfNotPresent
484469
command:
485470
- ./init.sh
@@ -636,7 +621,7 @@ gitops-operator:
636621
# -- defaults
637622
registry: quay.io
638623
repository: codefresh/codefresh-gitops-operator
639-
tag: "6881890"
624+
tag: "293f24f"
640625
env:
641626
GITOPS_OPERATOR_VERSION: 0.11.1
642627
serviceAccount:
@@ -666,7 +651,7 @@ argo-gateway:
666651
image:
667652
registry: quay.io
668653
repository: codefresh/cf-argocd-extras
669-
tag: 695977c
654+
tag: d4fefcb
670655
nodeSelector: {}
671656
tolerations: []
672657
affinity: {}

‎installer-image/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ RUN go install github.com/davidrjonas/semver-cli@latest \
44
&& cp $GOPATH/bin/semver-cli /usr/local/bin/
55

66
#bookworm-slim
7-
FROM debian:12.11-slim
7+
FROM debian:13-slim
88

99
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
1010

11-
ARG CF_CLI_VERSION=v0.2.12
11+
ARG CF_CLI_VERSION=v0.2.14
1212
ARG TARGETARCH
1313

1414
RUN apt-get update && apt-get install curl jq -y
@@ -17,6 +17,6 @@ COPY --from=go-build /usr/local/bin/semver-cli /usr/local/bin/semver-cli
1717

1818
COPY --from=bitnamilegacy/kubectl:1.33.4 /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
1919

20-
RUN adduser --shell /bin/bash codefresh
20+
RUN useradd -m -s /bin/bash codefresh
2121
USER codefresh
2222
WORKDIR /home/codefresh

0 commit comments

Comments
 (0)