diff --git a/.gitea/docker/runner/Dockerfile b/.gitea/docker/runner/Dockerfile index 2e01784..2223720 100644 --- a/.gitea/docker/runner/Dockerfile +++ b/.gitea/docker/runner/Dockerfile @@ -1,7 +1,13 @@ +FROM hashicorp/terraform:1.9.8 AS terraform +FROM infisical/cli:latest AS infisical + FROM ubuntu:24.04 ENV DEBIAN_FRONTEND=noninteractive +COPY --from=terraform /bin/terraform /usr/local/bin/terraform +COPY --from=infisical /bin/infisical /usr/local/bin/infisical + RUN apt-get update && apt-get install -y --no-install-recommends \ git \ openssh-client \ @@ -10,6 +16,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ sshpass \ ca-certificates \ curl \ + jq \ && ansible-galaxy collection install ansible.posix community.general \ && rm -rf /var/lib/apt/lists/* +# Настройка зеркала Terraform (обход гео-блокировки registry.terraform.io) +RUN cat <<'EOF' > /root/.terraformrc +provider_installation { + network_mirror { + url = "https://terraform-mirror.yandexcloud.net/" + include = ["registry.terraform.io/*/*"] + } + direct { + exclude = ["registry.terraform.io/*/*"] + } +} +EOF diff --git a/.gitea/workflows/terraform.yml b/.gitea/workflows/terraform.yml index ffca6fb..52f1a82 100644 --- a/.gitea/workflows/terraform.yml +++ b/.gitea/workflows/terraform.yml @@ -16,37 +16,41 @@ jobs: terraform: runs-on: homelab container: - image: hashicorp/terraform:1.9.8 + image: homelab-ansible:latest timeout-minutes: 15 steps: - - name: Checkout repository - run: | - # В контейнере terraform git может отсутствовать, поэтому клонируем через рабочий каталог или curl/шаг checkout - echo "Запуск Terraform для Proxmox..." - - - name: Выполнить Terraform + - name: Выполнить Terraform для Proxmox (netcore) env: - TF_VAR_proxmox_endpoint: ${{ secrets.PVE_ENDPOINT }} + TF_VAR_proxmox_endpoint: ${{ secrets.PVE_ENDPOINT || 'https://192.168.1.100:8006/' }} TF_VAR_proxmox_api_token: ${{ secrets.PVE_API_TOKEN }} - TF_VAR_ssh_public_key: ${{ secrets.RUNNER_SSH_PUBKEY }} + RUNNER_SSH_KEY: ${{ secrets.RUNNER_SSH_KEY }} GITEA_TOKEN: ${{ secrets.GITEA_TOKEN || github.token }} ACTION: ${{ inputs.action }} run: | set -eu - # Клонируем проект (или переходим, если раннер уже подготовил workspace) - # Для совместимости с текущим окружением раннера - if [ -d "${HOME}/homelab-infra" ]; then - cd "${HOME}/homelab-infra/terraform" - else - cd "terraform" + rm -rf "${HOME}/homelab-infra" + git clone https://gitea.gunihome.ru/karpenok/homelab-infra.git "${HOME}/homelab-infra" + sha="${GITHUB_SHA:-${GITEA_SHA:-}}" + if [ -n "${sha}" ]; then + git -C "${HOME}/homelab-infra" checkout "${sha}" fi - # Инициализация с Gitea HTTP Backend для безопасного хранения стейта + if [ -n "${RUNNER_SSH_KEY:-}" ]; then + install -d -m 700 "${HOME}/.ssh" + printf '%s\n' "${RUNNER_SSH_KEY}" > "${HOME}/.ssh/id_ed25519" + chmod 600 "${HOME}/.ssh/id_ed25519" + eval "$(ssh-agent -s)" >/dev/null + ssh-add "${HOME}/.ssh/id_ed25519" 2>/dev/null + trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT + fi + + cd "${HOME}/homelab-infra/terraform" + terraform init \ - -backend-config="address=https://gitea.gunihome.ru/api/v1/packages/karpenok/terraform/state/proxmox" \ - -backend-config="lock_address=https://gitea.gunihome.ru/api/v1/packages/karpenok/terraform/state/proxmox/lock" \ - -backend-config="unlock_address=https://gitea.gunihome.ru/api/v1/packages/karpenok/terraform/state/proxmox/lock" \ + -backend-config="address=https://gitea.gunihome.ru/api/v1/packages/karpenok/terraform/state/netcore" \ + -backend-config="lock_address=https://gitea.gunihome.ru/api/v1/packages/karpenok/terraform/state/netcore/lock" \ + -backend-config="unlock_address=https://gitea.gunihome.ru/api/v1/packages/karpenok/terraform/state/netcore/lock" \ -backend-config="username=karpenok" \ -backend-config="password=${GITEA_TOKEN}" \ -backend-config="lock_method=POST" \ @@ -58,4 +62,3 @@ jobs: elif [ "${ACTION}" = "apply" ]; then terraform apply -auto-approve fi - diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl new file mode 100644 index 0000000..476f624 --- /dev/null +++ b/terraform/.terraform.lock.hcl @@ -0,0 +1,25 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/bpg/proxmox" { + version = "0.70.1" + constraints = "~> 0.70.0" + hashes = [ + "h1:vd6g2B0GKtx5Q6XsJ34QzUMZMN89+wo6Z92/+eO3rjE=", + "zh:1f3ca7b12fad410a3689e30f058ce210a8f4e5a13b25c5862acb62c9a6859cd5", + "zh:2669b0548f039e874a9f84362960fb5a479144a9c5bd3c1626b3aa9ec2b41e26", + "zh:313be32be4665f0d170b4065d57e530486b575081be1e27d793c6c9ac6bb1d42", + "zh:360ace6cffba80029a14a3b155a9ffe6c55419236e6b933c011edee1c2e5fc60", + "zh:3bc6e7617ba7ed1db1a3c89242714a1a4484ead154784a8fa62633124e8ebfaa", + "zh:3cc33cedb2bafff05ddf293525e1251ea82480e8298b3bfe51a75fc0ab2e53a7", + "zh:61fba29acaed2382f58af39c920207f8d2e62f1be79caa5ef9fa5b60bd90c740", + "zh:97d1495869da236220168c818496a4b49576fab29ff7a031e41baafc82e767b6", + "zh:9ef6047197682930c8144b1faeeeb42247bf1b07048a6ac37ff18e7965df40fd", + "zh:b30d58f33159028ab9e1d62353df9443efacd920497636c573d20beb3ad6aae0", + "zh:bf931b6de0ceae50a82183ca23a314f646068495514f27fb78a9ca66b2275ad3", + "zh:e071099e8ae796a1a57ac55b3340ede4b497c2666b12a84809c3df0c7a851a42", + "zh:e35790628fd80ff201292765e28db9cacc0db194df884d37bc5bac52ed86113c", + "zh:f26e0763dbe6a6b2195c94b44696f2110f7f55433dc142839be16b9697fa5597", + "zh:f2ae152820737ca4435c0a96c74dd84fea2e0fa90a53c52658d1d3c5598af2aa", + ] +} diff --git a/terraform/lxc.tf b/terraform/lxc.tf index 63eff9c..2e04131 100644 --- a/terraform/lxc.tf +++ b/terraform/lxc.tf @@ -1,41 +1,38 @@ -# Пример базового непривилегированного LXC контейнера -# Измените параметры (vm_id, hostname, ip, storage) под свою сеть - -resource "proxmox_virtual_environment_container" "basic_app" { - description = "Managed by Terraform: basic unprivileged LXC" +resource "proxmox_virtual_environment_container" "core_net" { + description = "Managed by Terraform: core-net Ingress Gateway (Traefik)" node_name = var.proxmox_node - vm_id = 200 + vm_id = 902 unprivileged = true + started = true initialization { - hostname = "app-01" + hostname = "core-net" ip_config { ipv4 { - address = "192.168.1.200/24" + address = "192.168.1.104/24" gateway = "192.168.1.1" } } user_account { - keys = [var.ssh_public_key] + keys = var.ssh_public_keys } } network_interface { name = "eth0" - bridge = "vmbr0" + bridge = "vmbr10" } operating_system { - # Путь к загруженному шаблону на ноде Proxmox - template_file_id = "local:vztmpl/debian-12-standard_12.7-1_amd64.tar.zst" + template_file_id = "local:vztmpl/debian-13-standard_13.6-1_amd64.tar.zst" type = "debian" } cpu { - cores = 1 + cores = 2 } memory { @@ -44,8 +41,12 @@ resource "proxmox_virtual_environment_container" "basic_app" { } disk { - datastore_id = "local-zfs" + datastore_id = "local-lvm" size = 10 } -} + features { + nesting = true + keyctl = true + } +} diff --git a/terraform/outputs.tf b/terraform/outputs.tf index ecaf969..4250ee9 100644 --- a/terraform/outputs.tf +++ b/terraform/outputs.tf @@ -1,10 +1,9 @@ -output "basic_app_id" { - description = "ID созданного LXC контейнера" - value = proxmox_virtual_environment_container.basic_app.vm_id +output "core_net_id" { + description = "VMID контейнера core-net" + value = proxmox_virtual_environment_container.core_net.vm_id } -output "basic_app_ip" { - description = "IPv4 адрес созданного контейнера" - value = proxmox_virtual_environment_container.basic_app.initialization[0].ip_config[0].ipv4[0].address +output "core_net_ip" { + description = "IPv4 адрес контейнера core-net" + value = proxmox_virtual_environment_container.core_net.initialization[0].ip_config[0].ipv4[0].address } - diff --git a/terraform/terraform.tfvars.example b/terraform/terraform.tfvars.example index fc8817b..21f95ff 100644 --- a/terraform/terraform.tfvars.example +++ b/terraform/terraform.tfvars.example @@ -2,8 +2,6 @@ # Скопируйте в terraform.tfvars (файл уже в .gitignore) proxmox_endpoint = "https://192.168.1.100:8006/" -proxmox_api_token = "terraform@pve!runner=00000000-0000-0000-0000-000000000000" +proxmox_api_token = "root@pam!terraform=00000000-0000-0000-0000-000000000000" proxmox_insecure = true -proxmox_node = "pve" -ssh_public_key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEpwqB40k8QQq3k8160gfMKDaCJCX9qzvmuijfe3mO4I gitea-runner" - +proxmox_node = "netcore" diff --git a/terraform/variables.tf b/terraform/variables.tf index a39768d..b3d1454 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -1,6 +1,7 @@ variable "proxmox_endpoint" { - description = "URL Proxmox API (например, https://192.168.1.100:8006/)" + description = "URL Proxmox API (по умолчанию netcore)" type = string + default = "https://192.168.1.100:8006/" } variable "proxmox_api_token" { @@ -16,13 +17,16 @@ variable "proxmox_insecure" { } variable "proxmox_node" { - description = "Имя ноды Proxmox (например, pve)" + description = "Имя ноды Proxmox" type = string - default = "pve" + default = "netcore" } -variable "ssh_public_key" { - description = "Публичный SSH-ключ для доступа к создаваемым контейнерам" - type = string +variable "ssh_public_keys" { + description = "Список публичных SSH-ключей для доступа к создаваемым контейнерам" + type = list(string) + default = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF/yxhAs022l/8FlPlhyi7NeF3CvVGsev3B1HtKICO7M root_from_windows", + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEpwqB40k8QQq3k8160gfMKDaCJCX9qzvmuijfe3mO4I gitea-runner" + ] } -