Merge branch 'main' into feat/workflows-codefresh-saas-s3

# Conflicts:
#	charts/gitops-runtime/README.md

Author: scme0

.gitignore

@@ -7,12 +7,11 @@ output
 **/charts/**/charts
 **/charts/**/Chart.lock
 
-# only ignore the values.yaml file at the root of the repo
-/values.yaml
+# only ignore any values*.yaml file at the root of the repo
+/values*.yaml
 .devcontainer
 
 # ignore local dev
 values-dev.yaml
 dry-run.yaml
-values-test.yaml
 .debug

charts/gitops-runtime/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.1.69-0
+appVersion: 0.1.71
 description: A Helm chart for Codefresh gitops runtime
 name: gitops-runtime
 version: 0.0.0
@@ -17,31 +17,31 @@ dependencies:
 - name: argo-cd
   repository: https://codefresh-io.github.io/argo-helm
   condition: argo-cd.enabled
-  version: 7.7.14-5-cap-2.13.3-2025.3.5-50344f005
+  version: 7.8.23-3-cap-v2.14.9-2025-04-23-4de04dd8
 - name: argo-events
   repository: https://codefresh-io.github.io/argo-helm
-  version: 2.4.7-1-cap-CR-26731
+  version: 2.4.7-2-cap-CR-28072
 - name: argo-workflows
   repository: https://codefresh-io.github.io/argo-helm
-  version: 0.45.2-v3.6.4-cap-CR-27392
+  version: 0.45.4-v3.6.4-cap-CR-27392
   condition: argo-workflows.enabled
 - name: argo-rollouts
   repository: https://codefresh-io.github.io/argo-helm
-  version: 2.37.3-2-v1.7.2-cap-CR-26082
+  version: 2.37.3-4-v1.7.2-cap-CR-28008
   condition: argo-rollouts.enabled
 - name: sealed-secrets
   repository: https://bitnami-labs.github.io/sealed-secrets/
-  version: 2.17.0
+  version: 2.17.2
 - name: codefresh-tunnel-client
   repository: oci://quay.io/codefresh/charts
-  version: 0.1.19
+  version: 0.1.21
   alias: tunnel-client
   condition: tunnel-client.enabled
 - name: codefresh-gitops-operator
   repository: oci://quay.io/codefresh/charts
-  version: 0.5.1
+  version: 0.7.1
   alias: gitops-operator
   condition: gitops-operator.enabled
 - name: cf-argocd-extras
   repository: oci://quay.io/codefresh/charts
-  version: 0.3.13
+  version: 0.3.21

charts/gitops-runtime/README.md

@@ -94,6 +94,25 @@ argo-cd:
   enabled: false
 ```
 
+## Installation with External Argo Rollouts
+
+If you want to use an existing Argo Rollouts installation, you can disable the built-in Argo Rollouts and configure the GitOps Runtime to use the external Argo Rollouts.
+See the `values.yaml` example below:
+
+```yaml
+global:
+  # -- Configuration for external Argo Rollouts
+  external-argo-rollouts:
+    # -- Rollout reporter settings
+    rollout-reporter:
+      # -- Enable rollout reporter
+      # Configuration is defined at .Values.event-reporters.rollout
+      enabled: true
+
+argo-rollouts:
+  # -- Disable built-in Argo Rollouts
+  enabled: false
+```
 
 ## Using with private registries - Helper utility
 The GitOps Runtime comprises multiple subcharts and container images. Subcharts also vary in values structure, making it difficult to override image specific values to use private registries.
@@ -117,6 +136,13 @@ The utility will output 4 files into the folder:
 3. `values-images-no-tags.yaml` - a values file with all image values with the private registry **excluding tags**. If provided through --values to helm install/upgrade command - it will override all images to use the private registry.
 4. `values-images-with-tags.yaml` - The same as 3 but with tags **included**.
 
+
+For usage with external ArgoCD run the utility with `EXTERNAL_ARGOCD` environment variable set to `true`.
+```
+docker run -e EXTERNAL_ARGOCD=true  -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:{{ template "chart.version" . }} <local_registry>
+```
+
+
 ## Openshift
 
 ```yaml

charts/gitops-runtime/README.md.gotmpl

@@ -0,0 +1,34 @@
+# Values file used to render all image values
+global:
+  codefresh:
+    accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
+    gitIntegration:
+      provider:
+        name: 'GITHUB'
+        apiUrl: 'https://api.github.com'
+    userToken:
+      secretKeyRef:
+        name: mysecret
+        key: myvalue
+        optional: true
+
+  runtime:
+    name: default
+
+    ingress:
+      enabled: false
+
+    repoCredentialsTemplate:
+      url: 'https://github.com'
+      username: 'username'
+      password: 'dummy'
+
+argo-rollouts:
+  dashboard:
+    enabled: true
+
+argo-cd:
+  enabled: false
+
+garage-workflows-artifact-storage:
+  enabled: true

charts/gitops-runtime/ci/values-external-argocd.yaml

