Remove helm status from deployment scripts

With the move to helm v3, helm status requires a namespace to be
specified, but doing so breaks helm v2 compatability. In order
to preserve our gating with both versions of helm while we make
the change from v2 to v3, this change removes the usage of helm
serve in openstack-helm's deployment scripts.

Once we fully move to helm v3, these scripts can be improved and
cleaned up to be more compatible with the new v3 syntax.

Change-Id: I02b6bbf780abf8c8bc7c1783c35d9411d25e18a8

tools/deployment/apparmor/015-ingress.sh

@@ -47,9 +47,6 @@ helm upgrade --install ingress-kube-system ${HELM_CHART_ROOT_PATH}/ingress \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh kube-system
 
-#NOTE: Display info
-helm status ingress-kube-system
-
 #NOTE: Deploy namespace ingress
 helm upgrade --install ingress-osh-infra ${HELM_CHART_ROOT_PATH}/ingress \
   --namespace=osh-infra \
@@ -59,9 +56,6 @@ helm upgrade --install ingress-osh-infra ${HELM_CHART_ROOT_PATH}/ingress \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh osh-infra
 
-#NOTE: Display info
-helm status ingress-osh-infra
-
 helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \
   --namespace=ceph \
   ${OSH_INFRA_EXTRA_HELM_ARGS} \
@@ -69,6 +63,3 @@ helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh ceph
-
-#NOTE: Display info
-helm status ingress-ceph

tools/deployment/baremetal/005-setup-nodes.sh

@@ -38,9 +38,6 @@ helm install ${OSH_INFRA_PATH}/libvirt \
 sleep 5 #NOTE(portdirect): work around k8s not immedately assigning pods to nodes
 ./tools/deployment/common/wait-for-pods.sh libvirt
 
