Merge branch 'main' of https://github.com/codefresh-io/gitops-runtime-helm into CR-31824-add-instrumentation

Author: masontikhonov

CODEOWNERS

@@ -5,3 +5,6 @@
 # any change to the chart should go through devops
 /charts/gitops-runtime/templates @codefresh-io/DevOps
 /charts/gitops-runtime/tests     @codefresh-io/DevOps
+
+# gitops operator crd changes can be approved by some other people
+/charts/gitops-runtime/templates/_components/gitops-operator/crds @codefresh-io/DevOps @dmaizel @eti-codefresh @chen-keinan @scme0

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

charts/gitops-runtime/templates/_components/gitops-operator/crds/promotiontasks.yaml

@@ -420,6 +420,7 @@ spec:
                 - Failed
                 - Terminated
                 - Suspended
+                - Skipped
                 type: string
               steps:
                 items:
@@ -477,6 +478,7 @@ spec:
                       - Failed
                       - Terminated
                       - Suspended
+                      - Skipped
                       type: string
                     promoteAppWithCommit:
                       properties:
@@ -522,7 +524,7 @@ spec:
                             commitSha:
                               maxLength: 40
                               minLength: 7
-                              pattern: (^[A-Fa-f0-9]+$|^<any-commit>$)
+                              pattern: (^[A-Fa-f0-9]+$|^<no-changes>$)
                               type: string
                           type: object
                         phase:
@@ -580,7 +582,7 @@ spec:
                             commitSha:
                               maxLength: 40
                               minLength: 7
-                              pattern: (^[A-Fa-f0-9]+$|^<any-commit>$)
+                              pattern: (^[A-Fa-f0-9]+$|^<no-changes>$)
                               type: string
                           type: object
                         phase:

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

charts/gitops-runtime/values.yaml

@@ -272,45 +272,35 @@ sealed-secrets:
 argo-cd:
   enabled: true
   fullnameOverride: argo-cd
-  crds:
-    install: true
+
+  notifications:
+    enabled: false
+
+  redis:
+    ## Redis image
+    image:
+      # -- Redis repository
+      repository: ecr-public.aws.com/docker/library/redis
+      # -- 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
       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
+      application.instanceLabelKey: ""
     params:
       server.insecure: true
       application.namespaces: 'cf-*'
-  applicationVersioning:
-    # -- Enable application versioning
-    enabled: true
-    # -- Extract application version based on ApplicationConfiguration CRD
-    useApplicationConfiguration: true
 #-----------------------------------------------------------------------------------------------------------------------
 # Argo Events
 #-----------------------------------------------------------------------------------------------------------------------
@@ -511,14 +501,14 @@ app-proxy:
           tag: 1.1.17-main
   image:
     repository: quay.io/codefresh/cap-app-proxy
-    tag: 1.3820.0
+    tag: 1.3883.0
     pullPolicy: IfNotPresent
   # -- Extra volume mounts for main container
   extraVolumeMounts: []
   initContainer:
     image:
       repository: quay.io/codefresh/cap-app-proxy-init
-      tag: 1.3820.0
+      tag: 1.3883.0
       pullPolicy: IfNotPresent
     command:
       - ./init.sh
@@ -698,7 +688,7 @@ gitops-operator:
     # -- defaults
     registry: quay.io
     repository: codefresh/codefresh-gitops-operator
-    tag: "2784cd5"
+    tag: "293f24f"
   env:
     <<:
       - *otel-config

installer-image/Dockerfile

@@ -4,11 +4,11 @@ RUN go install github.com/davidrjonas/semver-cli@latest \
   && cp $GOPATH/bin/semver-cli /usr/local/bin/
 
 #bookworm-slim
-FROM debian:12.11-slim
+FROM debian:13-slim
 
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
-ARG CF_CLI_VERSION=v0.2.12
+ARG CF_CLI_VERSION=v0.2.14
 ARG TARGETARCH
 
 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
 
 COPY --from=bitnamilegacy/kubectl:1.33.4 /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
 
-RUN adduser --shell /bin/bash codefresh
+RUN useradd -m -s /bin/bash codefresh
 USER codefresh
 WORKDIR /home/codefresh