feat(helmchart): optimize HelmChartConfig

flux/README.md

@@ -11,9 +11,9 @@ flux/
 │       ├── kube-system.yaml             # CoreDNS / NodeLocalDNS
 │       ├── infra-devops.yaml            # cert-manager / reflector / velero
 │       ├── infra-data.yaml              # CNPG / Valkey
-│       ├── infra-monitor.yaml           # Loki / Prometheus
+│       ├── infra-monitor.yaml           # Loki / Prometheus (+ post: Promtail)
 │       ├── infra-net.yaml               # Nginx / CrowdSec / Tailscale
-│       ├── infra-gitops.yaml            # Gitea
+│       ├── infra-gitops.yaml            # Gitea (+ post: Gitea Actions / Flux Web)
 │       └── apps.yaml                    # Halo / RustDesk / Fillcode / SinceAI
 ├── infrastructure/
 │   ├── sources/                         # 所有 HelmRepository 定义
@@ -21,7 +21,71 @@ flux/
 │   ├── infra-devops/                    # cert-manager, webhook-dnspod, reflector, velero
 │   ├── infra-data/                      # CNPG operator, Barman, PG集群, Valkey
 │   ├── infra-net/                       # ingress-nginx, CrowdSec, Tailscale DERP, 证书
-│   ├── infra-monitor/                   # Loki, Promtail, Prometheus+Grafana
-│   └── infra-gitops/                    # Gitea, Gitea Actions
+│   ├── infra-monitor/                   # Loki, Prometheus+Grafana
+│   │   └── post/                        # Promtail（依赖 infra-net，打破循环）
+│   └── infra-gitops/                    # Gitea
+│       └── post/                        # Gitea Actions + flux-operator Web（OIDC/Ingress）
 └── apps/                                # Halo, RustDesk, Whoami, 证书, Ingress
 ```
+
+## 部署顺序
+
+```
+sources → secrets → kube-system → infra-devops → infra-data → infra-data-post
+       → infra-monitor → infra-net → infra-devops-post
+       → infra-monitor-post (Promtail)
+       → infra-gitops
+       → apps
+       → infra-gitops-post (suspend=true，需手工凭据)
+```
+
+Kustomization 间通过 `dependsOn` + `wait: true` 串行等待，避免顺序错乱。
+
+## 部署后手工步骤（infra-gitops-post）
+
+`infra-gitops-post` 默认 `suspend: true`，因为它依赖两类只能在 Gitea 启动后获取的凭据：
+
+1. **Flux Operator Web 的 OIDC 客户端**
+2. **Gitea Actions Runner Token**
+
+步骤：
+
+1. 浏览器访问 `https://git.dev.cm`，首个注册账号自动成为 admin。
+2. **创建 OAuth2 应用**：
+   - Site Administration → Integrations → Applications → Create OAuth2 Application
+   - Redirect URI: `https://cd.dev.cm/oauth2/callback`
+   - 记录 Client ID 与 Client Secret。
+3. **生成 Runner Token**：
+   - Site Administration → Actions → Runners → Create new Runner → 复制 registration token。
+4. 更新 `k3s/.env`：
+
+   ```
+   FLUX_WEB_OIDC_CLIENT_ID=<step 2 client id>
+   FLUX_WEB_OIDC_CLIENT_SECRET=<step 2 client secret>
+   GITEA_ACTIONS_TOKEN=<step 3 token>
+   ```
+
+5. 重新注入 `flux-env` Secret 并协调：
+
+   ```bash
+   kubectl -n infra-gitops create secret generic flux-env \
+     --from-env-file=k3s/.env \
+     --dry-run=client -o yaml | kubectl apply -f -
+
+   flux reconcile kustomization secrets -n infra-gitops
+   flux resume kustomization infra-gitops-post -n infra-gitops
+   flux reconcile kustomization infra-gitops-post -n infra-gitops --with-source
+   ```
+
+6. 验证：
+
+   ```bash
+   kubectl -n infra-gitops get helmrelease gitea-actions
+   kubectl -n infra-gitops get deploy flux-operator -o yaml | grep -A2 args   # 看到 --web-*
+   curl -I https://cd.dev.cm                                                    # 走 Gitea OIDC
+   ```
+
+## 为何拆出 \*-post 层？
+
+- **`infra-monitor-post` (Promtail)**：Promtail 依赖至少一个带 `devcm-log-collecting/enabled` 标签的 Pod（ingress-nginx）；而 `infra-net` 又依赖 `infra-monitor` 的 CRD。Promtail 放到 post 层并 `dependsOn: infra-net`，打破循环。
+- **`infra-gitops-post` (Gitea Actions + Flux Web)**：凭据必须在 Gitea 启动后手工创建；放在 post 层并默认 suspend，避免阻塞 bootstrap。