feat(ksm): ksmurl from global

charts/argus/Chart.yaml

@@ -6,7 +6,7 @@ maintainers:
   - email: [email protected]
     name: LogicMonitor
 name: argus
-version: 11.1.0-rc03
+version: 11.1.0-rc04
 home: https://logicmonitor.github.io/helm-charts-qa
 appVersion: v15.1.0-rc03
 dependencies:

charts/argus/templates/_argus_config.tpl

@@ -76,5 +76,5 @@ proxy:
 proxy:
   url: {{ .Values.global.proxy.url }}
 {{- end }}
-ksmUrl: {{ include "ksm-url" . }}
+ksmUrl: {{ include "ksm-url" . | quote }}
 {{- end -}}

charts/argus/templates/_helpers.tpl

@@ -119,18 +119,28 @@ Collector Pod security context
 
 {{- define "ksm-url" -}}
 {{- $url := "" }}
-{{- $ksm := index .Values "kube-state-metrics" }}
+{{- $ksm := index .Values.global "kube-state-metrics" }}
 {{- if not (empty .Values.ksmUrl) }}
 {{- $url = .Values.ksmUrl }}
 {{- else if $ksm.enabled }}
-{{- $port := "" }}
-    {{- range $p := .Release.Service.spec.ports }}
+{{- $port := 8080 }}
+{{- $url = printf "http://%s-kube-state-metrics.%s.svc.cluster.local:%d/metrics" .Release.Name .Release.Namespace $port }}
+{{- else }}
+{{- $nsservices := (lookup "v1" "Service" .Release.Namespace "") | default dict }}
+{{- $nsfilteredServices := dict "items" (list) }}
+{{- range $service := $nsservices.items }}
+  {{- if eq (index $service.metadata.labels "app.kubernetes.io/name" | default "") "kube-state-metrics" }}
+    {{- $_ := set $nsfilteredServices "items" (append $nsfilteredServices.items $service) }}
+    {{- $port := "" }}
+    {{- range $p := $service.spec.ports }}
       {{- if or (eq $p.name "http") (eq $p.name "http-metrics") }}
         {{- $port = $p.port }}
       {{- end }}
     {{- end }}
-{{- $url = printf "http://%s-kube-state-metrics.%s.svc.cluster.local:%d/metrics" .Release.metadata.name .Release.Namespace $port }}
-{{- else }}
+    {{- $url = printf "http://%s.%s.svc.cluster.local:%d/metrics" $service.metadata.name $service.metadata.namespace $port }}
+  {{- end }}
+{{- end }}
+{{- if (empty $url)}}
 {{- $services := (lookup "v1" "Service" "" "") | default dict }}
 {{- $filteredServices := dict "items" (list) }}
 {{- range $service := $services.items }}
@@ -146,6 +156,7 @@ Collector Pod security context
   {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}
 {{- $url }}
 {{- end }}
 

charts/argus/values.schema.json

@@ -2335,6 +2335,14 @@
           "default": "",
           "description" : "The Logicmonitor account domain"
         },
+        "kube-state-metrics": {
+          "$id": "#/properties/global/properties/kube-state-metrics",
+          "type": "object",
+          "title": "Kube state metrics config",
+          "description": "Kube state metrics.",
+          "additionalItems": true,
+          "additionalProperties": true
+        },
         "imagePullSecrets": {
           "description": "ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the images used by this PodSpec. If specified, these secrets will be passed to individual puller implementations for them to use. For example, in the case of docker, only DockerConfig type secrets are honored. More info: https://kubernetes.io/docs/concepts/containers/images#specifying-imagepullsecrets-on-a-pod",
           "examples": [