-#NOTE: Validate Deployment info
-helm status libvirt
-
 #NOTE: Create domains and start vbmc for ironic to manage as baremetal nodes
 LIBVIRT_PODS=$(kubectl get --namespace libvirt pods \
   -l application=libvirt,component=libvirt \
@@ -78,9 +75,6 @@ helm install ${OSH_INFRA_PATH}/openvswitch \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-#NOTE: Validate Deployment info
-helm status openvswitch
-
 #NOTE: Setup GRE tunnels between deployment node and libvirt hosts
 OSH_IRONIC_PXE_DEV="${OSH_IRONIC_PXE_DEV:="ironic-pxe"}"
 OSH_IRONIC_PXE_ADDR="${OSH_IRONIC_PXE_ADDR:="172.24.6.1/24"}"

tools/deployment/baremetal/020-ingress.sh

@@ -41,8 +41,3 @@ helm install ${OSH_INFRA_PATH}/ingress \
 ./tools/deployment/common/wait-for-pods.sh kube-system
 ./tools/deployment/common/wait-for-pods.sh ceph
 ./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Display info
-helm status ingress-kube-system
-helm status ingress-ceph
-helm status ingress-openstack

tools/deployment/common/lockdown-netpol.sh

@@ -29,6 +29,3 @@ helm upgrade --install lockdown ${HELM_CHART_ROOT_PATH}/lockdown \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status lockdown

tools/deployment/common/memcached.sh

@@ -30,6 +30,3 @@ helm upgrade --install memcached ${HELM_CHART_ROOT_PATH}/memcached \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status memcached

tools/deployment/common/openstack-exporter.sh

@@ -29,6 +29,3 @@ helm upgrade --install prometheus-openstack-exporter ${HELM_CHART_ROOT_PATH}/pro
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status prometheus-openstack-exporter

tools/deployment/component/barbican/barbican.sh

@@ -29,7 +29,4 @@ helm upgrade --install barbican ./barbican \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-#NOTE: Validate Deployment info
-helm status barbican
-
 helm test barbican

tools/deployment/component/common/ingress.sh

@@ -58,9 +58,6 @@ helm upgrade --install ingress-kube-system ${HELM_CHART_ROOT_PATH}/ingress \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh kube-system
 
-#NOTE: Display info
-helm status ingress-kube-system
-
 #NOTE: Deploy namespace ingress
 helm upgrade --install ingress-openstack ${HELM_CHART_ROOT_PATH}/ingress \
   --namespace=openstack \
@@ -72,9 +69,6 @@ helm upgrade --install ingress-openstack ${HELM_CHART_ROOT_PATH}/ingress \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-#NOTE: Display info
-helm status ingress-openstack
-
 helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \
   --namespace=ceph \
   --values=/tmp/ingress-component.yaml \
@@ -84,6 +78,3 @@ helm upgrade --install ingress-ceph ${HELM_CHART_ROOT_PATH}/ingress \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh ceph
-
-#NOTE: Display info
-helm status ingress-ceph

tools/deployment/component/common/mariadb.sh

@@ -33,6 +33,3 @@ helm upgrade --install mariadb ${HELM_CHART_ROOT_PATH}/mariadb \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status mariadb

tools/deployment/component/common/memcached.sh

@@ -30,6 +30,3 @@ helm upgrade --install memcached ${HELM_CHART_ROOT_PATH}/memcached \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status memcached

tools/deployment/component/common/rabbitmq.sh

@@ -31,6 +31,3 @@ helm upgrade --install rabbitmq ${HELM_CHART_ROOT_PATH}/rabbitmq \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status rabbitmq

tools/deployment/component/compute-kit/libvirt.sh

@@ -34,9 +34,3 @@ helm upgrade --install libvirt ${HELM_CHART_ROOT_PATH}/libvirt \
   --set conf.ceph.enabled=${CEPH_ENABLED} \
   ${OSH_EXTRA_HELM_ARGS:=} \
   ${OSH_EXTRA_HELM_ARGS_LIBVIRT}
-
-#NOTE(portdirect): We don't wait for libvirt pods to come up, as they depend
-# on the neutron agents being up.
-
-#NOTE: Validate Deployment info
-helm status libvirt

tools/deployment/component/compute-kit/openvswitch.sh

@@ -28,6 +28,3 @@ helm upgrade --install openvswitch ${HELM_CHART_ROOT_PATH}/openvswitch \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status openvswitch

tools/deployment/component/glance/glance.sh

@@ -53,8 +53,6 @@ helm upgrade --install glance ./glance \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-#NOTE: Validate Deployment info
-helm status glance
 export OS_CLOUD=openstack_helm
 openstack service list
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx

tools/deployment/component/horizon/horizon.sh

@@ -29,9 +29,6 @@ helm upgrade --install horizon ./horizon \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-#NOTE: Validate Deployment info
-helm status horizon
-
 helm test horizon
 
 FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then

tools/deployment/component/keystone/keystone.sh

@@ -30,8 +30,6 @@ helm upgrade --install keystone ./keystone \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-#NOTE: Validate Deployment info
-helm status keystone
 export OS_CLOUD=openstack_helm
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
 openstack endpoint list

tools/deployment/component/nfs-provisioner/nfs-provisioner.sh

@@ -23,6 +23,3 @@ helm upgrade --install nfs-provisioner ${OSH_INFRA_PATH}/nfs-provisioner \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh nfs
-
-#NOTE: Display info
-helm status nfs-provisioner

tools/deployment/developer/ceph/110-ceph-radosgateway.sh

@@ -55,7 +55,6 @@ helm upgrade --install radosgw-openstack ${HELM_CHART_ROOT_PATH}/ceph-rgw \
 ./tools/deployment/common/wait-for-pods.sh openstack
 
 #NOTE: Validate Deployment info
-helm status radosgw-openstack
 export OS_CLOUD=openstack_helm
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
 openstack service list

tools/deployment/developer/ceph/120-glance.sh

@@ -56,7 +56,6 @@ helm upgrade --install glance ./glance \
 ./tools/deployment/common/wait-for-pods.sh openstack
 
 #NOTE: Validate Deployment info
-helm status glance
 export OS_CLOUD=openstack_helm
 openstack service list
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx

tools/deployment/developer/ceph/150-libvirt.sh

@@ -26,9 +26,3 @@ helm upgrade --install libvirt ${HELM_CHART_ROOT_PATH}/libvirt \
   --namespace=openstack \
   ${OSH_EXTRA_HELM_ARGS} \
   ${OSH_EXTRA_HELM_ARGS_LIBVIRT}
-
-#NOTE(portdirect): We don't wait for libvirt pods to come up, as they depend
-# on the neutron agents being up.
-
-#NOTE: Validate Deployment info
-helm status libvirt

tools/deployment/developer/common/050-mariadb.sh

@@ -31,6 +31,3 @@ helm upgrade --install mariadb ${HELM_CHART_ROOT_PATH}/mariadb \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status mariadb

tools/deployment/developer/common/060-rabbitmq.sh

@@ -30,6 +30,3 @@ helm upgrade --install rabbitmq ${HELM_CHART_ROOT_PATH}/rabbitmq \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status rabbitmq

tools/deployment/developer/common/080-keystone.sh

@@ -31,7 +31,6 @@ helm upgrade --install keystone ./keystone \
 ./tools/deployment/common/wait-for-pods.sh openstack
 
 #NOTE: Validate Deployment info
-helm status keystone
 export OS_CLOUD=openstack_helm
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
 openstack endpoint list

tools/deployment/developer/common/085-barbican.sh

@@ -29,9 +29,6 @@ helm upgrade --install barbican ./barbican \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-#NOTE: Validate Deployment info
-helm status barbican
-
 # Delete the test pod if it still exists
 kubectl delete pods -l application=barbican,release_group=barbican,component=test --namespace=openstack --ignore-not-found
 helm test barbican

tools/deployment/developer/common/100-horizon.sh

@@ -32,9 +32,6 @@ helm upgrade --install horizon ./horizon \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-#NOTE: Validate Deployment info
-helm status horizon
-
 # Delete the test pod if it still exists
 kubectl delete pods -l application=horizon,release_group=horizon,component=test --namespace=openstack --ignore-not-found
 helm test horizon

tools/deployment/developer/common/140-openvswitch.sh

@@ -29,6 +29,3 @@ helm upgrade --install openvswitch ${HELM_CHART_ROOT_PATH}/openvswitch \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status openvswitch

tools/deployment/developer/ldap/080-keystone.sh

@@ -31,9 +31,6 @@ helm upgrade --install ldap ${HELM_CHART_ROOT_PATH}/ldap \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-#NOTE: Validate Deployment info
-helm status ldap
-
 #NOTE: Get the over-rides to use
 export HELM_CHART_ROOT_PATH="../openstack-helm"
 : ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(./tools/deployment/common/get-values-overrides.sh keystone)"}
@@ -53,7 +50,6 @@ helm upgrade --install keystone ./keystone \
 ./tools/deployment/common/wait-for-pods.sh openstack
 
 #NOTE: Validate Deployment info
-helm status keystone
 export OS_CLOUD=openstack_helm
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
 openstack endpoint list

tools/deployment/developer/nfs/040-nfs-provisioner.sh

@@ -28,6 +28,3 @@ helm upgrade --install nfs-provisioner ${OSH_INFRA_PATH}/nfs-provisioner \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh nfs
-
-#NOTE: Display info
-helm status nfs-provisioner

tools/deployment/developer/nfs/120-glance.sh

@@ -53,7 +53,6 @@ helm upgrade --install glance ./glance \
 ./tools/deployment/common/wait-for-pods.sh openstack
 
 #NOTE: Validate Deployment info
-helm status glance
 export OS_CLOUD=openstack_helm
 openstack service list
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx

tools/deployment/developer/nfs/150-libvirt.sh

@@ -27,9 +27,3 @@ helm upgrade --install libvirt ${HELM_CHART_ROOT_PATH}/libvirt \
   --set conf.ceph.enabled=false \
   ${OSH_EXTRA_HELM_ARGS} \
   ${OSH_EXTRA_HELM_ARGS_LIBVIRT}
-
-#NOTE(portdirect): We don't wait for libvirt pods to come up, as they depend
-# on the neutron agents being up.
-
-#NOTE: Validate Deployment info
-helm status libvirt

tools/deployment/multinode/040-ceph-ns-activate.sh

@@ -46,6 +46,3 @@ helm upgrade --install ceph-openstack-config ${OSH_INFRA_PATH}/ceph-provisioners
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status ceph-openstack-config

tools/deployment/multinode/050-mariadb.sh

@@ -40,6 +40,3 @@ helm upgrade --install mariadb ${HELM_CHART_ROOT_PATH}/mariadb \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status mariadb

tools/deployment/multinode/080-keystone.sh

@@ -33,7 +33,6 @@ helm upgrade --install keystone ./keystone \
 ./tools/deployment/common/wait-for-pods.sh openstack
 
 #NOTE: Validate Deployment info
-helm status keystone
 export OS_CLOUD=openstack_helm
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
 openstack endpoint list

tools/deployment/multinode/085-horizon.sh

@@ -39,7 +39,4 @@ helm upgrade --install horizon ./horizon \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-#NOTE: Validate Deployment info
-helm status horizon
-
 helm test horizon

tools/deployment/multinode/090-ceph-radosgateway.sh

@@ -58,9 +58,6 @@ helm upgrade --install radosgw-openstack ${OSH_INFRA_PATH}/ceph-rgw \
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
 
-#NOTE: Validate Deployment info
-helm status radosgw-openstack
-
 #NOTE: Run Tests
 export OS_CLOUD=openstack_helm
 # Delete the test pod if it still exists

tools/deployment/multinode/100-glance.sh

@@ -42,7 +42,6 @@ helm upgrade --install glance ./glance \
 ./tools/deployment/common/wait-for-pods.sh openstack
 
 #NOTE: Validate Deployment info
-helm status glance
 export OS_CLOUD=openstack_helm
 openstack service list
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx

tools/deployment/multinode/120-openvswitch.sh

@@ -28,6 +28,3 @@ helm upgrade --install openvswitch ${OSH_INFRA_PATH}/openvswitch \
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack
-
-#NOTE: Validate Deployment info
-helm status openvswitch

tools/deployment/multinode/130-libvirt.sh

@@ -33,9 +33,3 @@ helm upgrade --install libvirt ${OSH_INFRA_PATH}/libvirt \
   --set conf.ceph.enabled=${CEPH_ENABLED} \
   ${OSH_EXTRA_HELM_ARGS} \
   ${OSH_EXTRA_HELM_ARGS_LIBVIRT}
-
-#NOTE(portdirect): We don't wait for libvirt pods to come up, as they depend
-# on the neutron agents being up.
-
-#NOTE: Validate Deployment info
-helm status libvirt

tools/deployment/multinode/250-aodh.sh

@@ -30,6 +30,5 @@ helm upgrade --install aodh ./aodh \
 ./tools/deployment/common/wait-for-pods.sh openstack
 
 #NOTE: Validate Deployment info
-helm status aodh
 export OS_CLOUD=openstack_helm
 openstack service list