refactor cf-argocd-extras

Author: mikhail-klimko

charts/gitops-runtime/templates/event-reporters/resources-reporter/_env.yaml

@@ -109,6 +109,7 @@ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:
     configMapKeyRef:
       name: resources-reporter-cmd-params-cm
       key: otlp.address
+      optional: true
 REDISDB:
   valueFrom:
     configMapKeyRef:

charts/gitops-runtime/templates/event-reporters/resources-reporter/configmap.yaml

@@ -1,14 +1,15 @@
-{{- define "argo-api-gateway.resources.configmap.defaults"}}
+{{- define "resources-reporter.resources.configmap.defaults" }}
 argocd.server: {{ include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
 redis.server: {{ include "codefresh-gitops-runtime.argocd.redis.url" . }}
 repo.server: {{ include "codefresh-gitops-runtime.argocd.reposerver.url" . }}
+sources.server: http://argo-api-gateway
 app.queue.size: '1000'
 max.app.retries: '5'
 threadiness: '100'
 {{- end }}
 
-{{- $defaultConfig := (include "argo-api-gateway.resources.configmap.defaults" . | fromYaml ) }}
-{{- $overrides := index .Values "argo-api-gateway" "config" | default dict }}
+{{- $defaultConfig := (include "resources-reporter.resources.configmap.defaults" . | fromYaml ) }}
+{{- $overrides := index .Values "event-reporters" "resources-reporter" "config" | default dict }}
 {{- $mergedConfig := mergeOverwrite $defaultConfig $overrides }}
 apiVersion: v1
 kind: ConfigMap

charts/gitops-runtime/templates/event-reporters/runtime-reporter/_env.yaml

@@ -109,6 +109,7 @@ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:
     configMapKeyRef:
       name: runtime-reporter-cmd-params-cm
       key: otlp.address
+      optional: true
 REDISDB:
   valueFrom:
     configMapKeyRef:

charts/gitops-runtime/templates/event-reporters/runtime-reporter/configmap.yaml

@@ -1,14 +1,15 @@
-{{- define "argo-api-gateway.resources.configmap.defaults"}}
+{{- define "runtime-reporter.resources.configmap.defaults"}}
 argocd.server: {{ include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . }}
 redis.server: {{ include "codefresh-gitops-runtime.argocd.redis.url" . }}
 repo.server: {{ include "codefresh-gitops-runtime.argocd.reposerver.url" . }}
+sources.server: http://argo-api-gateway
 app.queue.size: '1000'
 max.app.retries: '5'
 threadiness: '100'
 {{- end }}
 
-{{- $defaultConfig := (include "argo-api-gateway.resources.configmap.defaults" . | fromYaml ) }}
-{{- $overrides := index .Values "argo-api-gateway" "config" | default dict }}
+{{- $defaultConfig := (include "runtime-reporter.resources.configmap.defaults" . | fromYaml ) }}
+{{- $overrides := index .Values "event-reporters" "runtime-reporter" "config" | default dict }}
 {{- $mergedConfig := mergeOverwrite $defaultConfig $overrides }}
 apiVersion: v1
 kind: ConfigMap

charts/gitops-runtime/values.yaml

@@ -17,9 +17,7 @@ global:
       # --  Custom CA certificates bundle for platform access with ssl
       caCerts:
         # -- Reference to existing secret
-        secretKeyRef:
-          name: ""
-          key: ""
+        secretKeyRef: {}
         # -- Chart managed secret for custom platform CA certificates
         secret:
           # -- Whether to create the secret.
@@ -196,6 +194,7 @@ global:
   httpsProxy: ''
   # -- global NO_PROXY for all components
   noProxy: ''
+  imageRegistry: ""
 # -------------------------------------------------------------------------------------------------------------------------
 # Installer
 # -------------------------------------------------------------------------------------------------------------------------