refactor cf-argocd-extras

mikhail-klimko · mikhail-klimko · commit c697fb2a24c5 · 2025-09-22T11:32:38.000+03:00
diff --git a/charts/gitops-runtime/templates/event-reporters/resources-reporter/configmap.yaml b/charts/gitops-runtime/templates/event-reporters/resources-reporter/configmap.yaml
@@ -9,8 +9,9 @@ threadiness: '100'
 {{- end }}
 
 {{- $defaultConfig := (include "resources-reporter.resources.configmap.defaults" . | fromYaml ) }}
-{{- $overrides := index .Values "event-reporters" "resources-reporter" "config" | default dict }}
-{{- $mergedConfig := mergeOverwrite $defaultConfig $overrides }}
+{{- $globalOverrides := index .Values "global" "event-reporters" "config" | default dict }}
+{{- $reporterOverrides := index .Values "event-reporters" "resources-reporter" "config" | default dict }}
+{{- $mergedConfig := mergeOverwrite $defaultConfig $globalOverrides $reporterOverrides }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/charts/gitops-runtime/templates/event-reporters/resources-reporter/deployment.yaml b/charts/gitops-runtime/templates/event-reporters/resources-reporter/deployment.yaml
@@ -1,7 +1,10 @@
 {{- $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
 {{- $context := deepCopy . }}
-{{- $_ := set $context "Values" (deepCopy (get (index .Values "event-reporters") "resources-reporter")) }}
+{{- $_ := set $context "Values" (deepCopy (get (index .Values "global") "event-reporters")) }}
 {{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }}
+{{/* Merge .Values.event-reporters.<event-reporter-name> with .Values.global.event-reporters */}}
+{{- $valuesOverrides := index .Values "event-reporters" "resources-reporter" }}
+{{- $_ := mergeOverwrite $context.Values $valuesOverrides | set $context "Values" }}
 {{/* Merge environment variables from calculated, defaults and overwrites */}}
 {{- $defaults := (include "resources-reporter.resources.environment-variables.defaults" . | fromYaml) }}
 {{- $calculated := (include "resources-reporter.resources.environment-variables.calculated" . | fromYaml) }}
diff --git a/charts/gitops-runtime/templates/event-reporters/resources-reporter/pdb.yaml b/charts/gitops-runtime/templates/event-reporters/resources-reporter/pdb.yaml
@@ -1,6 +1,8 @@
 {{- $context := deepCopy . }}
-{{- $_ := set $context "Values" (deepCopy (get (index .Values "event-reporters") "resources-reporter")) }}
+{{- $_ := set $context "Values" (deepCopy (get (index .Values "global") "event-reporters")) }}
 {{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }}
+{{- $valuesOverrides := index .Values "event-reporters" "resources-reporter" }}
+{{- $_ := mergeOverwrite $context.Values $valuesOverrides | set $context "Values" }}
 
 {{- if and $context.Values.pdb.enabled }}
 apiVersion: policy/v1
diff --git a/charts/gitops-runtime/templates/event-reporters/resources-reporter/rbac.yaml b/charts/gitops-runtime/templates/event-reporters/resources-reporter/rbac.yaml
@@ -1,6 +1,8 @@
 {{- $context := deepCopy . }}
-{{- $_ := set $context "Values" (deepCopy (get (index .Values "event-reporters") "resources-reporter")) }}
+{{- $_ := set $context "Values" (deepCopy (get (index .Values "global") "event-reporters")) }}
 {{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }}
+{{- $valuesOverrides := index .Values "event-reporters" "resources-reporter" }}
+{{- $_ := mergeOverwrite $context.Values $valuesOverrides | set $context "Values" }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
diff --git a/charts/gitops-runtime/templates/event-reporters/resources-reporter/service.yaml b/charts/gitops-runtime/templates/event-reporters/resources-reporter/service.yaml
@@ -1,6 +1,8 @@
 {{- $context := deepCopy . }}
-{{- $_ := set $context "Values" (deepCopy (get (index .Values "event-reporters") "resources-reporter")) }}
+{{- $_ := set $context "Values" (deepCopy (get (index .Values "global") "event-reporters")) }}
 {{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }}
+{{- $valuesOverrides := index .Values "event-reporters" "resources-reporter" }}
+{{- $_ := mergeOverwrite $context.Values $valuesOverrides | set $context "Values" }}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/charts/gitops-runtime/templates/event-reporters/runtime-reporter/configmap.yaml b/charts/gitops-runtime/templates/event-reporters/runtime-reporter/configmap.yaml
@@ -9,8 +9,9 @@ threadiness: '100'
 {{- end }}
 
 {{- $defaultConfig := (include "runtime-reporter.resources.configmap.defaults" . | fromYaml ) }}
-{{- $overrides := index .Values "event-reporters" "runtime-reporter" "config" | default dict }}
-{{- $mergedConfig := mergeOverwrite $defaultConfig $overrides }}
+{{- $globalOverrides := index .Values "global" "event-reporters" "config" | default dict }}
+{{- $reporterOverrides := index .Values "event-reporters" "runtime-reporter" "config" | default dict }}
+{{- $mergedConfig := mergeOverwrite $defaultConfig $globalOverrides $reporterOverrides }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/charts/gitops-runtime/templates/event-reporters/runtime-reporter/deployment.yaml b/charts/gitops-runtime/templates/event-reporters/runtime-reporter/deployment.yaml
@@ -1,7 +1,10 @@
 {{- $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
 {{- $context := deepCopy . }}
-{{- $_ := set $context "Values" (deepCopy (get (index .Values "event-reporters") "runtime-reporter")) }}
+{{- $_ := set $context "Values" (deepCopy (get (index .Values "global") "event-reporters")) }}
 {{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }}
+{{/* Merge .Values.event-reporters.<event-reporter-name> with .Values.global.event-reporters */}}
+{{- $valuesOverrides := index .Values "event-reporters" "runtime-reporter" }}
+{{- $_ := mergeOverwrite $context.Values $valuesOverrides | set $context "Values" }}
 {{/* Merge environment variables from calculated, defaults and overwrites */}}
 {{- $defaults := (include "runtime-reporter.resources.environment-variables.defaults" . | fromYaml) }}
 {{- $calculated := (include "runtime-reporter.resources.environment-variables.calculated" . | fromYaml) }}
diff --git a/charts/gitops-runtime/templates/event-reporters/runtime-reporter/pdb.yaml b/charts/gitops-runtime/templates/event-reporters/runtime-reporter/pdb.yaml
@@ -1,6 +1,8 @@
 {{- $context := deepCopy . }}
-{{- $_ := set $context "Values" (deepCopy (get (index .Values "event-reporters") "runtime-reporter")) }}
+{{- $_ := set $context "Values" (deepCopy (get (index .Values "global") "event-reporters")) }}
 {{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }}
+{{- $valuesOverrides := index .Values "event-reporters" "runtime-reporter" }}
+{{- $_ := mergeOverwrite $context.Values $valuesOverrides | set $context "Values" }}
 
 {{- if and $context.Values.pdb.enabled }}
 apiVersion: policy/v1
diff --git a/charts/gitops-runtime/templates/event-reporters/runtime-reporter/rbac.yaml b/charts/gitops-runtime/templates/event-reporters/runtime-reporter/rbac.yaml
@@ -1,6 +1,8 @@
 {{- $context := deepCopy . }}
-{{- $_ := set $context "Values" (deepCopy (get (index .Values "event-reporters") "runtime-reporter")) }}
+{{- $_ := set $context "Values" (deepCopy (get (index .Values "global") "event-reporters")) }}
 {{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }}
+{{- $valuesOverrides := index .Values "event-reporters" "runtime-reporter" }}
+{{- $_ := mergeOverwrite $context.Values $valuesOverrides | set $context "Values" }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
diff --git a/charts/gitops-runtime/templates/event-reporters/runtime-reporter/service.yaml b/charts/gitops-runtime/templates/event-reporters/runtime-reporter/service.yaml
@@ -1,6 +1,8 @@
 {{- $context := deepCopy . }}
-{{- $_ := set $context "Values" (deepCopy (get (index .Values "event-reporters") "runtime-reporter")) }}
+{{- $_ := set $context "Values" (deepCopy (get (index .Values "global") "event-reporters")) }}
 {{- $_ := set $context.Values "global" (deepCopy (get .Values "global")) }}
+{{- $valuesOverrides := index .Values "event-reporters" "runtime-reporter" }}
+{{- $_ := mergeOverwrite $context.Values $valuesOverrides | set $context "Values" }}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml
@@ -195,6 +195,48 @@ global:
   # -- global NO_PROXY for all components
   noProxy: ''
   imageRegistry: ""
+
+  event-reporters:
+    image:
+      registry: quay.io
+      repository: codefresh/dev/cf-argocd-extras
+      tag: cr-30629-resource-reporter-workqueu-2-66d7459
+    nodeSelector: {}
+    tolerations: []
+    affinity: {}
+    resources:
+      requests:
+        memory: "128Mi"
+        cpu: "100m"
+    pdb:
+      enabled: true
+      minAvailable: "50%"
+      maxUnavailable: ""
+    service:
+      type: ClusterIP
+      ports:
+        http:
+          port: 8088
+          targetPort: 8088
+        metrics:
+          port: 8087
+          targetPort: 8087
+    serviceAccount:
+      create: true
+    readinessProbe:
+      failureThreshold: 3
+      initialDelaySeconds: 10
+      periodSeconds: 10
+      successThreshold: 1
+      timeoutSeconds: 10
+    livenessProbe:
+      failureThreshold: 3
+      initialDelaySeconds: 10
+      periodSeconds: 10
+      successThreshold: 1
+      timeoutSeconds: 10
+    config: {}
+
 # -------------------------------------------------------------------------------------------------------------------------
 # Installer
 # -------------------------------------------------------------------------------------------------------------------------
@@ -703,6 +745,10 @@ argo-api-gateway:
     timeoutSeconds: 10
 
 event-reporters:
+  # runtime-reporter: {}
+  resources-reporter: {}
+
+# event-reporters:
   runtime-reporter:
     image:
       registry: quay.io
@@ -743,42 +789,42 @@ event-reporters:
       successThreshold: 1
       timeoutSeconds: 10
 
-  resources-reporter:
-    image:
-      registry: quay.io
-      repository: codefresh/dev/cf-argocd-extras
-      tag: cr-30629-resource-reporter-workqueu-2-66d7459
-    nodeSelector: {}
-    tolerations: []
-    affinity: {}
-    resources:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-    pdb:
-      enabled: true
-      minAvailable: "50%"
-      maxUnavailable: ""
-    service:
-      type: ClusterIP
-      ports:
-        http:
-          port: 8088
-          targetPort: 8088
-        metrics:
-          port: 8087
-          targetPort: 8087
-    serviceAccount:
-      create: true
-    readinessProbe:
-      failureThreshold: 3
-      initialDelaySeconds: 10
-      periodSeconds: 10
-      successThreshold: 1
-      timeoutSeconds: 10
-    livenessProbe:
-      failureThreshold: 3
-      initialDelaySeconds: 10
-      periodSeconds: 10
-      successThreshold: 1
-      timeoutSeconds: 10
+#   resources-reporter:
+#     image:
+#       registry: quay.io
+#       repository: codefresh/dev/cf-argocd-extras
+#       tag: cr-30629-resource-reporter-workqueu-2-66d7459
+#     nodeSelector: {}
+#     tolerations: []
+#     affinity: {}
+#     resources:
+#       requests:
+#         memory: "128Mi"
+#         cpu: "100m"
+#     pdb:
+#       enabled: true
+#       minAvailable: "50%"
+#       maxUnavailable: ""
+#     service:
+#       type: ClusterIP
+#       ports:
+#         http:
+#           port: 8088
+#           targetPort: 8088
+#         metrics:
+#           port: 8087
+#           targetPort: 8087
+#     serviceAccount:
+#       create: true
+#     readinessProbe:
+#       failureThreshold: 3
+#       initialDelaySeconds: 10
+#       periodSeconds: 10
+#       successThreshold: 1
+#       timeoutSeconds: 10
+#     livenessProbe:
+#       failureThreshold: 3
+#       initialDelaySeconds: 10
+#       periodSeconds: 10
+#       successThreshold: 1
+#       timeoutSeconds: 10
