kind: move KIND_IMAGE and K8S_VERSION to set_common_default_params

Signed-off-by: Flavio Fernandes <[email protected]>

Author: flavio-fernandes

contrib/kind-common

@@ -32,6 +32,11 @@ if_error_exit() {
     fi
 }
 
+set_common_default_params() {
+  KIND_IMAGE=${KIND_IMAGE:-kindest/node}
+  K8S_VERSION=${K8S_VERSION:-v1.32.3}
+}
+
 run_kubectl() {
   local retries=0
   local attempts=10

contrib/kind-helm.sh

@@ -11,6 +11,7 @@ export OCI_BIN=${KIND_EXPERIMENTAL_PROVIDER:-docker}
 source "${DIR}/kind-common"
 
 set_default_params() {
+  set_common_default_params
 
   # Set default values
   export KIND_CONFIG=${KIND_CONFIG:-}
@@ -326,7 +327,7 @@ networking:
 EOT
 
     kind delete clusters $KIND_CLUSTER_NAME ||:
-    kind create cluster --name $KIND_CLUSTER_NAME --config "${KIND_CONFIG}" --retain
+    kind create cluster --name $KIND_CLUSTER_NAME --image "${KIND_IMAGE}":"${K8S_VERSION}" --config "${KIND_CONFIG}" --retain
     kind load docker-image --name $KIND_CLUSTER_NAME $OVN_IMAGE
 
     # When using HA, label nodes to host db.

contrib/kind.sh

@@ -512,6 +512,8 @@ set_openssl_binary() {
 }
 
 set_default_params() {
+  set_common_default_params
+
   # Set default values
   # Used for multi cluster setups
   KIND_CREATE=${KIND_CREATE:-true}
@@ -528,8 +530,6 @@ set_default_params() {
     MANIFEST_OUTPUT_DIR="${DIR}/../dist/yaml/${KIND_CLUSTER_NAME}"
   fi
   RUN_IN_CONTAINER=${RUN_IN_CONTAINER:-false}
-  KIND_IMAGE=${KIND_IMAGE:-kindest/node}
-  K8S_VERSION=${K8S_VERSION:-v1.32.3}
   OVN_GATEWAY_MODE=${OVN_GATEWAY_MODE:-shared}
   KIND_INSTALL_INGRESS=${KIND_INSTALL_INGRESS:-false}
   KIND_INSTALL_METALLB=${KIND_INSTALL_METALLB:-false}