From 1b3d4f88f35d93935b7cbd7cd81526235ee2b84b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jelizaveta=20Leme=C5=A1eva?=
 <jelizaveta.lemeseva@vinted.com>
Date: Tue, 30 Jul 2024 13:42:04 +0200
Subject: [PATCH] fix(reana_dev): remove default for --kind-node-version (#811)

---
 reana/config.py            |  3 ---
 reana/reana_dev/cluster.py | 19 +++++++++----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/reana/config.py b/reana/config.py
index 81423d7a..74ad4edc 100644
--- a/reana/config.py
+++ b/reana/config.py
@@ -266,9 +266,6 @@
 TIMEOUT = 900
 """Maximum timeout to wait for results when running demo analyses in CI."""
 
-KIND_IMAGE_VERSION = "v1.30.2"
-"""Kind Docker image version. Should be compatible with kubeVersion in HELM_VERSION_FILE."""
-
 DOCKER_VERSION_FILE = "Dockerfile"
 """Docker version file."""
 
diff --git a/reana/reana_dev/cluster.py b/reana/reana_dev/cluster.py
index a890b5c7..40897ab8 100644
--- a/reana/reana_dev/cluster.py
+++ b/reana/reana_dev/cluster.py
@@ -24,10 +24,6 @@
     validate_mode_option,
 )
 
-from reana.config import (
-    KIND_IMAGE_VERSION,
-)
-
 
 def volume_mounts_to_list(ctx, param, value):
     """Convert tuple params to dictionary. e.g `(foo:bar)` to `{'foo': 'bar'}`.
@@ -76,13 +72,12 @@ def cluster_commands():
     help="Disable default CNI and use e.g. Calico.",
 )
 @click.option(
-    "--kind-version",
-    default=KIND_IMAGE_VERSION,
-    help=f"Which kindest/node image version to use? [default={KIND_IMAGE_VERSION}]",
+    "--kind-node-version",
+    help=f"Which kindest/node image version to use?",
 )
 @cluster_commands.command(name="cluster-create")
 def cluster_create(
-    mounts, mode, worker_nodes, disable_default_cni, kind_version
+    mounts, mode, worker_nodes, disable_default_cni, kind_node_version
 ):  # noqa: D301
     """Create new REANA cluster.
 
@@ -175,9 +170,13 @@ def add_volume_mounts(node):
         kind_provider = "KIND_EXPERIMENTAL_PROVIDER=podman"
 
     # create cluster
-    cluster_create = "cat <<EOF | {kind_provider} kind create cluster --image kindest/node:{kind_version} --config=-\n{cluster_config}\nEOF".format(
+    image_flag = ''
+    if kind_node_version != None:
+        image_flag = f"--image kindest/node:{kind_node_version}"
+
+    cluster_create = "cat <<EOF | {kind_provider} kind create cluster {image_flag} --config=-\n{cluster_config}\nEOF".format(
         kind_provider=kind_provider,
-        kind_version=kind_version,
+        image_flag=image_flag,
         cluster_config=yaml.dump(cluster_config),
     )
     run_command(cluster_create, "reana")