Merge pull request #1477 from 0ekk/fix_kube_version

Fix kube_verion parsing

artifacts/gen_airgap_crs.py

@@ -3,6 +3,7 @@
 import sys
 import os
 import yaml
+import re
 from pathlib import Path
 from cr_template import CR_Template
 
@@ -71,6 +72,16 @@ def merge_spray_components_version_files(merged_file_path):
   elif os.path.exists(f"{checkpointPath3}/main.yml"):
     print("checkpoint path 3")
     merge_dir_content_to_file([checkpointPath3, sprayDefaultPath], merged_file_path)
+
+  f = None
+  with open(merged_file_path, "r") as file:
+    f = yaml.safe_load(file) 
+    if re.match(r".*{{.*", f.get("kube_version", "")):
+      f["kube_version"] = list(f['kubelet_checksums']['amd64'].keys())[0]
+
+  if f is not None:
+    with open(merged_file_path, "w") as file:
+      yaml.dump(f, file)
 
 
 def get_value_from_yml(yml_file_path, key):

build/images/kubespray/Dockerfile

@@ -25,6 +25,9 @@ RUN /usr/bin/python3 -m pip install --no-cache-dir pip -U \
 RUN ARCH="$(uname -m | sed -e 's/x86_64/amd64/' -e 's/\(arm\)\(64\)\?.*/\1\2/' -e 's/aarch64$/arm64/')" \
     && if [ -d 'roles/kubespray-defaults/defaults/main' ]; then \
          KUBE_VERSION=$(sed -n 's/^kube_version: //p' roles/kubespray-defaults/defaults/main/main.yml); \
+         if [[ "$KUBE_VERSION" == *{{* ]]; then \
+           KUBE_VERSION=$(python3 -c "import yaml,pathlib;f=pathlib.Path('roles/kubespray-defaults/defaults/main/checksums.yml');d=yaml.safe_load(f.read_text());print(list(d['kubelet_checksums']['amd64'].keys())[0])"); \
+         fi \
        else \
          KUBE_VERSION=$(sed -n 's/^kube_version: //p' roles/kubespray-defaults/defaults/main.yaml); \
        fi \