This commit is contained in:
병준 박 2025-04-14 22:51:31 +00:00
parent 8f98cf5a2d
commit 855ca1d9ed

View File

@ -75,23 +75,28 @@ spec:
fi fi
done done
# Convert strings to arrays # Trim leading/trailing spaces
set -f KANIKO_FLAGS=$(echo "$KANIKO_FLAGS" | sed 's/^ *//;s/ *$//')
kanikoFlagArray=($KANIKO_FLAGS) ARGUMENT_KEYS=$(echo "$ARGUMENT_KEYS" | sed 's/^ *//;s/ *$//')
argumentKeyArray=($ARGUMENT_KEYS) SECRET_KEYS=$(echo "$SECRET_KEYS" | sed 's/^ *//;s/ *$//')
secretKeyArray=($SECRET_KEYS)
len=${#kanikoFlagArray[@]} # Count elements in each list
if [ "$len" -ne "${#argumentKeyArray[@]}" ] || [ "$len" -ne "${#secretKeyArray[@]}" ]; then count_flags=$(echo "$KANIKO_FLAGS" | wc -w)
echo "❌ Mismatched array lengths for flags, keys, or secrets." count_keys=$(echo "$ARGUMENT_KEYS" | wc -w)
count_secrets=$(echo "$SECRET_KEYS" | wc -w)
if [ "$count_flags" != "$count_keys" ] || [ "$count_flags" != "$count_secrets" ]; then
echo "❌ Mismatched counts for flags, keys, or secrets."
exit 1 exit 1
fi fi
KANIKO_ARGS="" KANIKO_ARGS=""
for i in $(seq 0 $(($len - 1))); do i=1
kanikoFlag="${kanikoFlagArray[$i]}" while [ "$i" -le "$count_flags" ]; do
argumentKey="${argumentKeyArray[$i]}" # Extract i-th element
secretKey="${secretKeyArray[$i]}" kanikoFlag=$(echo "$KANIKO_FLAGS" | cut -d' ' -f"$i")
argumentKey=$(echo "$ARGUMENT_KEYS" | cut -d' ' -f"$i")
secretKey=$(echo "$SECRET_KEYS" | cut -d' ' -f"$i")
if [ ! -f "$secretKey" ]; then if [ ! -f "$secretKey" ]; then
echo "❌ Missing secret file: $secretKey" echo "❌ Missing secret file: $secretKey"
@ -100,8 +105,13 @@ spec:
secretValue=$(cat "$secretKey") secretValue=$(cat "$secretKey")
KANIKO_ARGS="$KANIKO_ARGS $kanikoFlag=$argumentKey=$secretValue" KANIKO_ARGS="$KANIKO_ARGS $kanikoFlag=$argumentKey=$secretValue"
i=$((i + 1))
done done
# Trim leading/trailing spaces from final output
KANIKO_ARGS=$(echo "$KANIKO_ARGS" | sed 's/^ *//;s/ *$//')
echo "✅ Final Kaniko args:" echo "✅ Final Kaniko args:"
echo "$KANIKO_ARGS" echo "$KANIKO_ARGS"
echo -n "$KANIKO_ARGS" > /tekton/results/kanikoArgs echo -n "$KANIKO_ARGS" > /tekton/results/kanikoArgs