openstack/openstack-helm-infra
Code Issues Proposed changes

Remove helm status from deployment scripts for multinode

Browse Source 
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
This commit is contained in:
jayonlau 2021-10-13 12:25:08 -04:00
parent 2ef1d9b7ed
commit 60a9540e0b
10 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/deployment/multinode/020-ingress.sh
View File

@ -37,9 +37,6 @@ helm upgrade --install ingress-kube-system ./ingress \
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh kube-system ./tools/deployment/common/wait-for-pods.sh kube-system
#NOTE: Display info
helm status ingress-kube-system
#NOTE: Deploy namespaced ingress controllers #NOTE: Deploy namespaced ingress controllers
for NAMESPACE in osh-infra ceph; do for NAMESPACE in osh-infra ceph; do
#NOTE: Deploy namespace ingress #NOTE: Deploy namespace ingress
@ -55,7 +52,4 @@ EOF
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh ${NAMESPACE} ./tools/deployment/common/wait-for-pods.sh ${NAMESPACE}
#NOTE: Display info
helm status ingress-${NAMESPACE}
done done

3
tools/deployment/multinode/035-ceph-ns-activate.sh
View File

@ -53,9 +53,6 @@ helm upgrade --install ceph-osh-infra-config ./ceph-provisioners \
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh osh-infra ./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 # 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 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 helm test ceph-osh-infra-config --timeout 600

3
tools/deployment/multinode/045-mariadb.sh
View File

@ -30,9 +30,6 @@ helm upgrade --install mariadb ./mariadb \
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh osh-infra ./tools/deployment/common/wait-for-pods.sh osh-infra
#NOTE: Validate Deployment info
helm status mariadb
# Delete the test pod if it still exists # 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 kubectl delete pods -l application=mariadb,release_group=mariadb,component=test --namespace=osh-infra --ignore-not-found
#NOTE: Validate the deployment #NOTE: Validate the deployment

3
tools/deployment/multinode/050-prometheus.sh
View File

@ -30,9 +30,6 @@ helm upgrade --install prometheus ./prometheus \
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh osh-infra ./tools/deployment/common/wait-for-pods.sh osh-infra
#NOTE: Validate Deployment info
helm status prometheus
# Delete the test pod if it still exists # 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 kubectl delete pods -l application=prometheus,release_group=prometheus,component=test --namespace=osh-infra --ignore-not-found
#NOTE: Run helm tests #NOTE: Run helm tests

3
tools/deployment/multinode/060-alertmanager.sh
View File

@ -23,6 +23,3 @@ helm upgrade --install alertmanager ./prometheus-alertmanager \
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh osh-infra ./tools/deployment/common/wait-for-pods.sh osh-infra
#NOTE: Validate Deployment info
helm status alertmanager

3
tools/deployment/multinode/100-grafana.sh
View File

@ -30,9 +30,6 @@ helm upgrade --install grafana ./grafana \
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh osh-infra ./tools/deployment/common/wait-for-pods.sh osh-infra
#NOTE: Validate Deployment info
helm status grafana
# Delete the test pod if it still exists # 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 kubectl delete pods -l application=grafana,release_group=grafana,component=test --namespace=osh-infra --ignore-not-found
#NOTE: Run helm tests #NOTE: Run helm tests

3
tools/deployment/multinode/110-nagios.sh
View File

@ -35,9 +35,6 @@ helm upgrade --install nagios ./nagios \
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh osh-infra ./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 #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}') 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 kubectl exec $NAGIOS_POD -n osh-infra -c nagios -- cat /opt/nagios/etc/objects/query_es_clauses.json | python -m json.tool

3
tools/deployment/multinode/115-radosgw-osh-infra.sh
View File

@ -67,9 +67,6 @@ helm upgrade --install radosgw-osh-infra ./ceph-rgw \
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh osh-infra ./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 # 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 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 helm test radosgw-osh-infra --timeout 900

3
tools/deployment/multinode/120-elasticsearch.sh
View File

@ -69,9 +69,6 @@ helm upgrade --install elasticsearch ./elasticsearch \
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh osh-infra ./tools/deployment/common/wait-for-pods.sh osh-infra
#NOTE: Validate Deployment info
helm status elasticsearch
# Delete the test pod if it still exists # 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 kubectl delete pods -l application=elasticsearch,release_group=elasticsearch,component=test --namespace=osh-infra --ignore-not-found
#NOTE: Run helm tests #NOTE: Run helm tests

3
tools/deployment/multinode/140-kibana.sh
View File

@ -24,6 +24,3 @@ helm upgrade --install kibana ./kibana \
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh osh-infra ./tools/deployment/common/wait-for-pods.sh osh-infra
#NOTE: Validate Deployment info
helm status kibana