From 38f529facadefafe26bc94a4be434b24602221e5 Mon Sep 17 00:00:00 2001 From: jayonlau Date: Wed, 13 Oct 2021 12:00:27 -0400 Subject: [PATCH] Remove helm status from deployment scripts for apparmor 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 --- tools/deployment/apparmor/015-ingress.sh | 9 --------- tools/deployment/apparmor/030-mariadb.sh | 3 --- tools/deployment/apparmor/040-memcached.sh | 3 --- tools/deployment/apparmor/050-libvirt.sh | 2 -- tools/deployment/apparmor/050-prometheus-alertmanager.sh | 3 --- .../apparmor/065-prometheus-openstack-exporter.sh | 3 --- .../apparmor/070-prometheus-blackbox-exporter.sh | 3 --- tools/deployment/apparmor/085-rabbitmq.sh | 3 --- tools/deployment/apparmor/090-elasticsearch.sh | 3 --- tools/deployment/apparmor/100-fluentbit.sh | 3 --- tools/deployment/apparmor/110-fluentd-daemonset.sh | 3 --- tools/deployment/apparmor/140-ceph-radosgateway.sh | 3 +-- 12 files changed, 1 insertion(+), 40 deletions(-) diff --git a/tools/deployment/apparmor/015-ingress.sh b/tools/deployment/apparmor/015-ingress.sh index 39f2520c0..48e2b4600 100755 --- a/tools/deployment/apparmor/015-ingress.sh +++ b/tools/deployment/apparmor/015-ingress.sh @@ -41,9 +41,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 helm upgrade --install ingress-osh-infra ./ingress \ --namespace=osh-infra \ @@ -53,9 +50,6 @@ helm upgrade --install ingress-osh-infra ./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 ./ingress \ --namespace=ceph \ ${OSH_INFRA_EXTRA_HELM_ARGS} \ @@ -63,6 +57,3 @@ helm upgrade --install ingress-ceph ./ingress \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh ceph - -#NOTE: Display info -helm status ingress-ceph diff --git a/tools/deployment/apparmor/030-mariadb.sh b/tools/deployment/apparmor/030-mariadb.sh index 2041beb97..297e49ef3 100755 --- a/tools/deployment/apparmor/030-mariadb.sh +++ b/tools/deployment/apparmor/030-mariadb.sh @@ -30,9 +30,6 @@ helm upgrade --install mariadb ./mariadb \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra -#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=osh-infra --ignore-not-found #NOTE: Validate the deployment diff --git a/tools/deployment/apparmor/040-memcached.sh b/tools/deployment/apparmor/040-memcached.sh index 135619b4a..5a05c67d1 100755 --- a/tools/deployment/apparmor/040-memcached.sh +++ b/tools/deployment/apparmor/040-memcached.sh @@ -43,9 +43,6 @@ helm upgrade --install memcached ./memcached \ # NOTE: Wait for deploy ./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 # will not work, as memcached has multiple processes running, so we have to # find out which one is the memcached application process. diff --git a/tools/deployment/apparmor/050-libvirt.sh b/tools/deployment/apparmor/050-libvirt.sh index c74e53e2d..700fc8758 100755 --- a/tools/deployment/apparmor/050-libvirt.sh +++ b/tools/deployment/apparmor/050-libvirt.sh @@ -173,5 +173,3 @@ helm upgrade --install libvirt ./libvirt \ #NOTE: Validate Deployment info ./tools/deployment/common/wait-for-pods.sh openstack - -helm status libvirt diff --git a/tools/deployment/apparmor/050-prometheus-alertmanager.sh b/tools/deployment/apparmor/050-prometheus-alertmanager.sh index 28c16c082..12bcecc8e 100755 --- a/tools/deployment/apparmor/050-prometheus-alertmanager.sh +++ b/tools/deployment/apparmor/050-prometheus-alertmanager.sh @@ -28,6 +28,3 @@ helm upgrade --install prometheus-alertmanager ./prometheus-alertmanager \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Validate Deployment info -helm status prometheus-alertmanager diff --git a/tools/deployment/apparmor/065-prometheus-openstack-exporter.sh b/tools/deployment/apparmor/065-prometheus-openstack-exporter.sh index ff84e5193..4d6ed1ceb 100755 --- a/tools/deployment/apparmor/065-prometheus-openstack-exporter.sh +++ b/tools/deployment/apparmor/065-prometheus-openstack-exporter.sh @@ -28,6 +28,3 @@ helm upgrade --install prometheus-openstack-exporter \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status prometheus-openstack-exporter diff --git a/tools/deployment/apparmor/070-prometheus-blackbox-exporter.sh b/tools/deployment/apparmor/070-prometheus-blackbox-exporter.sh index 0a09d1885..a80e515a0 100755 --- a/tools/deployment/apparmor/070-prometheus-blackbox-exporter.sh +++ b/tools/deployment/apparmor/070-prometheus-blackbox-exporter.sh @@ -28,6 +28,3 @@ helm upgrade --install prometheus-blackbox-exporter \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh openstack - -#NOTE: Validate Deployment info -helm status prometheus-blackbox-exporter diff --git a/tools/deployment/apparmor/085-rabbitmq.sh b/tools/deployment/apparmor/085-rabbitmq.sh index e2acdcfc7..c21698c46 100755 --- a/tools/deployment/apparmor/085-rabbitmq.sh +++ b/tools/deployment/apparmor/085-rabbitmq.sh @@ -28,6 +28,3 @@ helm upgrade --install rabbitmq ./rabbitmq \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra - -#NOTE: Validate Deployment info -helm status rabbitmq diff --git a/tools/deployment/apparmor/090-elasticsearch.sh b/tools/deployment/apparmor/090-elasticsearch.sh index 987a05f8e..94c3d50e1 100755 --- a/tools/deployment/apparmor/090-elasticsearch.sh +++ b/tools/deployment/apparmor/090-elasticsearch.sh @@ -74,9 +74,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/apparmor/100-fluentbit.sh b/tools/deployment/apparmor/100-fluentbit.sh index 9e41f106d..347fff5c7 100755 --- a/tools/deployment/apparmor/100-fluentbit.sh +++ b/tools/deployment/apparmor/100-fluentbit.sh @@ -32,9 +32,6 @@ helm upgrade --install fluentbit ./fluentbit \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra -#NOTE: Validate Deployment info -helm status fluentbit - # 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 helm test fluentbit diff --git a/tools/deployment/apparmor/110-fluentd-daemonset.sh b/tools/deployment/apparmor/110-fluentd-daemonset.sh index 63de50d2b..c9bc79a55 100755 --- a/tools/deployment/apparmor/110-fluentd-daemonset.sh +++ b/tools/deployment/apparmor/110-fluentd-daemonset.sh @@ -167,9 +167,6 @@ helm upgrade --install fluentd-daemonset ./fluentd \ #NOTE: Wait for deploy ./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 kubectl delete pods -l application=fluentd,release_group=fluentd-daemonset,component=test --namespace=osh-infra --ignore-not-found helm test fluentd-daemonset diff --git a/tools/deployment/apparmor/140-ceph-radosgateway.sh b/tools/deployment/apparmor/140-ceph-radosgateway.sh index 5518826ef..13602babe 100755 --- a/tools/deployment/apparmor/140-ceph-radosgateway.sh +++ b/tools/deployment/apparmor/140-ceph-radosgateway.sh @@ -54,7 +54,6 @@ helm upgrade --install radosgw-openstack ${OSH_INFRA_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 60 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx @@ -63,4 +62,4 @@ openstack endpoint list # 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 \ No newline at end of file +helm test radosgw-openstack --timeout 900