refactor cf-argocd-extras

Author: mikhail-klimko

charts/gitops-runtime/templates/argo-api-gateway/serviceMonitor.yaml

@@ -15,7 +15,7 @@ spec:
   endpoints:
     - port: http
       {{- if $context.Values.serviceMonitor.interval }}
-      interval: {{ $context.Values.serviceMonitor.interval | default "30s" }}
+      interval: {{ $context.Values.serviceMonitor.interval }}
       {{- end }}
       {{- if $context.Values.serviceMonitor.scrapeTimeout }}
       scrapeTimeout: {{ $context.Values.serviceMonitor.scrapeTimeout }}

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

@@ -17,7 +17,7 @@ spec:
   endpoints:
     - port: metrics
       {{- if $context.Values.serviceMonitor.interval }}
-      interval: {{ $context.Values.serviceMonitor.interval | default "30s" }}
+      interval: {{ $context.Values.serviceMonitor.interval }}
       {{- end }}
       {{- if $context.Values.serviceMonitor.scrapeTimeout }}
       scrapeTimeout: {{ $context.Values.serviceMonitor.scrapeTimeout }}

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

@@ -17,7 +17,7 @@ spec:
   endpoints:
     - port: metrics
       {{- if $context.Values.serviceMonitor.interval }}
-      interval: {{ $context.Values.serviceMonitor.interval | default "30s" }}
+      interval: {{ $context.Values.serviceMonitor.interval }}
       {{- end }}
       {{- if $context.Values.serviceMonitor.scrapeTimeout }}
       scrapeTimeout: {{ $context.Values.serviceMonitor.scrapeTimeout }}

charts/gitops-runtime/values.yaml

@@ -238,6 +238,8 @@ global:
       timeoutSeconds: 10
     serviceMonitor:
       enabled: false
+      interval: 30s
+      scrapeTimeout: 10s
     config: {}
 
 # -------------------------------------------------------------------------------------------------------------------------
@@ -749,6 +751,8 @@ argo-api-gateway:
     timeoutSeconds: 10
   serviceMonitor:
     enabled: false
+    interval: 30s
+    scrapeTimeout: 10s
 
 event-reporters:
   runtime-reporter: {}