From 321c78fc27b48a000eede7f0a5ade0a1a259370a Mon Sep 17 00:00:00 2001 From: karpenok Date: Fri, 13 Nov 2026 23:09:05 +0700 Subject: [PATCH] =?UTF-8?q?fix(core-git):=20=D0=BD=D0=B5=20=D1=82=D0=B5?= =?UTF-8?q?=D1=80=D1=8F=D1=82=D1=8C=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=20?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=BD=D0=B5=D1=80=D0=B0=20=D0=B8=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=B5=D0=BF=D0=BB=D0=BE=D0=B8=D1=82=D1=8C=20?= =?UTF-8?q?=D0=B8=D0=B7-=D0=B7=D0=B0=20=D0=BF=D1=83=D1=81=D1=82=D0=BE?= =?UTF-8?q?=D0=B3=D0=BE=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Архив homelab-ansible хранится на диске CT, проверка раннера вынесена в отдельную кнопку, cAdvisor смотрит свой порт. Co-authored-by: Cursor --- .gitea/workflows/runner-smoke.yml | 17 +++++++++++ BOOTSTRAP.md | 6 ++-- ansible/ci/ansible-target.sh | 2 ++ .../roles/cadvisor/templates/compose.yaml.j2 | 6 ++++ ansible/roles/core-git/gitea/tasks/main.yml | 14 ++++++++++ .../core-git/gitea/templates/compose.yaml.j2 | 1 + .../gitea/templates/ensure-runner-image.sh.j2 | 28 +++++++++++++++++++ .../core-net/traefik/files/dynamic/gitea.yml | 4 --- scripts/check-core-git-lxc.sh | 14 ++++++++++ terraform/netcore/core-git.tf | 4 ++- 10 files changed, 89 insertions(+), 7 deletions(-) create mode 100644 .gitea/workflows/runner-smoke.yml create mode 100644 ansible/roles/core-git/gitea/templates/ensure-runner-image.sh.j2 create mode 100755 scripts/check-core-git-lxc.sh diff --git a/.gitea/workflows/runner-smoke.yml b/.gitea/workflows/runner-smoke.yml new file mode 100644 index 0000000..66a8024 --- /dev/null +++ b/.gitea/workflows/runner-smoke.yml @@ -0,0 +1,17 @@ +name: runner-smoke + +on: + workflow_dispatch: + +jobs: + smoke: + runs-on: homelab + container: + image: homelab-ansible:latest + timeout-minutes: 10 + steps: + - name: Образ задач поднимается + run: | + set -eu + ansible --version + echo "runner-smoke ok" diff --git a/BOOTSTRAP.md b/BOOTSTRAP.md index cc24ecd..f1720a5 100644 --- a/BOOTSTRAP.md +++ b/BOOTSTRAP.md @@ -151,8 +151,10 @@ API Endpoint (внутренний LAN): `http://192.168.1.102:8080/api` 1. Поднять CT 904 (`192.168.1.105`), стек в `/opt/gitea` (`docker compose up -d`). 2. UI: `https://gitea.gunihome.ru` или `http://192.168.1.105:3000`. 3. Git SSH: `gitea.internal:222`. DNS: `gitea.internal` → `.105` (старый CT 109 — `gitea-old.internal`). -4. Раннер `homelab` = idle. -5. Rollback: на CT 109 каталог `/root/docker/gitea/`, стек остановлен; Traefik/DNS вернуть на `.217` при необходимости. +4. Раннер `homelab` = idle. Образ задач `homelab-ansible:latest` лежит архивом в `/opt/gitea/images/` и подмонтирован в раннер. Если внутренний диск раннера очистили, `/opt/gitea/ensure-runner-image.sh` загружает образ из архива. В Docker Hub этого образа нет. +5. В `/etc/pve/lxc/904.conf` на netcore должна быть строка `lxc.apparmor.profile: unconfined`. Проверка со станции: `scripts/check-core-git-lxc.sh`. Без неё задачи падают сразу, хотя сайт Gitea открывается. После смены строки контейнер надо перезагрузить. +6. Проверка раннера — кнопка workflow `runner-smoke`, не правка файлов деплоя. +7. Rollback: CT 109, каталог `/root/docker/gitea/`, файл запуска `compose.yaml` (ссылка на `docker compose.yml`). Стек не запущен. Поднятие: `docker compose up -d` в этом каталоге, Traefik и DNS вернуть на `.217`. Не удалять, пока новая машина спокойно работает. ### Шаг 3. Хранилище секретов Infisical (CT 901) > [!IMPORTANT] diff --git a/ansible/ci/ansible-target.sh b/ansible/ci/ansible-target.sh index 2e6216b..0d09559 100755 --- a/ansible/ci/ansible-target.sh +++ b/ansible/ci/ansible-target.sh @@ -74,6 +74,8 @@ if [ "$full" -eq 0 ] && [ -n "$changed" ]; then core-net | ger-nod-02) add_tag vmagent ;; esac ;; + ansible/roles/"$machine"/.ci-trigger) + ;; ansible/roles/"$machine"/*/*) product=${file#ansible/roles/"$machine"/} product=${product%%/*} diff --git a/ansible/roles/cadvisor/templates/compose.yaml.j2 b/ansible/roles/cadvisor/templates/compose.yaml.j2 index 7509400..f441631 100644 --- a/ansible/roles/cadvisor/templates/compose.yaml.j2 +++ b/ansible/roles/cadvisor/templates/compose.yaml.j2 @@ -18,3 +18,9 @@ services: - /dev/disk:/dev/disk:ro ports: - "{{ cadvisor_port }}:{{ cadvisor_port }}" + healthcheck: + test: ["CMD", "wget", "--spider", "-q", "http://127.0.0.1:{{ cadvisor_port }}/healthz"] + interval: 30s + timeout: 5s + retries: 3 + start_period: 10s diff --git a/ansible/roles/core-git/gitea/tasks/main.yml b/ansible/roles/core-git/gitea/tasks/main.yml index e818650..75293e9 100644 --- a/ansible/roles/core-git/gitea/tasks/main.yml +++ b/ansible/roles/core-git/gitea/tasks/main.yml @@ -51,6 +51,7 @@ - { path: "{{ gitea_dir }}/gitea", owner: "root", group: "root", mode: "0755" } - { path: "{{ gitea_dir }}/postgres", owner: "999", group: "999", mode: "0700" } - { path: "{{ gitea_dir }}/runner-data", owner: "root", group: "root", mode: "0700" } + - { path: "{{ gitea_dir }}/images", owner: "root", group: "root", mode: "0700" } - name: Установить compose.yaml для Gitea ansible.builtin.template: @@ -71,3 +72,16 @@ 'Recreated' in gitea_compose_up.stderr or 'Pulled' in gitea_compose_up.stderr when: gitea_stack_ready + +- name: Скрипт архива образа homelab-ansible + ansible.builtin.template: + src: ensure-runner-image.sh.j2 + dest: "{{ gitea_dir }}/ensure-runner-image.sh" + owner: root + group: root + mode: "0700" + when: gitea_runner_enabled + +- name: Образ homelab-ansible в раннере или в архиве + ansible.builtin.command: "{{ gitea_dir }}/ensure-runner-image.sh" + when: gitea_runner_enabled and gitea_stack_ready diff --git a/ansible/roles/core-git/gitea/templates/compose.yaml.j2 b/ansible/roles/core-git/gitea/templates/compose.yaml.j2 index 831b66c..f39f68a 100644 --- a/ansible/roles/core-git/gitea/templates/compose.yaml.j2 +++ b/ansible/roles/core-git/gitea/templates/compose.yaml.j2 @@ -72,5 +72,6 @@ services: - gitea volumes: - {{ gitea_dir }}/runner-data:/data + - {{ gitea_dir }}/images:/images:ro - runner-docker:/var/lib/docker {% endif %} diff --git a/ansible/roles/core-git/gitea/templates/ensure-runner-image.sh.j2 b/ansible/roles/core-git/gitea/templates/ensure-runner-image.sh.j2 new file mode 100644 index 0000000..d06e20c --- /dev/null +++ b/ansible/roles/core-git/gitea/templates/ensure-runner-image.sh.j2 @@ -0,0 +1,28 @@ +#!/bin/bash +# Образ homelab-ansible есть только на этой машине. Архив лежит на диске CT, +# не внутри volume DinD: очистка volume его не стирает. +set -euo pipefail + +archive="{{ gitea_dir }}/images/homelab-ansible.tar" +container_archive="/images/homelab-ansible.tar" + +if docker exec gitea-runner docker image inspect homelab-ansible:latest >/dev/null 2>&1; then + if [ ! -s "$archive" ]; then + mkdir -p "{{ gitea_dir }}/images" + docker exec gitea-runner docker save homelab-ansible:latest > "$archive" + chmod 600 "$archive" + echo "saved ${archive}" + else + echo "present" + fi + exit 0 +fi + +if [ -s "$archive" ]; then + docker exec gitea-runner docker load -i "$container_archive" + echo "loaded" + exit 0 +fi + +echo "Образ homelab-ansible:latest не найден ни в раннере, ни в ${archive}" >&2 +exit 1 diff --git a/ansible/roles/core-net/traefik/files/dynamic/gitea.yml b/ansible/roles/core-net/traefik/files/dynamic/gitea.yml index b7adb81..c651585 100644 --- a/ansible/roles/core-net/traefik/files/dynamic/gitea.yml +++ b/ansible/roles/core-net/traefik/files/dynamic/gitea.yml @@ -14,7 +14,3 @@ http: loadBalancer: servers: - url: "http://192.168.1.105:3000" - -# cutover 2026-11-13T22:27:58+07:00 -# 2026-11-13T22:33:42+07:00 -# 2026-11-13T22:35:53+07:00 diff --git a/scripts/check-core-git-lxc.sh b/scripts/check-core-git-lxc.sh new file mode 100755 index 0000000..4cae845 --- /dev/null +++ b/scripts/check-core-git-lxc.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# Со станции. Terraform не умеет записать AppArmor для CT 904. +set -euo pipefail + +line=$(ssh -o BatchMode=yes netcore 'grep -E "^lxc.apparmor.profile:" /etc/pve/lxc/904.conf' || true) +if [ "$line" = "lxc.apparmor.profile: unconfined" ]; then + echo "ok: $line" + exit 0 +fi + +echo "В /etc/pve/lxc/904.conf нет lxc.apparmor.profile: unconfined" >&2 +echo "Сейчас: ${line:-пусто}" >&2 +echo "Без этой строки задачи Gitea падают на старте контейнера. После правки CT надо перезагрузить." >&2 +exit 1 diff --git a/terraform/netcore/core-git.tf b/terraform/netcore/core-git.tf index dc2e5c0..d82a2a0 100644 --- a/terraform/netcore/core-git.tf +++ b/terraform/netcore/core-git.tf @@ -56,5 +56,7 @@ resource "proxmox_virtual_environment_container" "core_git" { # DinD (Gitea Actions) на unprivileged LXC: без unconfined AppArmor # runc падает на net.ipv4.ip_unprivileged_port_start (permission denied). # Провайдер bpg/proxmox это поле не умеет — строка в /etc/pve/lxc/904.conf - # на netcore: lxc.apparmor.profile: unconfined (уже выставлено вручную). + # на netcore: lxc.apparmor.profile: unconfined. + # После apply со станции: scripts/check-core-git-lxc.sh + # Смена профиля действует после ребута CT. }