From 74b79700c06dbe24012b20691ddef8e8d26b12c8 Mon Sep 17 00:00:00 2001 From: jayonlau Date: Wed, 13 Oct 2021 12:29:23 -0400 Subject: [PATCH] Remove helm status from deployment scripts for federated-monitoring With the move to helm v3, helm status requires a namespace to be specified, but doing so breaks helm v2 compatability. This change removes the usage of helm serve in openstack-helm-infra's deployment scripts. Change-Id: I21ba5d8ca6f86954c793268142419e0a9e083943 --- tools/deployment/federated-monitoring/060-prometheus.sh | 3 --- .../federated-monitoring/070-federated-prometheus.sh | 3 --- tools/deployment/federated-monitoring/090-grafana.sh | 3 --- 3 files changed, 9 deletions(-) diff --git a/tools/deployment/federated-monitoring/060-prometheus.sh b/tools/deployment/federated-monitoring/060-prometheus.sh index 010be3cc3..96763c810 100755 --- a/tools/deployment/federated-monitoring/060-prometheus.sh +++ b/tools/deployment/federated-monitoring/060-prometheus.sh @@ -59,9 +59,6 @@ for release in prometheus-one prometheus-two prometheus-three; do #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra - #NOTE: Validate Deployment info - helm status prometheus-$release - # Delete the test pod if it still exists kubectl delete pods -l application=prometheus,release_group=prometheus-$release,component=test --namespace=osh-infra --ignore-not-found helm test prometheus-$release diff --git a/tools/deployment/federated-monitoring/070-federated-prometheus.sh b/tools/deployment/federated-monitoring/070-federated-prometheus.sh index 0002bbfa0..89f10995f 100755 --- a/tools/deployment/federated-monitoring/070-federated-prometheus.sh +++ b/tools/deployment/federated-monitoring/070-federated-prometheus.sh @@ -58,9 +58,6 @@ helm upgrade --install federated-prometheus ./prometheus \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra -#NOTE: Validate Deployment info -helm status federated-prometheus - # Delete the test pod if it still exists kubectl delete pods -l application=prometheus,release_group=federated-prometheus,component=test --namespace=osh-infra --ignore-not-found helm test federated-prometheus diff --git a/tools/deployment/federated-monitoring/090-grafana.sh b/tools/deployment/federated-monitoring/090-grafana.sh index ae5716579..92e6ca703 100755 --- a/tools/deployment/federated-monitoring/090-grafana.sh +++ b/tools/deployment/federated-monitoring/090-grafana.sh @@ -156,9 +156,6 @@ helm upgrade --install grafana ./grafana \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra -#NOTE: Validate Deployment info -helm status grafana - # Delete the test pod if it still exists kubectl delete pods -l application=grafana,release_group=grafana,component=test --namespace=osh-infra --ignore-not-found