@@ -1,2 +1,2 @@
 GitOps Runtime {{ .Values.global.runtime.name }} has been successfully installed in your cluster! 
-To complete the setup, please finalize the process in the platform here: https://g.codefresh.io/2.0/account-settings/runtimes/{{ .Values.global.runtime.name }}/runtime-components
+To complete the setup, please finalize the process in the platform here: {{ .Values.global.codefresh.url }}/2.0/account-settings/runtimes/info/list?activeAccountId={{ .Values.global.codefresh.accountId }}&drawer=install-runtime-wizard&mode={{- if index .Values "argo-cd" "enabled" }}new{{- else }}byoa{{- end }}&runtimeName={{ .Values.global.runtime.name }}&waitEvents=true

charts/gitops-runtime/templates/NOTES.txt

@@ -84,15 +84,15 @@ spec:
         - mountPath: /app/config/all
           name: all-certs
           readOnly: true
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.nodeSelector | default .Values.global.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.affinity }}
       affinity:
         {{- toYaml . | nindent 8}}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.tolerations | default .Values.global.tolerations}}
       tolerations:
         {{- toYaml . | nindent 6 }}
       {{- end }}

charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml

@@ -48,15 +48,15 @@ spec:
       {{- end }}
     serviceAccountName: {{ include "event-reporters.rollout-reporter.serviceAccountName" .}}
     tolerations:
-    {{- with .Values.rollout.eventSource.tolerations }}
+    {{- with .Values.rollout.eventSource.tolerations | default .Values.global.tolerations }}
       {{- . | toYaml | nindent 6 }}
     {{- end }}
     nodeSelector:
-    {{- with .Values.rollout.eventSource.nodeSelector }}
+    {{- with .Values.rollout.eventSource.nodeSelector | default .Values.global.nodeSelector }}
       {{- . | toYaml | nindent 6 }}
     {{- end }}
     affinity:
-    {{- with .Values.rollout.eventSource.affinity }}
+    {{- with .Values.affinity }}
       {{- . | toYaml | nindent 6 }}
     {{- end }}
-{{- end }}
+{{- end }}

charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_event-source.yaml

@@ -28,15 +28,15 @@ spec:
         {{- . | toYaml | nindent 8 }}
       {{- end }}
     tolerations:
-    {{- with .Values.rollout.sensor.tolerations }}
+    {{- with .Values.rollout.sensor.tolerations | default .Values.global.tolerations }}
       {{- . | toYaml | nindent 6 }}
     {{- end }}
     nodeSelector:
-    {{- with .Values.rollout.sensor.nodeSelector }}
+    {{- with .Values.rollout.sensor.nodeSelector | default .Values.global.nodeSelector}}
       {{- . | toYaml | nindent 6 }}
     {{- end }}
     affinity:
-    {{- with .Values.rollout.sensor.affinity }}
+    {{- with .Values.affinity }}
       {{- . | toYaml | nindent 6 }}
     {{- end }}
   triggers:

charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_sensor.yaml

@@ -29,15 +29,15 @@ spec:
       {{- end }}
     serviceAccountName: {{ include "event-reporters.workflow-reporter.serviceAccountName" .}}
     tolerations:
-    {{- with .Values.workflow.eventSource.tolerations }}
+    {{- with .Values.workflow.eventSource.tolerations | default .Values.global.tolerations }}
       {{- toYaml . | nindent 6 }}
     {{- end }}
     nodeSelector:
-    {{- with .Values.workflow.eventSource.nodeSelector }}
+    {{- with .Values.workflow.eventSource.nodeSelector | default .Values.global.nodeSelector }}
       {{- toYaml . | nindent 6 }}
     {{- end }}
     affinity:
-    {{- with .Values.workflow.eventSource.affinity }}
+    {{- with .Values.affinity }}
       {{- toYaml . | nindent 6 }}
     {{- end }}
-{{- end }}
+{{- end }}

charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_event-source.yaml

@@ -22,15 +22,15 @@ spec:
         {{- . | toYaml | nindent 8 }}
       {{- end }}
     tolerations:
-    {{- with .Values.workflow.sensor.tolerations }}
+    {{- with .Values.workflow.sensor.tolerations | default .Values.global.tolerations}}
       {{- . | toYaml | nindent 6 }}
     {{- end }}
     nodeSelector:
-    {{- with .Values.workflow.sensor.nodeSelector }}
+    {{- with .Values.workflow.sensor.nodeSelector | default .Values.global.nodeSelector }}
       {{- . | toYaml | nindent 6 }}
     {{- end }}
     affinity:
-    {{- with .Values.workflow.sensor.affinity }}
+    {{- with .Values.affinity }}
       {{- . | toYaml | nindent 6 }}
     {{- end }}
   triggers:

charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_sensor.yaml

@@ -70,16 +70,16 @@ spec:
               path: default.conf.template
       - name: log
         emptyDir: { }
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.nodeSelector | default .Values.global.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.tolerations | default .Values.global.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-{{- end }}
+{{- end }}