refactor cf-argocd-extras

Author: mikhail-klimko

charts/gitops-runtime/templates/_helpers.tpl

@@ -434,8 +434,8 @@ Output comma separated list of installed runtime components
   {{- $sealedSecrets := dict "name" "sealed-secrets" "version" (get .Subcharts "sealed-secrets").Chart.AppVersion }}
   {{- $internalRouter := dict "name" "internal-router" "version" .Chart.AppVersion }}
   {{- $appProxy := dict "name" "app-proxy" "version" (index (get .Values "app-proxy") "image" "tag") }}
-  {{- $sourcesServer := dict "name" "sources-server" "version" (get .Values "cf-argocd-extras").sourcesServer.container.image.tag }}
-  {{- $comptList := list $argoEvents $appProxy $sealedSecrets $internalRouter $sourcesServer }}
+  {{- $argoApiGateway := dict "name" "argo-api-gateway" "version" (get .Values "argo-api-gateway").image.tag }}
+  {{- $comptList := list $argoEvents $appProxy $sealedSecrets $internalRouter $argoApiGateway }}
 {{- if and (index .Values "argo-cd" "enabled") }}
   {{- $argoCD := dict "name" "argocd" "version" (get .Subcharts "argo-cd").Chart.AppVersion }}
   {{- $comptList = append $comptList $argoCD }}
@@ -461,7 +461,7 @@ Output comma separated list of installed runtime components
     {{- $comptList = append $comptList $gitopsOperator }}
   {{- end }}
   {{- if not (index .Values "argo-cd" "enabled") }}
-    {{- $eventReporter := dict "name" "event-reporter" "version" (get .Values "cf-argocd-extras").eventReporter.container.image.tag }}
+    {{- $eventReporter := dict "name" "event-reporter" "version" (index (get .Values "event-reporters") "runtime-reporter" "image" "tag") }}
     {{- $comptList = append $comptList $eventReporter }}
   {{- end }}
 {{- $comptList | toYaml }}

charts/gitops-runtime/values.yaml

@@ -664,67 +664,12 @@ gitops-operator:
     enabled: false
     minAvailable: 1
     maxUnavailable: ""
-#-----------------------------------------------------------------------------------------------------------------------
-# cf-argocd-extras
-#-----------------------------------------------------------------------------------------------------------------------
-# -- Codefresh extra services for ArgoCD
-cf-argocd-extras:
-  eventReporter:
-    enabled: true
-    container:
-      image:
-        registry: quay.io
-        repository: codefresh/cf-argocd-extras
-        tag: c74d94c
-    nodeSelector: {}
-    tolerations: []
-    affinity: {}
-    resources:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-    pdb:
-      # -- Enable PDB for event-reporter
-      enabled: false
-      minAvailable: "50%"
-      maxUnavailable: ""
-    serviceMonitor:
-      main:
-        # -- Enable ServiceMonitor for event reporter
-        enabled: false
-  # -- Sources server configuration
-  sourcesServer:
-    enabled: true
-    container:
-      image:
-        registry: quay.io
-        repository: codefresh/cf-argocd-extras
-        tag: c74d94c
-    nodeSelector: {}
-    tolerations: []
-    affinity: {}
-    resources:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-    hpa:
-      # -- Enable HPA for sources server
-      enabled: false
-      minReplicas: 1
-      maxReplicas: 10
-      targetCPUUtilizationPercentage: 70
-    pdb:
-      # -- Enable PDB for sources server
-      enabled: false
-      minAvailable: "50%"
-      maxUnavailable: ""
-
 
 argo-api-gateway:
   image:
     registry: quay.io
-    repository: codefresh/cf-argocd-extras
-    tag: c74d94c
+    repository: codefresh/dev/cf-argocd-extras
+    tag: cr-30629-resource-reporter-workqueu-2-66d7459
   nodeSelector: {}
   tolerations: []
   affinity: {}
@@ -762,8 +707,8 @@ event-reporters:
   runtime-reporter:
     image:
       registry: quay.io
-      repository: codefresh/cf-argocd-extras
-      tag: c74d94c
+      repository: codefresh/dev/cf-argocd-extras
+      tag: cr-30629-resource-reporter-workqueu-2-66d7459
     nodeSelector: {}
     tolerations: []
     affinity: {}
@@ -802,8 +747,8 @@ event-reporters:
   resources-reporter:
     image:
       registry: quay.io
-      repository: codefresh/cf-argocd-extras
-      tag: c74d94c
+      repository: codefresh/dev/cf-argocd-extras
+      tag: cr-30629-resource-reporter-workqueu-2-66d7459
     nodeSelector: {}
     tolerations: []
     affinity: {}