From: Luis Vega <lvega@whitestack.com>
Date: Thu, 23 Nov 2023 20:21:35 +0000 (+0000)
Subject: Feature 11002: Deprecate helmv2
X-Git-Tag: release-v15.0-start~2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F60%2F14060%2F1;p=osm%2Fosmclient.git

Feature 11002: Deprecate helmv2

Change-Id: I75901e1f370b896222ae5a8528afc59661e572bf
Signed-off-by: Luis Vega <lvega@whitestack.com>
---

diff --git a/osmclient/cli_commands/k8scluster.py b/osmclient/cli_commands/k8scluster.py
index 9c1bcce..77e1124 100755
--- a/osmclient/cli_commands/k8scluster.py
+++ b/osmclient/cli_commands/k8scluster.py
@@ -38,12 +38,6 @@ logger = logging.getLogger("osmclient")
     help='''list of VIM networks, in JSON inline format, where the cluster is
     accessible via L3 routing, e.g. "{(k8s_net1:vim_network1) [,(k8s_net2:vim_network2) ...]}"''',
 )
-@click.option(
-    "--init-helm2/--skip-helm2",
-    required=False,
-    default=True,
-    help="Initialize helm v2",
-)
 @click.option(
     "--init-helm3/--skip-helm3",
     required=False,
@@ -86,7 +80,6 @@ def k8scluster_add(
     version,
     vim,
     k8s_nets,
-    init_helm2,
     init_helm3,
     init_jujubundle,
     description,
@@ -106,9 +99,8 @@ def k8scluster_add(
     cluster["k8s_version"] = version
     cluster["vim_account"] = vim
     cluster["nets"] = yaml.safe_load(k8s_nets)
-    if not (init_helm2 and init_jujubundle and init_helm3):
+    if not (init_jujubundle and init_helm3):
         cluster["deployment_methods"] = {
-            "helm-chart": init_helm2,
             "juju-bundle": init_jujubundle,
             "helm-chart-v3": init_helm3,
         }