Skip to content

Commit 12ae9ae

Browse files
committed
[Airgap] extend yq support
The airgap script used to work with the Mike Farah's yq. Anyway, it was incompatible with the Andrey Kislyuk's yq version (which is the main python3 version you would get via pip). Drop the eval arg from yq in the airgap script to make it compatible with both. Signed-off-by: Francesco Giudici <[email protected]>
1 parent f4d7b6f commit 12ae9ae

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/elemental-airgap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ get_chart_val() {
207207
local local_fail=${3:-"true"}
208208
local local_condition="[[ \"\$$local_var\" == \"null\" ]]"
209209

210-
eval $local_var='$(helm show values $CHART_NAME_OPERATOR | eval yq eval '.${local_val}' | sed s/\"//g 2>&1)'
210+
eval $local_var='$(helm show values $CHART_NAME_OPERATOR | eval yq '.${local_val}' | sed s/\"//g 2>&1)'
211211
if eval $local_condition; then
212212
if [[ "$local_fail" == "false" ]]; then
213213
log_debug "cannot find $local_val in $CHART_NAME_OPERATOR"

0 commit comments

Comments
 (0)