openstack/openstack-helm-infra
Code Issues Proposed changes

Remove helm status from deployment scripts for apparmor

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: Idd97b6c8d2531c8cd55629a3ce91b2581af904f4
This commit is contained in:
jayonlau 2021-10-13 12:00:27 -04:00
parent 05f2a42330
commit 38f529faca
12 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/deployment/apparmor/015-ingress.sh
View File

@ -41,9 +41,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 namespace ingress #NOTE: Deploy namespace ingress
helm upgrade --install ingress-osh-infra ./ingress \ helm upgrade --install ingress-osh-infra ./ingress \
--namespace=osh-infra \ --namespace=osh-infra \
@ -53,9 +50,6 @@ helm upgrade --install ingress-osh-infra ./ingress \
#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: Display info
helm status ingress-osh-infra
helm upgrade --install ingress-ceph ./ingress \ helm upgrade --install ingress-ceph ./ingress \
--namespace=ceph \ --namespace=ceph \
${OSH_INFRA_EXTRA_HELM_ARGS} \ ${OSH_INFRA_EXTRA_HELM_ARGS} \
@ -63,6 +57,3 @@ helm upgrade --install ingress-ceph ./ingress \
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh ceph ./tools/deployment/common/wait-for-pods.sh ceph
#NOTE: Display info
helm status ingress-ceph

3
tools/deployment/apparmor/030-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/apparmor/040-memcached.sh
View File

@ -43,9 +43,6 @@ helm upgrade --install memcached ./memcached \
# 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: Validate Deployment info
helm status memcached
# Run a test. Note: the simple "cat /proc/1/attr/current" verification method # Run a test. Note: the simple "cat /proc/1/attr/current" verification method
# will not work, as memcached has multiple processes running, so we have to # will not work, as memcached has multiple processes running, so we have to
# find out which one is the memcached application process. # find out which one is the memcached application process.

2
tools/deployment/apparmor/050-libvirt.sh
View File

@ -173,5 +173,3 @@ helm upgrade --install libvirt ./libvirt \
#NOTE: Validate Deployment info #NOTE: Validate Deployment info
./tools/deployment/common/wait-for-pods.sh openstack ./tools/deployment/common/wait-for-pods.sh openstack
helm status libvirt

3
tools/deployment/apparmor/050-prometheus-alertmanager.sh
View File

@ -28,6 +28,3 @@ helm upgrade --install prometheus-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 prometheus-alertmanager

3
tools/deployment/apparmor/065-prometheus-openstack-exporter.sh
View File

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

3
tools/deployment/apparmor/070-prometheus-blackbox-exporter.sh
View File

@ -28,6 +28,3 @@ helm upgrade --install prometheus-blackbox-exporter \
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh openstack ./tools/deployment/common/wait-for-pods.sh openstack
#NOTE: Validate Deployment info
helm status prometheus-blackbox-exporter

3
tools/deployment/apparmor/085-rabbitmq.sh
View File

@ -28,6 +28,3 @@ helm upgrade --install rabbitmq ./rabbitmq \
#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 rabbitmq

3
tools/deployment/apparmor/090-elasticsearch.sh
View File

@ -74,9 +74,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
helm test elasticsearch helm test elasticsearch

3
tools/deployment/apparmor/100-fluentbit.sh
View File

@ -32,9 +32,6 @@ helm upgrade --install fluentbit ./fluentbit \
#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 fluentbit
# Delete the test pod if it still exists # Delete the test pod if it still exists
kubectl delete pods -l application=fluentbit,release_group=fluentbit,component=test --namespace=osh-infra --ignore-not-found kubectl delete pods -l application=fluentbit,release_group=fluentbit,component=test --namespace=osh-infra --ignore-not-found
helm test fluentbit helm test fluentbit

3
tools/deployment/apparmor/110-fluentd-daemonset.sh
View File

@ -167,9 +167,6 @@ helm upgrade --install fluentd-daemonset ./fluentd \
#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 fluentd-daemonset
# Delete the test pod if it still exists # Delete the test pod if it still exists
kubectl delete pods -l application=fluentd,release_group=fluentd-daemonset,component=test --namespace=osh-infra --ignore-not-found kubectl delete pods -l application=fluentd,release_group=fluentd-daemonset,component=test --namespace=osh-infra --ignore-not-found
helm test fluentd-daemonset helm test fluentd-daemonset

1
tools/deployment/apparmor/140-ceph-radosgateway.sh
View File

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