From 248a28029395c62de6e3b887aa4a92d7c6fb90b3 Mon Sep 17 00:00:00 2001 From: jayonlau Date: Wed, 13 Oct 2021 12:33:07 -0400 Subject: [PATCH] Remove helm status from deployment scripts for keystone-auth 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: I4cf135dc9852506cc2e853c9faa8544b7b2e2fae --- tools/deployment/keystone-auth/020-ingress.sh | 6 ------ tools/deployment/keystone-auth/060-mariadb.sh | 3 --- tools/deployment/keystone-auth/070-keystone.sh | 4 ---- 3 files changed, 13 deletions(-) diff --git a/tools/deployment/keystone-auth/020-ingress.sh b/tools/deployment/keystone-auth/020-ingress.sh index 342a0c742..91d5e331f 100755 --- a/tools/deployment/keystone-auth/020-ingress.sh +++ b/tools/deployment/keystone-auth/020-ingress.sh @@ -32,9 +32,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 namespace ingress for NAMESPACE in openstack; do helm upgrade --install ingress-${NAMESPACE} ./ingress \ @@ -44,7 +41,4 @@ for NAMESPACE in openstack; 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/keystone-auth/060-mariadb.sh b/tools/deployment/keystone-auth/060-mariadb.sh index 7c78d68e4..89714bd30 100755 --- a/tools/deployment/keystone-auth/060-mariadb.sh +++ b/tools/deployment/keystone-auth/060-mariadb.sh @@ -29,9 +29,6 @@ helm upgrade --install mariadb ./mariadb \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack -#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=openstack --ignore-not-found #NOTE: Validate the deployment diff --git a/tools/deployment/keystone-auth/070-keystone.sh b/tools/deployment/keystone-auth/070-keystone.sh index 0d7185f2f..c6e2ec844 100755 --- a/tools/deployment/keystone-auth/070-keystone.sh +++ b/tools/deployment/keystone-auth/070-keystone.sh @@ -28,9 +28,6 @@ helm upgrade --install ldap ./ldap \ ${OSH_INFRA_EXTRA_HELM_ARGS} \ ${OSH_INFRA_EXTRA_HELM_ARGS_LDAP} -./tools/deployment/common/wait-for-pods.sh openstack -helm status ldap - # Install Keystone cd ${OSH_PATH} make keystone @@ -42,7 +39,6 @@ helm upgrade --install keystone ${OSH_PATH}/keystone \ ${OSH_EXTRA_HELM_ARGS_KEYSTONE} ./tools/deployment/common/wait-for-pods.sh openstack -helm status keystone # Testing basic functionality export OS_CLOUD=openstack_helm