Merge remote-tracking branch 'origin/main' into cr-31211-security-main

Author: vasil-cf

charts/gitops-runtime/Chart.yaml

@@ -21,6 +21,7 @@ dependencies:
 - name: argo-events
   repository: https://codefresh-io.github.io/argo-helm
   version: 2.4.9-cap-CR-30841
+  condition: argo-events.enabled
 - name: argo-workflows
   repository: https://codefresh-io.github.io/argo-helm
   version: 0.45.16-v3.6.7-cap-CR-30835
@@ -37,6 +38,3 @@ dependencies:
   version: 0.1.22
   alias: tunnel-client
   condition: tunnel-client.enabled
-- name: cf-common
-  repository: oci://quay.io/codefresh/charts
-  version: 0.27.0

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

@@ -1,5 +1,4 @@
 {{- define "cap-app-proxy.resources.deployment" }}
-{{- $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -89,7 +88,7 @@ spec:
           readOnly: true
       {{- if gt (int .Values.replicaCount) 1 }}
       - name: leader-elector
-        image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" (index .Values "leader-elector" "image") "context" .) }}
+        image: {{ include "codefresh-gitops-runtime.image.name" (dict "image" (index .Values "leader-elector" "image") "context" .) }}
         imagePullPolicy: {{ index .Values "leader-elector" "image" "pullPolicy" | default "IfNotPresent" }}
         command:
           - leader-elector
@@ -154,7 +153,7 @@ spec:
         {{- toYaml . | nindent 6 }}
       {{- end }}
       {{- with .Values.topologySpreadConstraints }}
-      topologySpreadConstraints: {{- include (printf "%s.tplrender" $cfCommonTplSemver ) (dict "Values" . "context" .) | nindent 8 }}
+      topologySpreadConstraints: {{- include "codefresh-gitops-runtime.tplrender" (dict "Values" . "context" .) | nindent 8 }}
       {{- end }}
       volumes:
       {{- with .Values.extraVolumes }}