From 42195465f7e9360248c5effb83cdb165d0c5e35a Mon Sep 17 00:00:00 2001 From: jayonlau Date: Wed, 13 Oct 2021 12:55:42 -0400 Subject: [PATCH] Remove helm status from deployment scripts for osh-infra-monitoring-tls 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: I7a14e510fb1cfadcf2e124314b52c7cac4ac0af1 --- .../deployment/osh-infra-monitoring-tls/030-nfs-provisioner.sh | 3 --- tools/deployment/osh-infra-monitoring-tls/045-mariadb.sh | 3 --- tools/deployment/osh-infra-monitoring-tls/050-prometheus.sh | 3 --- tools/deployment/osh-infra-monitoring-tls/060-alertmanager.sh | 3 --- .../osh-infra-monitoring-tls/075-node-problem-detector.sh | 3 --- .../osh-infra-monitoring-tls/105-blackbox-exporter.sh | 3 --- tools/deployment/osh-infra-monitoring-tls/110-grafana.sh | 3 --- tools/deployment/osh-infra-monitoring-tls/120-nagios.sh | 3 --- 8 files changed, 24 deletions(-) diff --git a/tools/deployment/osh-infra-monitoring-tls/030-nfs-provisioner.sh b/tools/deployment/osh-infra-monitoring-tls/030-nfs-provisioner.sh index 669e5e251..4ca67dd9f 100755 --- a/tools/deployment/osh-infra-monitoring-tls/030-nfs-provisioner.sh +++ b/tools/deployment/osh-infra-monitoring-tls/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-tls/045-mariadb.sh b/tools/deployment/osh-infra-monitoring-tls/045-mariadb.sh index 4f9a81f3c..28e9bbd93 100755 --- a/tools/deployment/osh-infra-monitoring-tls/045-mariadb.sh +++ b/tools/deployment/osh-infra-monitoring-tls/045-mariadb.sh @@ -32,9 +32,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-tls/050-prometheus.sh b/tools/deployment/osh-infra-monitoring-tls/050-prometheus.sh index ce467af48..92e1fb2f4 100755 --- a/tools/deployment/osh-infra-monitoring-tls/050-prometheus.sh +++ b/tools/deployment/osh-infra-monitoring-tls/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-tls/060-alertmanager.sh b/tools/deployment/osh-infra-monitoring-tls/060-alertmanager.sh index 7a7448295..32fbc77ec 100755 --- a/tools/deployment/osh-infra-monitoring-tls/060-alertmanager.sh +++ b/tools/deployment/osh-infra-monitoring-tls/060-alertmanager.sh @@ -31,6 +31,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-tls/075-node-problem-detector.sh b/tools/deployment/osh-infra-monitoring-tls/075-node-problem-detector.sh index 6188f97c2..b60490152 100755 --- a/tools/deployment/osh-infra-monitoring-tls/075-node-problem-detector.sh +++ b/tools/deployment/osh-infra-monitoring-tls/075-node-problem-detector.sh @@ -40,6 +40,3 @@ helm upgrade --install kubernetes-node-problem-detector \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh kube-system - -#NOTE: Validate Deployment info -helm status kubernetes-node-problem-detector diff --git a/tools/deployment/osh-infra-monitoring-tls/105-blackbox-exporter.sh b/tools/deployment/osh-infra-monitoring-tls/105-blackbox-exporter.sh index 6fce52cac..11ce55fe2 100755 --- a/tools/deployment/osh-infra-monitoring-tls/105-blackbox-exporter.sh +++ b/tools/deployment/osh-infra-monitoring-tls/105-blackbox-exporter.sh @@ -27,6 +27,3 @@ helm upgrade --install prometheus-blackbox-exporter \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Validate Deployment info -helm status prometheus-blackbox-exporter diff --git a/tools/deployment/osh-infra-monitoring-tls/110-grafana.sh b/tools/deployment/osh-infra-monitoring-tls/110-grafana.sh index 548efba0f..64011f63c 100755 --- a/tools/deployment/osh-infra-monitoring-tls/110-grafana.sh +++ b/tools/deployment/osh-infra-monitoring-tls/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-tls/120-nagios.sh b/tools/deployment/osh-infra-monitoring-tls/120-nagios.sh index b48f6cff8..02343a2d0 100755 --- a/tools/deployment/osh-infra-monitoring-tls/120-nagios.sh +++ b/tools/deployment/osh-infra-monitoring-tls/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