Merge branch 'main' of github.com:codefresh-io/gitops-runtime-helm into CR-test-queue

# Conflicts:
#	charts/gitops-runtime/values.yaml

Author: oleksandr-codefresh

.github/workflows/component-test.yaml

@@ -5,15 +5,13 @@ on:
   push:
     branches:
       - main
-    paths-ignore:
-      - "*.md"
-      - charts/**
+      - 'stable/*'
+      - 'monthly/*'
   pull_request:
     branches:
       - main
-    paths-ignore:
-      - "*.md"
-      - charts/**
+      - 'stable/*'
+      - 'monthly/*'
 
 jobs:
   component-test:
@@ -68,7 +66,7 @@ jobs:
           helm repo add gitea-charts https://dl.gitea.com/charts/
           helm repo add mockserver https://www.mock-server.com
 
-      
+
       - name: Run KUTTL tests
         run: |
-          cd tests/component-tests && ./../../bin/kuttl test --parallel 1 --start-kind=false --namespace e2e-test --config startup.yaml
+          cd tests/component-tests && ./../../bin/kuttl test --parallel 1 --start-kind=false --namespace e2e-test --config startup.yaml

charts/gitops-runtime/Chart.yaml

@@ -17,7 +17,7 @@ dependencies:
 - name: argo-cd
   repository: https://codefresh-io.github.io/argo-helm
   condition: argo-cd.enabled
-  version: 8.0.6-6-cap-v3.0.2-2025-07-06-e9fc72a9
+  version: 8.0.6-8-cap-v3.0.2-2025-09-07-cdf75df5
 - name: argo-events
   repository: https://codefresh-io.github.io/argo-helm
   version: 2.4.8-cap-CR-29689
@@ -34,7 +34,7 @@ dependencies:
   version: 2.17.2
 - name: codefresh-tunnel-client
   repository: oci://quay.io/codefresh/charts
-  version: 0.1.21
+  version: 0.1.22
   alias: tunnel-client
   condition: tunnel-client.enabled
 - name: cf-common

charts/gitops-runtime/README.md

@@ -193,6 +193,154 @@ sealed-secrets:
     enabled: false
 ```
 
+## High Availability
+
+This chart installs the non-HA version of GitOps Runtime by default. If you want to run GitOps Runtime in HA mode, you can use the example values below:
+
+> **Warning:**
+> You need at least 3 worker nodes for HA mode
+
+### HA mode with autoscaling
+
+```yaml
+global:
+  topologySpreadConstraints:
+    - maxSkew: 1
+      topologyKey: kubernetes.io/hostname
+      whenUnsatisfiable: DoNotSchedule
+
+app-proxy:
+  replicaCount: 2
+  pdb:
+    enabled: true
+    minAvailable: 1
+  topologySpreadConstraints:
+    - maxSkew: 1
+      topologyKey: kubernetes.io/hostname
+      whenUnsatisfiable: DoNotSchedule
+      labelSelector:
+        matchLabels:
+          app: cap-app-proxy
+
+gitops-operator:
+  replicaCount: 2
+  pdb:
+    enabled: true
+    minAvailable: 1
+  topologySpreadConstraints:
+    - maxSkew: 1
+      topologyKey: kubernetes.io/hostname
+      whenUnsatisfiable: DoNotSchedule
+      labelSelector:
+        matchLabels:
+          app: gitops-operator
+
+internal-router:
+  replicaCount: 2
+  pdb:
+    enabled: true
+    minAvailable: 1
+  topologySpreadConstraints:
+    - maxSkew: 1
+      topologyKey: kubernetes.io/hostname
+      whenUnsatisfiable: DoNotSchedule
+      labelSelector:
+        matchLabels:
+          app: internal-router
+
+cf-argocd-extras:
+  sourcesServer:
+    hpa:
+      enabled: true
+      minReplicas: 2
+    pdb:
+      enabled: true
+      minAvailable: 1
+    topologySpreadConstraints:
+      - maxSkew: 1
+        topologyKey: kubernetes.io/hostname
+        whenUnsatisfiable: DoNotSchedule
+        labelSelector:
+          matchLabels:
+            app.kubernetes.io/component: sources-server
+  eventReporter:
+    topologySpreadConstraints:
+      - maxSkew: 1
+        topologyKey: kubernetes.io/hostname
+        whenUnsatisfiable: DoNotSchedule
+        labelSelector:
+          matchLabels:
+            app.kubernetes.io/component: event-reporter
+
+argo-cd:
+  redis-ha:
+    enabled: true
+
+  controller:
+    replicas: 1
+
+  server:
+    autoscaling:
+      enabled: true
+      minReplicas: 2
+    pdb:
+      enabled: true
+      minAvailable: 1
+
+  repoServer:
+    autoscaling:
+      enabled: true
+      minReplicas: 2
+    pdb:
+      enabled: true
+      minAvailable: 1
+
+  applicationSet:
+    replicas: 2
+
+argo-workflows:
+  controller:
+    replicas: 2
+    pdb:
+      enabled: true
+      minAvailable: 1
+  server:
+    autoscaling:
+      enabled: true
+      minReplicas: 2
+    pdb:
+      enabled: true
+      minAvailable: 1
+
+event-reporters:
+  workflow:
+    sensor:
+      replicas: 2
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: sensor-name
+                    operator: In
+                    values:
+                      - workflow-reporter
+              topologyKey: "kubernetes.io/hostname"
+  rollout:
+    sensor:
+      replicas: 2
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: sensor-name
+                    operator: In
+                    values:
+                      - rollout-reporter
+              topologyKey: "kubernetes.io/hostname"
+```
+
 ## Upgrading
 
 ### To 0.23.x

charts/gitops-runtime/README.md.gotmpl

@@ -33,7 +33,7 @@ eventReporter:
   controller:
     enabled: true
     type: statefulset
-    replicas: 3
+    replicas: 1
     revisionHistoryLimit: 5
 
   container:
@@ -62,6 +62,11 @@ eventReporter:
       HTTP_PROXY: '{{ .Values.global.httpProxy }}'
       HTTPS_PROXY: '{{ .Values.global.httpsProxy }}'
       NO_PROXY: '{{ .Values.global.noProxy }}'
+      APP_QUEUE_SIZE:
+        valueFrom:
+          configMapKeyRef:
+            name: event-reporter-cmd-params-cm
+            key: app.queue.size
       ARGOCD_APPLICATION_NAMESPACES:
         valueFrom:
           configMapKeyRef:
@@ -99,7 +104,7 @@ eventReporter:
           configMapKeyRef:
             key: base-url
             name: codefresh-cm
-      EVENT_REPORTER_REPLICAS: 3
+      EVENT_REPORTER_REPLICAS: 1
       INSECURE:
         valueFrom:
           configMapKeyRef:
@@ -124,36 +129,22 @@ eventReporter:
             name: event-reporter-cmd-params-cm
             key: log.level
             optional: true
-      METRICS_LISTEN_ADDRESS:
-        valueFrom:
-          configMapKeyRef:
-            name: event-reporter-cmd-params-cm
-            key: metrics.listen.address
-            optional: true
-      RATE_LIMITER_BUCKET_SIZE:
-        valueFrom:
-          configMapKeyRef:
-            name: event-reporter-cmd-params-cm
-            key: rate.limiter.bucket.size
-            optional: true
-      RATE_LIMITER_DURATION:
+      MAX_APP_RETRIES:
         valueFrom:
           configMapKeyRef:
             name: event-reporter-cmd-params-cm
-            key: rate.limiter.duration
-            optional: true
-      RATE_LIMITER_ENABLED:
+            key: max.app.retries
+      METRICS_LISTEN_ADDRESS:
         valueFrom:
           configMapKeyRef:
             name: event-reporter-cmd-params-cm
-            key: rate.limiter.enabled
+            key: metrics.listen.address
             optional: true
-      RATE_LIMITER_LEARNING_MODE_ENABLED:
+      OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:
         valueFrom:
           configMapKeyRef:
             name: event-reporter-cmd-params-cm
-            key: rate.limiter.learning.mode.enabled
-            optional: true
+            key: otlp.address
       REDISDB:
         valueFrom:
           configMapKeyRef:
@@ -221,6 +212,11 @@ eventReporter:
           configMapKeyRef:
             name: event-reporter-cmd-params-cm
             key: sources.server
+      THREADINESS:
+        valueFrom:
+          configMapKeyRef:
+            name: event-reporter-cmd-params-cm
+            key: threadiness
 
     volumeMounts:
       codefresh-tls-certs:
@@ -258,9 +254,13 @@ eventReporter:
     cmd-params-cm:
       enabled: true
       data:
+        app.queue.size: '1000'
         argocd.server: argo-cd-server:80
+        max.app.retries: '5'
+        otlp.address: ''
         repo.server: argo-cd-repo-server:8081
         sources.server: http://sources-server
+        threadiness: '100'
 
   volumes:
     codefresh-tls-certs:

charts/gitops-runtime/templates/_components/cf-argocd-extras/_default-values.tpl

@@ -310,51 +310,6 @@ tests:
             mountPath: /app/config/codefresh-tls-certs
             readOnly: true
 
-  - it: Event Reporter checksum annotation should be changed when configmap is updated
-    template: cf-argocd-extras/event-reporter/statefulset.yaml
-    values:
-      - ./values/mandatory-values-ingress.yaml
-    set:
-      cf-argocd-extras.eventReporter.configMaps.cmd-params-cm.data.foo: bar
-    asserts:
-      - equal:
-          path: spec.template.metadata.annotations["checksum/config"]
-          value: "747ba21145c84900dd029f20a15e73096e090da7865b67b86601135d10d8cc18"
-
-
-  - it: Event Reporter checksum annotation should be changed when configmap is updated
-    template: cf-argocd-extras/event-reporter/statefulset.yaml
-    values:
-      - ./values/mandatory-values-ingress.yaml
-    set:
-      cf-argocd-extras.eventReporter.configMaps.cmd-params-cm.data.alice: bob
-    asserts:
-      - equal:
-          path: spec.template.metadata.annotations["checksum/config"]
-          value: "42a0e8eee09a1a411447be59e5b5a078d699560b4d93b62d388a1b622a463b18"
-
-  - it: Sources Server checksum annotation should be changed when configmap is updated
-    template: cf-argocd-extras/sources-server/deployment.yaml
-    values:
-      - ./values/mandatory-values-ingress.yaml
-    set:
-      cf-argocd-extras.sourcesServer.configMaps.cmd-params-cm.data.foo: bar
-    asserts:
-      - equal:
-          path: spec.template.metadata.annotations["checksum/config"]
-          value: "1aac0bdcb473209b67afca0d5ff7cb1d9b849748f82c76e53fd9a43c51456dc2"
-
-  - it: Sources Server checksum annotation should be changed when configmap is updated
-    template: cf-argocd-extras/sources-server/deployment.yaml
-    values:
-      - ./values/mandatory-values-ingress.yaml
-    set:
-      cf-argocd-extras.sourcesServer.configMaps.cmd-params-cm.data.alice: bob
-    asserts:
-      - equal:
-          path: spec.template.metadata.annotations["checksum/config"]
-          value: "cf799238e8fa77132860698833bfe00a6dce93ec57d994da59aa8be3909e61b5"
-
   - it: Sources Server with external redis
     template: cf-argocd-extras/sources-server/deployment.yaml
     values:

charts/gitops-runtime/tests/cf-argocd-extras_test.yaml

@@ -5,8 +5,7 @@ global:
       whenUnsatisfiable: DoNotSchedule
 
 app-proxy:
-  # -- Set to 1 until https://codefresh-io.atlassian.net/browse/CR-29338 is resolved
-  replicaCount: 1
+  replicaCount: 2
   pdb:
     enabled: true
     minAvailable: 1