dig some values in case the values are not set

General MR

Summary

We needed a few more digs to handle optional values in Thanos

This pulls in the changes from this MR which had been reverted and adds a few more digs to allow install without passing in test-values.yaml : !4957 (merged)

TEST RESULTS:

Without passing in test-values.yaml

$ kubectl get pod -n thanos -L app,version
NAME                                     READY   STATUS    RESTARTS   AGE   APP      VERSION
thanos-query-677fbdff8c-b99tz            2/2     Running   0          73s   thanos   v0.36.1
thanos-query-frontend-544495d8b6-6f5dq   2/2     Running   0          73s   thanos   v0.36.1

With test-values.yaml passed in

$ kubectl get pod -n thanos -L app,version
NAME                                     READY   STATUS    RESTARTS   AGE     APP      VERSION
thanos-compactor-6cc65c5656-8rmlp        2/2     Running   0          66s     thanos   v0.36.1
thanos-minio-pool-0-0                    3/3     Running   0          55s     minio    
thanos-query-6666545dd9-8g55s            2/2     Running   0          66s     thanos   v0.36.1
thanos-query-frontend-544495d8b6-6f5dq   2/2     Running   0          7m13s   thanos   v0.36.1
thanos-storegateway-0                    2/2     Running   0          66s     thanos   v0.36.1

Upgrade Notices

N/A

chart/templates/thanos/values.yaml

@@ -40,8 +40,9 @@ istio:
   thanos:
     gateways:
     - istio-system/{{ default "public" .Values.addons.thanos.ingress.gateway }}
+
 {{- with .Values.addons.thanos.objectStorage }}
-{{- if and (eq $.Values.addons.thanos.strategy "scalable") (not (and .endpoint .region)) }}
+{{- if or (dig "minio" "enabled" false $.Values.addons.thanos.values) (and (eq $.Values.addons.thanos.strategy "scalable") (not (and .endpoint .region))) }}
 minio:
   enabled: true
 {{- end }}
@@ -60,6 +61,11 @@ monitoring:
 
 storegateway:
   enabled: false
+  {{- if .Values.kiali.enabled }}
+  podLabels:
+    {{- include "kialiAppLabel" . | nindent 4 }}
+    {{- include "kialiVersionLabel" . | nindent 4 }}
+  {{- end }}
 
 query:
   dnsDiscovery:
@@ -78,15 +84,65 @@ query:
     {{- if (dig "values" "storegateway" "enabled" false .Values.addons.thanos) }}
     - dns+thanos-storegateway.thanos.svc.cluster.local:10901
     {{- end }}
-  {{- if .Values.addons.thanos.sso.enabled }}
-  {{- $thanosAuthserviceKey := (dig "selector" "key" "protect" .Values.addons.authservice.values) }}
-  {{- $thanosAuthserviceValue := (dig "selector" "value" "keycloak" .Values.addons.authservice.values) }}
+  {{- if or .Values.addons.thanos.sso.enabled .Values.kiali.enabled }}
   podLabels:
+    {{- if .Values.addons.thanos.sso.enabled }}
+    {{- $thanosAuthserviceKey := (dig "selector" "key" "protect" .Values.addons.authservice.values) }}
+    {{- $thanosAuthserviceValue := (dig "selector" "value" "keycloak" .Values.addons.authservice.values) }}
     {{ $thanosAuthserviceKey }}: {{ $thanosAuthserviceValue }}
+    {{- end }}
+    {{- if .Values.kiali.enabled }}
+    {{- include "kialiAppLabel" . | nindent 4 }}
+    {{- include "kialiVersionLabel" . | nindent 4 }}
+    {{- end }}
   {{- end }}
 
-{{- if not (.Values.addons.thanos.objectStorage.endpoint | empty) }}
+{{- if and (dig "queryFrontend" "enabled" true .Values.addons.thanos.values) $.Values.kiali.enabled }}
+queryFrontend:
+  podLabels:
+    {{- include "kialiAppLabel" . | nindent 4 }}
+    {{- include "kialiVersionLabel" . | nindent 4 }}
+{{- end }}
 
+{{- if and (dig "bucketweb" "enabled" false .Values.addons.thanos.values) .Values.kiali.enabled }}
+bucketweb:
+  podLabels:
+    {{- include "kialiAppLabel" . | nindent 4 }}
+    {{- include "kialiVersionLabel" . | nindent 4 }}
+{{- end }}
+
+{{- if and (dig "ruler" "enabled" false .Values.addons.thanos.values) .Values.kiali.enabled }}
+ruler:
+  podLabels:
+    {{- include "kialiAppLabel" . | nindent 4 }}
+    {{- include "kialiVersionLabel" . | nindent 4 }}
+{{- end }}
+
+{{- if and (dig "receive" "enabled" false .Values.addons.thanos.values) .Values.kiali.enabled }}
+receive:
+  podLabels:
+    {{- include "kialiAppLabel" . | nindent 4 }}
+    {{- include "kialiVersionLabel" . | nindent 4 }}
+{{- end }}
+
+{{- if and (dig "bucketweb" "enabled" false .Values.addons.thanos.values) .Values.kiali.enabled }}
+receiveDistributor:
+  podLabels:
+    {{- include "kialiAppLabel" . | nindent 4 }}
+    {{- include "kialiVersionLabel" . | nindent 4 }}
+{{- end }}
+
+{{- if or (dig "compactor" "enabled" false .Values.addons.thanos.values) (not (.Values.addons.thanos.objectStorage.endpoint | empty)) }}
+compactor:
+  enabled: true
+  {{- if .Values.kiali.enabled }}
+  podLabels:
+    {{- include "kialiAppLabel" . | nindent 4 }}
+    {{- include "kialiVersionLabel" . | nindent 4 }}
+  {{- end }}
+{{- end }}
+
+{{- if not (.Values.addons.thanos.objectStorage.endpoint | empty) }}
 objstoreConfig: |-
   type: s3
   config:
@@ -101,12 +157,8 @@ storegateway:
   useEndpointGroup: true
   endpoint: {{ .Values.addons.thanos.objectStorage.endpoint }}
 
-compactor:
-  enabled: true
-
 query:
   extraFlags:
     - "--endpoint=dns+monitoring-monitoring-kube-thanos-discovery.monitoring.svc.cluster.local:{{- dig "values" "query" "containerPorts" "grpc" 10901 .Values.addons.thanos }}"
-
 {{- end }}
 {{- end }}