From: Gabriel Cuba <gcuba@whitestack.com>
Date: Tue, 5 Jul 2022 20:07:33 +0000 (-0500)
Subject: Fix bug 2099: Modify helm init command so that all parameters are at the end
X-Git-Tag: v14.0.1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=ea5da0e17954288a72afed570d5ec38fe04f3e1a;p=osm%2FN2VC.git

Fix bug 2099: Modify helm init command so that all parameters are at the end

Change-Id: I9152e34461dbe4528b2a01f5492f4efa6a285b2b
Signed-off-by: Gabriel Cuba <gcuba@whitestack.com>
(cherry picked from commit 5749c53dc559869521242e225b83d02d9ec115a8)
(cherry picked from commit 9a9a7860d9486576accfaeb0744fd4504c82895d)
---

diff --git a/n2vc/k8s_helm_conn.py b/n2vc/k8s_helm_conn.py
index bbe4c48..00e4ff3 100644
--- a/n2vc/k8s_helm_conn.py
+++ b/n2vc/k8s_helm_conn.py
@@ -297,8 +297,8 @@ class K8sHelmConnector(K8sHelmBaseConnector):
             )
 
             command = (
-                "{} --kubeconfig={} --tiller-namespace={} --home={} --service-account {} "
-                " {} init"
+                "{} init --kubeconfig={} --tiller-namespace={} --home={} --service-account {} "
+                " {}"
             ).format(
                 self._helm_command,
                 paths["kube_config"],
@@ -321,8 +321,8 @@ class K8sHelmConnector(K8sHelmBaseConnector):
             ):
                 self.log.info("Initializing helm in client: {}".format(cluster_id))
                 command = (
-                    "{} --kubeconfig={} --tiller-namespace={} "
-                    "--home={} init --client-only {} "
+                    "{} init --kubeconfig={} --tiller-namespace={} "
+                    "--home={} --client-only {} "
                 ).format(
                     self._helm_command,
                     paths["kube_config"],