From 2ef1d9b7edb2203099baeaa8d798aee727959abf Mon Sep 17 00:00:00 2001 From: jayonlau Date: Wed, 13 Oct 2021 12:17:49 -0400 Subject: [PATCH] Remove helm status from deployment scripts for elastic-beats 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: I5c6dc5ea826c57b8c442ee0e876010a9ab726612 --- tools/deployment/elastic-beats/050-elasticsearch.sh | 3 --- tools/deployment/elastic-beats/060-kibana.sh | 3 --- tools/deployment/elastic-beats/080-elastic-metricbeat.sh | 3 --- tools/deployment/elastic-beats/090-elastic-filebeat.sh | 3 --- tools/deployment/elastic-beats/100-elastic-packetbeat.sh | 3 --- 5 files changed, 15 deletions(-) diff --git a/tools/deployment/elastic-beats/050-elasticsearch.sh b/tools/deployment/elastic-beats/050-elasticsearch.sh index 95cc2c1f3..0862aeaaf 100755 --- a/tools/deployment/elastic-beats/050-elasticsearch.sh +++ b/tools/deployment/elastic-beats/050-elasticsearch.sh @@ -60,6 +60,3 @@ 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 diff --git a/tools/deployment/elastic-beats/060-kibana.sh b/tools/deployment/elastic-beats/060-kibana.sh index 2a2659a5d..677e4b915 100755 --- a/tools/deployment/elastic-beats/060-kibana.sh +++ b/tools/deployment/elastic-beats/060-kibana.sh @@ -53,6 +53,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 diff --git a/tools/deployment/elastic-beats/080-elastic-metricbeat.sh b/tools/deployment/elastic-beats/080-elastic-metricbeat.sh index eab0c28fc..2e0820cf2 100755 --- a/tools/deployment/elastic-beats/080-elastic-metricbeat.sh +++ b/tools/deployment/elastic-beats/080-elastic-metricbeat.sh @@ -40,6 +40,3 @@ helm upgrade --install elastic-metricbeat ./elastic-metricbeat \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh kube-system - -#NOTE: Validate Deployment info -helm status elastic-metricbeat diff --git a/tools/deployment/elastic-beats/090-elastic-filebeat.sh b/tools/deployment/elastic-beats/090-elastic-filebeat.sh index e2aa261b0..44c5e5086 100755 --- a/tools/deployment/elastic-beats/090-elastic-filebeat.sh +++ b/tools/deployment/elastic-beats/090-elastic-filebeat.sh @@ -40,6 +40,3 @@ helm upgrade --install elastic-filebeat ./elastic-filebeat \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh kube-system - -#NOTE: Validate Deployment info -helm status elastic-filebeat diff --git a/tools/deployment/elastic-beats/100-elastic-packetbeat.sh b/tools/deployment/elastic-beats/100-elastic-packetbeat.sh index 8df2d73e4..43ba1acb9 100755 --- a/tools/deployment/elastic-beats/100-elastic-packetbeat.sh +++ b/tools/deployment/elastic-beats/100-elastic-packetbeat.sh @@ -40,6 +40,3 @@ helm upgrade --install elastic-packetbeat ./elastic-packetbeat \ #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh kube-system - -#NOTE: Validate Deployment info -helm status elastic-packetbeat