Skip to content

Commit 5eaf9d6

Browse files
authored
fix metadata checks when looking for existing Prometheus & Grafana installations (#43)
1 parent f2e5031 commit 5eaf9d6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

helm/supersonic/templates/_common.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Check if service exists - takes service name as parameter
4747
{{- $exists := "" -}}
4848
{{- if (lookup "apps/v1" "Deployment" .root.Release.Namespace "") -}}
4949
{{- range (lookup "apps/v1" "Deployment" .root.Release.Namespace "").items -}}
50-
{{- if eq (index .metadata.labels "app.kubernetes.io/name") $serviceName -}}
50+
{{- if and .metadata .metadata.labels (eq (index .metadata.labels "app.kubernetes.io/name") $serviceName) -}}
5151
{{- $exists = "true" -}}
5252
{{- end -}}
5353
{{- end -}}
@@ -68,7 +68,7 @@ Get service details - takes service type and root context as parameters
6868
{{- /* Try to get details from ingress first */ -}}
6969
{{- if (lookup "networking.k8s.io/v1" "Ingress" $root.Release.Namespace "") -}}
7070
{{- range (lookup "networking.k8s.io/v1" "Ingress" $root.Release.Namespace "").items -}}
71-
{{- if eq (index .metadata.labels "app.kubernetes.io/name") $serviceType -}}
71+
{{- if and .metadata .metadata.labels (eq (index .metadata.labels "app.kubernetes.io/name") $serviceType) -}}
7272
{{- if .spec.rules -}}
7373
{{- $details = merge $details (dict "host" (index .spec.rules 0).host) -}}
7474
{{- if .spec.tls -}}
@@ -86,7 +86,7 @@ Get service details - takes service type and root context as parameters
8686
{{- if (not $found) -}}
8787
{{- if (lookup "v1" "Service" $root.Release.Namespace "") -}}
8888
{{- range (lookup "v1" "Service" $root.Release.Namespace "").items -}}
89-
{{- if eq (index .metadata.labels "app.kubernetes.io/name") $serviceType -}}
89+
{{- if and .metadata .metadata.labels (eq (index .metadata.labels "app.kubernetes.io/name") $serviceType) -}}
9090
{{- $details = merge $details (dict "host" (printf "%s.%s.svc.cluster.local" .metadata.name $root.Release.Namespace)) -}}
9191
{{- end -}}
9292
{{- end -}}

0 commit comments

Comments
 (0)