From 452bae4191da98f096c25ac5903abffb9e4cb3ec Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Wed, 7 Sep 2022 16:37:28 +0200 Subject: [PATCH] more fixes --- Tiltfile | 9 +++++---- hack/observability/grafana/values.yaml | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tiltfile b/Tiltfile index e3406d62958d..0e16d30ea7d1 100644 --- a/Tiltfile +++ b/Tiltfile @@ -455,11 +455,11 @@ def deploy_provider_crds(): def deploy_observability(): if "promtail" in settings.get("deploy_observability", []): k8s_yaml(read_file("./.tiltbuild/yaml/promtail.observability.yaml"), allow_duplicates = True) - k8s_resource(workload = "promtail", extra_pod_selectors = [{"app": "promtail"}], labels = ["observability"], resource_deps = ["loki"]) + k8s_resource(workload = "promtail", extra_pod_selectors = [{"app": "promtail"}], labels = ["observability"], resource_deps = ["loki"], objects = ["promtail:serviceaccount"]) if "loki" in settings.get("deploy_observability", []): k8s_yaml(read_file("./.tiltbuild/yaml/loki.observability.yaml"), allow_duplicates = True) - k8s_resource(workload = "loki", port_forwards = "3100", extra_pod_selectors = [{"app": "loki"}], labels = ["observability"]) + k8s_resource(workload = "loki", port_forwards = "3100", extra_pod_selectors = [{"app": "loki"}], labels = ["observability"], objects = ["loki:serviceaccount"]) cmd_button( "loki:import logs", @@ -478,11 +478,11 @@ def deploy_observability(): if "prometheus" in settings.get("deploy_observability", []): k8s_yaml(read_file("./.tiltbuild/yaml/prometheus.observability.yaml"), allow_duplicates = True) - k8s_resource(workload = "prometheus-server", new_name = "prometheus", port_forwards = "9090", extra_pod_selectors = [{"app": "prometheus"}], labels = ["observability"]) + k8s_resource(workload = "prometheus-server", new_name = "prometheus", port_forwards = "9090", extra_pod_selectors = [{"app": "prometheus"}], labels = ["observability"], objects = ["prometheus-server:serviceaccount"]) if "kube-state-metrics" in settings.get("deploy_observability", []): k8s_yaml(read_file("./.tiltbuild/yaml/kube-state-metrics.observability.yaml"), allow_duplicates = True) - k8s_resource(workload = "kube-state-metrics", new_name = "kube-state-metrics", extra_pod_selectors = [{"app": "kube-state-metrics"}], labels = ["observability"]) + k8s_resource(workload = "kube-state-metrics", new_name = "kube-state-metrics", extra_pod_selectors = [{"app": "kube-state-metrics"}], labels = ["observability"], objects = ["kube-state-metrics:serviceaccount"]) if "visualizer" in settings.get("deploy_observability", []): k8s_yaml(read_file("./.tiltbuild/yaml/visualizer.observability.yaml"), allow_duplicates = True) @@ -491,6 +491,7 @@ def deploy_observability(): new_name = "visualizer", port_forwards = [port_forward(local_port = 8000, container_port = 8081, name = "View visualization")], labels = ["observability"], + objects = ["capi-visualizer:serviceaccount"], ) def prepare_all(): diff --git a/hack/observability/grafana/values.yaml b/hack/observability/grafana/values.yaml index 1aff3dbde309..01c3e7783526 100644 --- a/hack/observability/grafana/values.yaml +++ b/hack/observability/grafana/values.yaml @@ -40,4 +40,3 @@ testFramework: # Kubernetes v1.25 rbac: pspEnabled: false -