Skip to content

Commit 0e7952f

Browse files
authored
Merge pull request #2789 from mboersma/base64-fix-again
Make base64 usage more portable in e2e setup
2 parents cfdbb1b + 5e5cf40 commit 0e7952f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

hack/util.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ capz::util::generate_ssh_key() {
6060
ssh-keygen -t rsa -b 2048 -f "${SSH_KEY_FILE}" -N '' 1>/dev/null
6161
AZURE_SSH_PUBLIC_KEY_FILE="${SSH_KEY_FILE}.pub"
6262
fi
63-
AZURE_SSH_PUBLIC_KEY_B64=$(base64 "${AZURE_SSH_PUBLIC_KEY_FILE}" | tr -d '\r\n')
63+
AZURE_SSH_PUBLIC_KEY_B64=$(base64 < "${AZURE_SSH_PUBLIC_KEY_FILE}" | tr -d '\r\n')
6464
export AZURE_SSH_PUBLIC_KEY_B64
6565
# Windows sets the public key via cloudbase-init which take the raw text as input
6666
AZURE_SSH_PUBLIC_KEY=$(tr -d '\r\n' < "${AZURE_SSH_PUBLIC_KEY_FILE}")

0 commit comments

Comments
 (0)