Merge branch 'main' into APL-1614

Author: svcAPLBot

helmfile.d/helmfile-60.teams.yaml.gotmpl

@@ -157,7 +157,11 @@ releases:
               uid: loki
               type: loki
               access: proxy
+              {{- if eq $v.obj.provider.type "linode" }}
               url: http://loki-query-frontend-headless.monitoring:3101
+              {{- else }}
+              url: http://loki-headless.monitoring:3101
+              {{- end }}
               basicAuth: true
               basicAuthUser: {{ $teamId }}
               secureJsonData:

values/prometheus-operator/prometheus-operator.gotmpl

@@ -300,7 +300,7 @@ grafana:
       uid: loki
       type: loki
       access: proxy
-      {{- if eq $v.obj.provider.type "minioLocal" "linode" }}
+      {{- if eq $v.obj.provider.type "linode" }}
       url: http://loki-query-frontend-headless.monitoring:3101
       {{- else }}
       url: http://loki-headless.monitoring:3101