Update .forgejo/workflows/deploy.yaml
This commit is contained in:
parent
65b2d65b25
commit
ee1207e2d9
1 changed files with 10 additions and 10 deletions
|
|
@ -65,15 +65,15 @@ jobs:
|
||||||
|
|
||||||
kubectl delete secret backend-secrets -n gohorsejobsdev --ignore-not-found
|
kubectl delete secret backend-secrets -n gohorsejobsdev --ignore-not-found
|
||||||
|
|
||||||
# AJUSTE AQUI: Usando %s para evitar corrupção de caracteres e removendo decodificação dupla instável
|
# PEGA A SECRET, REMOVE ESPAÇOS E QUEBRAS DE LINHA QUE CAUSAM O ERRO UTF-8
|
||||||
if [ -n "${{ secrets.RSA_PRIVATE_KEY_BASE64 }}" ]; then
|
RAW_KEY="${{ secrets.RSA_PRIVATE_KEY_BASE64 || vars.RSA_PRIVATE_KEY_BASE64 }}"
|
||||||
echo "Processing RSA_PRIVATE_KEY_BASE64 from secrets"
|
CLEAN_KEY=$(echo "$RAW_KEY" | tr -d '[:space:]')
|
||||||
printf '%s' "${{ secrets.RSA_PRIVATE_KEY_BASE64 }}" > /tmp/rsa_key.base64
|
|
||||||
base64 -d /tmp/rsa_key.base64 > /tmp/rsa_key.pem || cp /tmp/rsa_key.base64 /tmp/rsa_key.pem
|
if [ -n "$CLEAN_KEY" ]; then
|
||||||
elif [ -n "${{ vars.RSA_PRIVATE_KEY_BASE64 }}" ]; then
|
echo "Processing RSA Key (Cleaning spaces and newlines)..."
|
||||||
echo "Processing RSA_PRIVATE_KEY_BASE64 from vars"
|
echo "$CLEAN_KEY" > /tmp/rsa_key.base64
|
||||||
printf '%s' "${{ vars.RSA_PRIVATE_KEY_BASE64 }}" > /tmp/rsa_key.base64
|
# Tenta decodificar. Se falhar (já for PEM), usa o original limpo.
|
||||||
base64 -d /tmp/rsa_key.base64 > /tmp/rsa_key.pem || cp /tmp/rsa_key.base64 /tmp/rsa_key.pem
|
base64 -d /tmp/rsa_key.base64 > /tmp/rsa_key.pem 2>/dev/null || cp /tmp/rsa_key.base64 /tmp/rsa_key.pem
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f /tmp/rsa_key.pem ]; then
|
if [ -f /tmp/rsa_key.pem ]; then
|
||||||
|
|
@ -98,6 +98,7 @@ jobs:
|
||||||
--from-file=private_key.pem=/tmp/rsa_key.pem \
|
--from-file=private_key.pem=/tmp/rsa_key.pem \
|
||||||
--dry-run=client -o yaml | kubectl apply -f -
|
--dry-run=client -o yaml | kubectl apply -f -
|
||||||
else
|
else
|
||||||
|
# Fallback caso a chave não exista
|
||||||
kubectl create secret generic backend-secrets -n gohorsejobsdev \
|
kubectl create secret generic backend-secrets -n gohorsejobsdev \
|
||||||
--from-literal=MTU="${{ vars.MTU }}" \
|
--from-literal=MTU="${{ vars.MTU }}" \
|
||||||
--from-literal=DATABASE_URL="${{ vars.DATABASE_URL }}" \
|
--from-literal=DATABASE_URL="${{ vars.DATABASE_URL }}" \
|
||||||
|
|
@ -116,7 +117,6 @@ jobs:
|
||||||
--from-literal=AWS_ENDPOINT="${{ vars.AWS_ENDPOINT }}" \
|
--from-literal=AWS_ENDPOINT="${{ vars.AWS_ENDPOINT }}" \
|
||||||
--from-literal=AWS_ACCESS_KEY_ID="${{ vars.AWS_ACCESS_KEY_ID }}" \
|
--from-literal=AWS_ACCESS_KEY_ID="${{ vars.AWS_ACCESS_KEY_ID }}" \
|
||||||
--from-literal=AWS_SECRET_ACCESS_KEY="${{ vars.AWS_SECRET_ACCESS_KEY }}" \
|
--from-literal=AWS_SECRET_ACCESS_KEY="${{ vars.AWS_SECRET_ACCESS_KEY }}" \
|
||||||
--from-literal=RSA_PRIVATE_KEY_BASE64="${{ vars.RSA_PRIVATE_KEY_BASE64 }}" \
|
|
||||||
--dry-run=client -o yaml | kubectl apply -f -
|
--dry-run=client -o yaml | kubectl apply -f -
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue