From: Petr Ospalý <p.ospaly@partner.samsung.com>
Date: Wed, 30 Oct 2019 13:01:00 +0000 (+0100)
Subject: Remove deprecated flag
X-Git-Tag: 6.0.0-ONAP~68
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F60%2F98460%2F1;p=oom%2Foffline-installer.git

Remove deprecated flag

This commit fixes this warning:
Flag --include-uninitialized has been deprecated, The Initializers
feature has been removed. This flag is now a no-op, and will be
removed in v1.15

+ Fix whitespace in help

Issue-ID: OOM-2074

Change-Id: I23b1a5cbe10fc07ec9342119be1753402ef6e041
Signed-off-by: Petr Ospalý <p.ospaly@partner.samsung.com>
---

diff --git a/tools/helm-healer.sh b/tools/helm-healer.sh
index b030fcac..0ec7a3d0 100755
--- a/tools/helm-healer.sh
+++ b/tools/helm-healer.sh
@@ -58,15 +58,15 @@ USAGE
         ${CMD} -n onap -f /some/override1.yml -s /dockerdata-nfs
 
     Usage 2 (redeploy ONLY explicit listed components):
-        ${CMD} -n onap -f /some/override1.yml -s /dockerdata-nfs \
+        ${CMD} -n onap -f /some/override1.yml -s /dockerdata-nfs \\
                -c onap-aaf -c onap-sdc -c onap-portal
 
     Usage 3 (delete EVERYTHING and redeploy):
-        ${CMD} -n onap -f /some/override1.yml -s /dockerdata-nfs \
+        ${CMD} -n onap -f /some/override1.yml -s /dockerdata-nfs \\
                --delete-all
 
     Usage 4 (just clean - do not redeploy)
-        ${CMD} -n onap -f /some/override1.yml -s /dockerdata-nfs \
+        ${CMD} -n onap -f /some/override1.yml -s /dockerdata-nfs \\
                --delete-all --clean-only
 
     Namespace argument and at least one override file are mandatory
@@ -153,7 +153,6 @@ get_labels()
 
     kubectl get pods -n ${NAMESPACE} \
         --show-labels=true \
-        --include-uninitialized=true \
         ${_selector} \
         --ignore-not-found=true \
         --no-headers=true | \
@@ -183,7 +182,6 @@ delete_job()
     kubectl delete job -n ${NAMESPACE} \
         --cascade=true \
         --now=true \
-        --include-uninitialized=true \
         --wait=true \
         ${1}
 
@@ -219,7 +217,6 @@ delete_resource()
             kubectl delete ${_resource} -n ${NAMESPACE} \
                 --cascade=true \
                 --now=true \
-                --include-uninitialized=true \
                 --wait=true \
                 ${_name} \
                 2>&1 | grep -iv 'not[[:space:]]*found'
@@ -241,7 +238,6 @@ delete_namespace()
     kubectl delete namespace \
         --cascade=true \
         --now=true \
-        --include-uninitialized=true \
         --wait=true \
         "$NAMESPACE"