From 60a9540e0beff655832af66f90fd745bfef5b919 Mon Sep 17 00:00:00 2001 From: jayonlau Date: Wed, 13 Oct 2021 12:25:08 -0400 Subject: [PATCH] Remove helm status from deployment scripts for multinode 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: Ia600b979bf48629962577b3c5674bfa7415d78c0 --- tools/deployment/multinode/020-ingress.sh | 6 ------ tools/deployment/multinode/035-ceph-ns-activate.sh | 3 --- tools/deployment/multinode/045-mariadb.sh | 3 --- tools/deployment/multinode/050-prometheus.sh | 3 --- tools/deployment/multinode/060-alertmanager.sh | 3 --- tools/deployment/multinode/100-grafana.sh | 3 --- tools/deployment/multinode/110-nagios.sh | 3 --- tools/deployment/multinode/115-radosgw-osh-infra.sh | 3 --- tools/deployment/multinode/120-elasticsearch.sh | 3 --- tools/deployment/multinode/140-kibana.sh | 3 --- 10 files changed, 33 deletions(-) diff --git a/tools/deployment/multinode/020-ingress.sh b/tools/deployment/multinode/020-ingress.sh index 55429fd9b..79e570981 100755 --- a/tools/deployment/multinode/020-ingress.sh +++ b/tools/deployment/multinode/020-ingress.sh @@ -37,9 +37,6 @@ helm upgrade --install ingress-kube-system ./ingress \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh kube-system -#NOTE: Display info -helm status ingress-kube-system - #NOTE: Deploy namespaced ingress controllers for NAMESPACE in osh-infra ceph; do #NOTE: Deploy namespace ingress @@ -55,7 +52,4 @@ EOF #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh ${NAMESPACE} - - #NOTE: Display info - helm status ingress-${NAMESPACE} done diff --git a/tools/deployment/multinode/035-ceph-ns-activate.sh b/tools/deployment/multinode/035-ceph-ns-activate.sh index 2ad8d1046..85ed568ae 100755 --- a/tools/deployment/multinode/035-ceph-ns-activate.sh +++ b/tools/deployment/multinode/035-ceph-ns-activate.sh @@ -53,9 +53,6 @@ helm upgrade --install ceph-osh-infra-config ./ceph-provisioners \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra -#NOTE: Validate Deployment info -helm status ceph-osh-infra-config - # Delete the test pod if it still exists kubectl delete pods -l application=ceph,release_group=ceph-osh-infra-config,component=provisioner-test --namespace=osh-infra --ignore-not-found helm test ceph-osh-infra-config --timeout 600 diff --git a/tools/deployment/multinode/045-mariadb.sh b/tools/deployment/multinode/045-mariadb.sh index f39f61706..54ed14bcb 100755 --- a/tools/deployment/multinode/045-mariadb.sh +++ b/tools/deployment/multinode/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/multinode/050-prometheus.sh b/tools/deployment/multinode/050-prometheus.sh index 0a3f8803a..4592dc298 100755 --- a/tools/deployment/multinode/050-prometheus.sh +++ b/tools/deployment/multinode/050-prometheus.sh @@ -30,9 +30,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 #NOTE: Run helm tests diff --git a/tools/deployment/multinode/060-alertmanager.sh b/tools/deployment/multinode/060-alertmanager.sh index e8434f500..5b3be0285 100755 --- a/tools/deployment/multinode/060-alertmanager.sh +++ b/tools/deployment/multinode/060-alertmanager.sh @@ -23,6 +23,3 @@ helm upgrade --install alertmanager ./prometheus-alertmanager \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Validate Deployment info -helm status alertmanager diff --git a/tools/deployment/multinode/100-grafana.sh b/tools/deployment/multinode/100-grafana.sh index fceb1c281..451471616 100755 --- a/tools/deployment/multinode/100-grafana.sh +++ b/tools/deployment/multinode/100-grafana.sh @@ -30,9 +30,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 #NOTE: Run helm tests diff --git a/tools/deployment/multinode/110-nagios.sh b/tools/deployment/multinode/110-nagios.sh index 967408221..8bf64e152 100755 --- a/tools/deployment/multinode/110-nagios.sh +++ b/tools/deployment/multinode/110-nagios.sh @@ -35,9 +35,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 - #NOTE: Verify elasticsearch query clauses are functional by execing into pod NAGIOS_POD=$(kubectl -n osh-infra get pods -l='application=nagios,component=monitoring' --output=jsonpath='{.items[0].metadata.name}') kubectl exec $NAGIOS_POD -n osh-infra -c nagios -- cat /opt/nagios/etc/objects/query_es_clauses.json | python -m json.tool diff --git a/tools/deployment/multinode/115-radosgw-osh-infra.sh b/tools/deployment/multinode/115-radosgw-osh-infra.sh index 7d713c530..c72c805af 100755 --- a/tools/deployment/multinode/115-radosgw-osh-infra.sh +++ b/tools/deployment/multinode/115-radosgw-osh-infra.sh @@ -67,9 +67,6 @@ helm upgrade --install radosgw-osh-infra ./ceph-rgw \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra -#NOTE: Validate Deployment info -helm status radosgw-osh-infra - # Delete the test pod if it still exists kubectl delete pods -l application=ceph,release_group=radosgw-osh-infra,component=rgw-test --namespace=osh-infra --ignore-not-found helm test radosgw-osh-infra --timeout 900 diff --git a/tools/deployment/multinode/120-elasticsearch.sh b/tools/deployment/multinode/120-elasticsearch.sh index 3e54dcce6..363c3809d 100755 --- a/tools/deployment/multinode/120-elasticsearch.sh +++ b/tools/deployment/multinode/120-elasticsearch.sh @@ -69,9 +69,6 @@ helm upgrade --install elasticsearch ./elasticsearch \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra -#NOTE: Validate Deployment info -helm status elasticsearch - # Delete the test pod if it still exists kubectl delete pods -l application=elasticsearch,release_group=elasticsearch,component=test --namespace=osh-infra --ignore-not-found #NOTE: Run helm tests diff --git a/tools/deployment/multinode/140-kibana.sh b/tools/deployment/multinode/140-kibana.sh index 8c4ee32e6..7366dbc3d 100755 --- a/tools/deployment/multinode/140-kibana.sh +++ b/tools/deployment/multinode/140-kibana.sh @@ -24,6 +24,3 @@ helm upgrade --install kibana ./kibana \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Validate Deployment info -helm status kibana