More test fixes

Signed-off-by: Pete Wall <pete.wall@grafana.com>
grafana · Oct 4, 2024 · 8e555ed · 8e555ed
1 parent 2169f94
commit 8e555ed
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 17 deletions.
diff --git a/charts/k8s-monitoring/templates/destinations/_helpers.tpl b/charts/k8s-monitoring/templates/destinations/_helpers.tpl
@@ -95,8 +95,7 @@ remote.kubernetes.secret.{{ include "helper.alloy_name" .destination.name }}.dat
 {{/*Determines if the destination will reference a Kubernetes secret*/}}
 {{/*Inputs: . (destination definition)*/}}
 {{- define "destinations.secret.uses_k8s_secret" -}}
-{{- if eq (include "destinations.auth.type" .) "none" }}false
-{{- else if eq (include "destinations.secret.type" .) "embedded" -}}false
+{{- if eq (include "destinations.secret.type" .) "embedded" -}}false
 {{- else -}}
   {{- $hasSecretDefined := false }}
   {{- $secrets := include (printf "destinations.%s.secrets" .type) . | fromYamlArray }}

diff --git a/charts/k8s-monitoring/tests/integration/control-plane-monitoring/test-values.yaml b/charts/k8s-monitoring/tests/integration/control-plane-monitoring/test-values.yaml
@@ -1,9 +1,7 @@
 ---
 tests:
   - env:
-      PROMETHEUS_URL: https://prometheus-server.prometheus.svc:9090/api/v1/query
-      PROMETHEUS_USER: promuser
-      PROMETHEUS_PASS: prometheuspassword
+      PROMETHEUS_URL: http://prometheus-server.prometheus.svc:9090/api/v1/query
       LOKI_URL: http://loki.loki.svc:3100/loki/api/v1/query
       LOKI_TENANTID: 1
       LOKI_USER: loki

diff --git a/charts/k8s-monitoring/tests/integration/control-plane-monitoring/values.yaml b/charts/k8s-monitoring/tests/integration/control-plane-monitoring/values.yaml
@@ -6,13 +6,6 @@ destinations:
   - name: localPrometheus
     type: prometheus
     url: https://prometheus-server.prometheus.svc:9090/api/v1/write
-    tenantId: "1"
-    auth:
-      type: basic
-      username: promuser
-      password: prometheuspassword
-    tls:
-      insecureSkipVerify: true
   - name: localLoki
     type: loki
     url: http://loki.loki.svc:3100/loki/api/v1/push

diff --git a/charts/k8s-monitoring/tests/integration/profiling/pyroscope.yaml b/charts/k8s-monitoring/tests/integration/profiling/pyroscope.yaml
@@ -1,6 +1,6 @@
 ---
 alloy:
   enabled: false
-pyroscope:
-  extraArgs:
-    "auth.multitenancy-enabled": true
+#pyroscope:
+#  extraArgs:
+#    "auth.multitenancy-enabled": true
diff --git a/charts/k8s-monitoring/tests/integration/profiling/test-values.yaml b/charts/k8s-monitoring/tests/integration/profiling/test-values.yaml
@@ -1,7 +1,7 @@
 ---
 tests:
   - env:
-      PYROSCOPE_URL: http://pyroscope.pyroscope.svc:4040
+      PROFILECLI_URL: http://pyroscope.pyroscope.svc:4040
     queries:
       - query: '{cluster="ci-test-cluster"}'
         type: pyroql
diff --git a/charts/k8s-monitoring/tests/integration/profiling/values.yaml b/charts/k8s-monitoring/tests/integration/profiling/values.yaml
@@ -6,7 +6,6 @@ destinations:
   - name: pyro
     type: pyroscope
     url: http://pyroscope.pyroscope.svc:4040
-    tenantId: 1
 
 profiling:
   enabled: true