From 6d5c4265f8c809a85c9574b46751db728b01bdbb Mon Sep 17 00:00:00 2001 From: jayonlau Date: Wed, 13 Oct 2021 13:03:18 -0400 Subject: [PATCH] Remove helm status from deployment scripts for tenant-ceph 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: I649512e17fc62049fef5b9d5e05c69c0e99635f9 --- tools/deployment/tenant-ceph/020-ingress.sh | 6 ------ tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh | 3 --- tools/deployment/tenant-ceph/060-radosgw-openstack.sh | 3 --- 3 files changed, 12 deletions(-) diff --git a/tools/deployment/tenant-ceph/020-ingress.sh b/tools/deployment/tenant-ceph/020-ingress.sh index 4c3006ec3..7ea8a0489 100755 --- a/tools/deployment/tenant-ceph/020-ingress.sh +++ b/tools/deployment/tenant-ceph/020-ingress.sh @@ -34,9 +34,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 tenant-ceph; do #NOTE: Deploy namespace ingress @@ -45,7 +42,4 @@ for NAMESPACE in osh-infra ceph tenant-ceph; do #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/tenant-ceph/045-tenant-ceph-ns-activate.sh b/tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh index 76b8f9bc0..b853122a2 100755 --- a/tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh +++ b/tools/deployment/tenant-ceph/045-tenant-ceph-ns-activate.sh @@ -83,7 +83,4 @@ helm upgrade --install tenant-ceph-openstack-config ./ceph-provisioners \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#NOTE: Validate Deployment info -helm status tenant-ceph-openstack-config - helm test tenant-ceph-openstack-config --timeout 600 diff --git a/tools/deployment/tenant-ceph/060-radosgw-openstack.sh b/tools/deployment/tenant-ceph/060-radosgw-openstack.sh index 8a38ef54b..49925dae0 100755 --- a/tools/deployment/tenant-ceph/060-radosgw-openstack.sh +++ b/tools/deployment/tenant-ceph/060-radosgw-openstack.sh @@ -67,9 +67,6 @@ helm upgrade --install radosgw-openstack ./ceph-rgw \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#NOTE: Validate Deployment info -helm status radosgw-openstack - # Delete the test pod if it still exists kubectl delete pods -l application=ceph,release_group=radosgw-openstack,component=rgw-test --namespace=openstack --ignore-not-found helm test radosgw-openstack --timeout 900