From 24fd882cd6965b6864485f2a9770de6cca11e28f Mon Sep 17 00:00:00 2001 From: jayonlau Date: Wed, 13 Oct 2021 12:58:17 -0400 Subject: [PATCH] Remove helm status from deployment scripts for osh-infra-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: I7d17d2ff4a44fc8d16cc653b33253cce536bfce1 --- tools/deployment/osh-infra-monitoring/030-nfs-provisioner.sh | 3 --- tools/deployment/osh-infra-monitoring/045-mariadb.sh | 3 --- tools/deployment/osh-infra-monitoring/050-prometheus.sh | 3 --- tools/deployment/osh-infra-monitoring/060-alertmanager.sh | 3 --- tools/deployment/osh-infra-monitoring/110-grafana.sh | 3 --- tools/deployment/osh-infra-monitoring/120-nagios.sh | 3 --- 6 files changed, 18 deletions(-) diff --git a/tools/deployment/osh-infra-monitoring/030-nfs-provisioner.sh b/tools/deployment/osh-infra-monitoring/030-nfs-provisioner.sh index 669e5e251..4ca67dd9f 100755 --- a/tools/deployment/osh-infra-monitoring/030-nfs-provisioner.sh +++ b/tools/deployment/osh-infra-monitoring/030-nfs-provisioner.sh @@ -30,6 +30,3 @@ helm upgrade --install nfs-provisioner \ #NOTE: Wait for deployment ./tools/deployment/common/wait-for-pods.sh nfs - -#NOTE: Validate Deployment info -helm status nfs-provisioner diff --git a/tools/deployment/osh-infra-monitoring/045-mariadb.sh b/tools/deployment/osh-infra-monitoring/045-mariadb.sh index 362b07d09..2966a9cfb 100755 --- a/tools/deployment/osh-infra-monitoring/045-mariadb.sh +++ b/tools/deployment/osh-infra-monitoring/045-mariadb.sh @@ -30,9 +30,6 @@ helm upgrade --install mariadb ./mariadb \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra -#NOTE: Validate Deployment info -helm status mariadb - # Delete the test pod if it still exists kubectl delete pods -l application=mariadb,release_group=mariadb,component=test --namespace=osh-infra --ignore-not-found #NOTE: Validate the deployment diff --git a/tools/deployment/osh-infra-monitoring/050-prometheus.sh b/tools/deployment/osh-infra-monitoring/050-prometheus.sh index 4fbb72986..bf32bcd89 100755 --- a/tools/deployment/osh-infra-monitoring/050-prometheus.sh +++ b/tools/deployment/osh-infra-monitoring/050-prometheus.sh @@ -29,9 +29,6 @@ helm upgrade --install prometheus ./prometheus \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra -#NOTE: Validate Deployment info -helm status prometheus - # Delete the test pod if it still exists kubectl delete pods -l application=prometheus,release_group=prometheus,component=test --namespace=osh-infra --ignore-not-found helm test prometheus diff --git a/tools/deployment/osh-infra-monitoring/060-alertmanager.sh b/tools/deployment/osh-infra-monitoring/060-alertmanager.sh index 97177d337..5da7b2fa6 100755 --- a/tools/deployment/osh-infra-monitoring/060-alertmanager.sh +++ b/tools/deployment/osh-infra-monitoring/060-alertmanager.sh @@ -24,6 +24,3 @@ helm upgrade --install prometheus-alertmanager ./prometheus-alertmanager \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Validate Deployment info -helm status prometheus-alertmanager diff --git a/tools/deployment/osh-infra-monitoring/110-grafana.sh b/tools/deployment/osh-infra-monitoring/110-grafana.sh index 6a3c2f8fa..19fa9a487 100755 --- a/tools/deployment/osh-infra-monitoring/110-grafana.sh +++ b/tools/deployment/osh-infra-monitoring/110-grafana.sh @@ -29,9 +29,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 helm test grafana diff --git a/tools/deployment/osh-infra-monitoring/120-nagios.sh b/tools/deployment/osh-infra-monitoring/120-nagios.sh index b48f6cff8..02343a2d0 100755 --- a/tools/deployment/osh-infra-monitoring/120-nagios.sh +++ b/tools/deployment/osh-infra-monitoring/120-nagios.sh @@ -28,9 +28,6 @@ helm upgrade --install nagios ./nagios \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra -#NOTE: Validate Deployment info -helm status nagios - # Delete the test pod if it still exists kubectl delete pods -l application=nagios,release_group=nagios,component=test --namespace=osh-infra --ignore-not-found helm test nagios