From 0e94f35e9cb5b6bda6f315fc4e3a3922fb8461c2 Mon Sep 17 00:00:00 2001 From: jayonlau Date: Wed, 13 Oct 2021 12:49:21 -0400 Subject: [PATCH] Remove helm status from deployment scripts for osh-infra-logging-tls 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: Icc845f0ee15740802e97a4749e7181d6f372e4b2 --- tools/deployment/osh-infra-logging-tls/010-ingress.sh | 6 ------ .../osh-infra-logging-tls/030-radosgw-osh-infra.sh | 3 --- tools/deployment/osh-infra-logging-tls/050-elasticsearch.sh | 3 --- tools/deployment/osh-infra-logging-tls/070-kibana.sh | 3 --- 4 files changed, 15 deletions(-) diff --git a/tools/deployment/osh-infra-logging-tls/010-ingress.sh b/tools/deployment/osh-infra-logging-tls/010-ingress.sh index 5ede0f5fc..a99dd0244 100755 --- a/tools/deployment/osh-infra-logging-tls/010-ingress.sh +++ b/tools/deployment/osh-infra-logging-tls/010-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 osh-infra ceph; do helm upgrade --install ingress-${NAMESPACE} ./ingress \ @@ -44,7 +41,4 @@ for NAMESPACE in osh-infra 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/osh-infra-logging-tls/030-radosgw-osh-infra.sh b/tools/deployment/osh-infra-logging-tls/030-radosgw-osh-infra.sh index b796c1ede..6e2b4973b 100755 --- a/tools/deployment/osh-infra-logging-tls/030-radosgw-osh-infra.sh +++ b/tools/deployment/osh-infra-logging-tls/030-radosgw-osh-infra.sh @@ -61,9 +61,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 #NOTE: Test Deployment diff --git a/tools/deployment/osh-infra-logging-tls/050-elasticsearch.sh b/tools/deployment/osh-infra-logging-tls/050-elasticsearch.sh index 2bbc6cf90..f1fb337a8 100755 --- a/tools/deployment/osh-infra-logging-tls/050-elasticsearch.sh +++ b/tools/deployment/osh-infra-logging-tls/050-elasticsearch.sh @@ -114,9 +114,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 helm test elasticsearch diff --git a/tools/deployment/osh-infra-logging-tls/070-kibana.sh b/tools/deployment/osh-infra-logging-tls/070-kibana.sh index 850ebc621..2d80a3938 100755 --- a/tools/deployment/osh-infra-logging-tls/070-kibana.sh +++ b/tools/deployment/osh-infra-logging-tls/070-kibana.sh @@ -28,6 +28,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