feat: 纳管共享 etcd 与 k3s 外 PostgreSQL 高可用及备份

infrastructure/etcd/terraform/.terraform.lock.hcl

@@ -0,0 +1,22 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/hashicorp/vault" {
+  version     = "4.8.0"
+  constraints = "~> 4.0"
+  hashes = [
+    "h1:aHqgWQhDBMeZO9iUKwJYMlh4q+xNMUlMIcjRbF4d02Y=",
+    "zh:269ab13433f67684012ae7e15876532b0312f5d0d2002a9cf9febb1279ce5ea6",
+    "zh:4babc95bf0c40eb85005db1dc2ca403c46be4a71dd3e409db3711a56f7a5ca0e",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:86e27c1c625ecc24446a11eeffc3ac319b36c2b4e51251db8579256a0dbcf136",
+    "zh:a32f31da94824009e26b077374440b52098aecb93c92ff55dc3d31dd37c4ea25",
+    "zh:be0a18c6c0425518bab4fbffd82078b82036a88503b5d76064de551c9f646cbf",
+    "zh:be5a77fdfd36863ebeec79cd12b1d13322ffad6821d157a0b279789fa06b5937",
+    "zh:be8317d142a3caad74c7d936039ae27076a1b2b8312ef5208e2871a5f525977c",
+    "zh:c94a84895a3d9954b80e983eed4603330a5cdbbd8eef5b3c99278c2d1402ef3c",
+    "zh:de1fb712784dd8415f011ca5346a34f87fab6046c730557615247e511dbc7d98",
+    "zh:e3eafae7da550f86cae395d6660b2a0e93ec8d2b0e0e5ef982ec762e961fc952",
+    "zh:ff35fb1ab6add288f0f368981e56f780b50405accd1937131cba1137999c8d83",
+  ]
+}

infrastructure/etcd/terraform/backend.tf

@@ -0,0 +1,15 @@
+# 与既有服务复用受限 tfstate 身份，使用独立对象与原生锁；不复用 Bao 的 state。
+terraform {
+  backend "s3" {
+    bucket                      = "tfstate"
+    key                         = "etcd/terraform.tfstate"
+    endpoints                   = { s3 = "https://s3.ad.ddupan.top" }
+    region                      = "us-east-1"
+    use_path_style              = true
+    skip_credentials_validation = true
+    skip_metadata_api_check     = true
+    skip_region_validation      = true
+    skip_requesting_account_id  = true
+    use_lockfile                = true
+  }
+}

infrastructure/etcd/terraform/main.tf

@@ -0,0 +1,93 @@
+terraform {
+  required_version = ">= 1.10"
+  required_providers {
+    vault = {
+      source  = "hashicorp/vault"
+      version = "~> 4.0"
+    }
+  }
+}
+
+provider "vault" {
+  address = var.bao_address
+}
+
+variable "bao_address" {
+  type    = string
+  default = "https://bao.ad.ddupan.top:8200"
+}
+variable "pki_mount" {
+  type    = string
+  default = "pki"
+}
+variable "kv_mount" {
+  type    = string
+  default = "kv"
+}
+variable "member_names" {
+  type    = list(string)
+  default = ["etcd-laptop", "etcd-pve1", "etcd-pve2"]
+}
+variable "consumer_names" {
+  type    = set(string)
+  default = ["patroni-pg-prod"]
+}
+
+# 仅管理既有 PKI 下的新 role/policy，不纳管 CA 私钥、mount 或秘密值。
+locals {
+  certificate_roles = {
+    server  = { names = var.member_names, server = true, client = false, ips = true }
+    peer    = { names = concat(var.member_names, ["homelab-etcd-peer"]), server = true, client = true, ips = true }
+    admin   = { names = ["root"], server = false, client = true, ips = false }
+    gateway = { names = var.member_names, server = false, client = true, ips = false }
+    client  = { names = [for name in var.consumer_names : "etcd-${name}"], server = false, client = true, ips = false }
+  }
+}
+resource "vault_pki_secret_backend_role" "etcd" {
+  for_each                    = local.certificate_roles
+  backend                     = var.pki_mount
+  name                        = "homelab-etcd-${each.key}"
+  allowed_domains             = each.value.names
+  allow_bare_domains          = true
+  allow_subdomains            = false
+  allow_glob_domains          = false
+  allow_any_name              = false
+  allow_localhost             = false
+  allow_wildcard_certificates = false
+  allow_ip_sans               = each.value.ips
+  server_flag                 = each.value.server
+  client_flag                 = each.value.client
+  key_type                    = "ec"
+  key_bits                    = 256
+  ttl                         = 5184000
+  max_ttl                     = 5184000
+  require_cn                  = !contains(["gateway", "client"], each.key)
+  use_csr_common_name         = true
+  use_csr_sans                = true
+}
+
+resource "vault_policy" "etcd_provisioner" {
+  name   = "homelab-etcd-provisioner"
+  policy = <<-EOT
+    path "${var.pki_mount}/sign/homelab-etcd-*" {
+      capabilities = ["update"]
+    }
+    path "${var.kv_mount}/metadata/infra/etcd/consumers/*" {
+      capabilities = ["read"]
+    }
+    path "${var.kv_mount}/data/infra/etcd/consumers/*" {
+      capabilities = ["create", "read", "update"]
+    }
+  EOT
+}
+
+# 身份绑定沿用既有控制端认证方式，创建 policy 不自动授权任何身份。
+resource "vault_policy" "etcd_consumer" {
+  for_each = var.consumer_names
+  name     = "homelab-etcd-${each.key}"
+  policy   = <<-EOT
+    path "${var.kv_mount}/data/infra/etcd/consumers/${each.key}" {
+      capabilities = ["read"]
+    }
+  EOT
+}

infrastructure/etcd/terraform/renewal.tf

@@ -0,0 +1,28 @@
+# 独立挂载：不接管全局认证，不保存长期 token，也不授权 KV 消费者秘密读取。
+data "vault_generic_secret" "etcd_ca" {
+  path = "${var.pki_mount}/cert/ca"
+}
+
+resource "vault_auth_backend" "etcd_renewal" {
+  type = "cert"
+  path = "homelab-etcd-renewal"
+}
+
+resource "vault_policy" "etcd_renewal" {
+  name = "homelab-etcd-renewal"
+  policy = join("\n", concat([
+    for kind in ["server", "peer", "admin", "gateway"] :
+    "path \"${var.pki_mount}/sign/homelab-etcd-${kind}\" { capabilities = [\"update\"] }"
+  ], ["path \"auth/token/revoke-self\" { capabilities = [\"update\"] }"]))
+}
+
+resource "vault_cert_auth_backend_role" "etcd_renewal" {
+  backend                 = vault_auth_backend.etcd_renewal.path
+  name                    = "etcd-laptop"
+  certificate             = data.vault_generic_secret.etcd_ca.data["certificate"]
+  allowed_dns_sans        = ["etcd-laptop"]
+  token_policies          = [vault_policy.etcd_renewal.name]
+  token_no_default_policy = true
+  token_ttl               = 600
+  token_max_ttl           = 900
+}