refactor: split machine deploys from one-time secrets migration
ansible-core-net / deploy (push) Failing after 39s
ansible-core-secrets / deploy (push) Successful in 30s
ansible-rus-central / deploy (push) Failing after 15s

Roles stay under the machine that runs them, CI applies only a known product, and the /opt/secrets move is a one-shot playbook instead of part of every core-secrets run.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
karpenokandCursor committed 2026-11-10 23:55:34 +07:00
1 parent 341538fba9
commit 9c692522fb
85 files changed
+537 -492

No files matched your search

+11 -59
View File
@@ -5,9 +5,14 @@ on:
branches:
- main
paths:
- 'ansible/roles/core_net/**'
- 'ansible/roles/authentik/**'
- 'ansible/playbooks/core_net.yml'
- 'ansible/roles/core-net/**'
- 'ansible/roles/host/**'
- 'ansible/playbooks/core-net.yml'
- 'ansible/playbooks/host.yml'
- 'ansible/playbooks/site.yml'
- 'ansible/inventories/prod/hosts.yml'
- 'ansible/inventories/prod/group_vars/**'
- 'ansible/ci/**'
workflow_dispatch:
jobs:
@@ -15,72 +20,19 @@ jobs:
runs-on: homelab
container:
image: homelab-ansible:latest
timeout-minutes: 15
timeout-minutes: 30
steps:
- name: Деплой Traefik на core-net через Ansible
- name: Деплой core-net
env:
INFISICAL_CLIENT_ID: ${{ secrets.INFISICAL_CLIENT_ID }}
INFISICAL_CLIENT_SECRET: ${{ secrets.INFISICAL_CLIENT_SECRET }}
run: |
set -eu
# Прямое подключение к Infisical (CT 901) без зависимости от Traefik
export INFISICAL_PROJECT_ID="806e7f09-5838-492a-946b-2d69b96876ab"
export INFISICAL_DOMAIN="http://192.168.1.102:8080/api"
TOKEN=$(infisical login \
--domain="${INFISICAL_DOMAIN}" \
--method=universal-auth \
--client-id="${INFISICAL_CLIENT_ID}" \
--client-secret="${INFISICAL_CLIENT_SECRET}" \
--plain)
# Экспорт SSH-ключа раннера из /ci-cd
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/ci-cd" --format=dotenv-export --silent)"
# Проверяем наличие секретов Authentik в /services/authentik.
# При первом запуске раннер сам генерирует их и сохраняет в Infisical (Zero-Knowledge).
if ! infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent 2>/dev/null | grep -q 'AUTHENTIK_SECRET_KEY'; then
infisical secrets-manager folders create authentik --path /services --env prod --projectId "${INFISICAL_PROJECT_ID}" --domain "${INFISICAL_DOMAIN}" --token "${TOKEN}" --silent 2>/dev/null || true
GEN_SECRET_KEY=$(openssl rand -base64 48 | tr -dc 'a-zA-Z0-9' | head -c 50)
GEN_PG_PASS=$(openssl rand -hex 20)
infisical secrets set --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" \
"AUTHENTIK_SECRET_KEY=${GEN_SECRET_KEY}" \
"AUTHENTIK_POSTGRES_PASSWORD=${GEN_PG_PASS}" \
--silent
unset GEN_SECRET_KEY GEN_PG_PASS
fi
# Экспорт секретов Authentik из /services/authentik
eval "$(infisical export --domain="${INFISICAL_DOMAIN}" --token="${TOKEN}" --env=prod --projectId="${INFISICAL_PROJECT_ID}" --path="/services/authentik" --format=dotenv-export --silent)"
export AUTHENTIK_SECRET_KEY="${AUTHENTIK_SECRET_KEY:-}"
export AUTHENTIK_POSTGRES_PASSWORD="${AUTHENTIK_POSTGRES_PASSWORD:-}"
if [ -z "${RUNNER_SSH_KEY:-}" ]; then
echo "В Infisical (/ci-cd) отсутствует RUNNER_SSH_KEY" >&2
exit 1
fi
rm -rf "${HOME}/homelab-infra"
# Клонируем по прямому IP Gitea (192.168.1.217:3000), чтобы не зависеть от состояния Traefik/DNS
git clone http://192.168.1.217:3000/karpenok/homelab-infra.git "${HOME}/homelab-infra"
sha="${GITHUB_SHA:-${GITEA_SHA:-}}"
if [ -n "${sha}" ]; then
git -C "${HOME}/homelab-infra" checkout "${sha}"
fi
chmod -R go-w "${HOME}/homelab-infra"
# Настраиваем SSH-ключ раннера
install -d -m 700 "${HOME}/.ssh"
printf '%s\n' "${RUNNER_SSH_KEY}" > "${HOME}/.ssh/id_ed25519"
chmod 600 "${HOME}/.ssh/id_ed25519"
trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT
cd "${HOME}/homelab-infra/ansible"
export ANSIBLE_HOST_KEY_CHECKING=False
ansible-playbook playbooks/core_net.yml \
-i inventories/prod/hosts.yml \
--private-key "${HOME}/.ssh/id_ed25519"
exec bash "${HOME}/homelab-infra/ansible/ci/deploy-machine.sh" core-net "${{ github.event_name }}" "${{ github.event.before }}" "${{ github.sha }}"