[Airgap] switch to yq canonical format

Also check the yaml keys are there before trying recursion (which would led to erroring out with some yq parsers) Signed-off-by: Francesco Giudici <[email protected]>
rancher · Jan 31, 2025 · 3ccdb36 · 3ccdb36
1 parent f59db9e
commit 3ccdb36
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/scripts/elemental-airgap.sh b/scripts/elemental-airgap.sh
@@ -373,7 +373,10 @@ build_os_channel() {
 
     # defaultChannels has been introduced in 1.7 version
     # we can directly add the images in channel_list
-    get_chart_val channel_list "defaultChannels.*.image" "false"
+    get_chart_val channel_list "defaultChannels" "false"
+    if [ -n "$channel_list" ]; then
+        get_chart_val channel_list "defaultChannels[].image" "false"
+    fi
 
     if [[ -z "$channel_list" ]]; then
         # v1.4+ chart