infra: wire GKE cluster endpoint and fix gitea SA account_id
- Replace GKE_CLUSTER_ENDPOINT placeholder with real endpoint (34.63.89.52) in all three Argo CD Application manifests - Fix gitea GCP SA account_id from 'gitea' (5 chars, too short) to 'gitea-gke' to satisfy GCP's 6-30 char constraint - Update serviceaccount.yaml annotation to match new SA email (gitea-gke@...)
This commit is contained in:
@@ -174,7 +174,7 @@ resource "google_sql_user" "gitea" {
|
||||
# ── Gitea service account (for Workload Identity → Cloud SQL) ─────────────────
|
||||
|
||||
resource "google_service_account" "gitea" {
|
||||
account_id = "gitea"
|
||||
account_id = "gitea-gke"
|
||||
display_name = "Gitea GKE SA"
|
||||
description = "Service account for the Gitea pod on GKE. Used by the Cloud SQL Auth Proxy sidecar via Workload Identity."
|
||||
project = var.project_id
|
||||
|
||||
@@ -27,7 +27,7 @@ spec:
|
||||
destination:
|
||||
# Replace GKE_CLUSTER_ENDPOINT after `terraform apply`:
|
||||
# terraform -chdir=servers/gcp output -raw gke_cluster_endpoint
|
||||
server: https://GKE_CLUSTER_ENDPOINT
|
||||
server: https://34.63.89.52
|
||||
namespace: gitea
|
||||
syncPolicy:
|
||||
automated:
|
||||
|
||||
@@ -22,7 +22,7 @@ spec:
|
||||
destination:
|
||||
# Replace GKE_CLUSTER_ENDPOINT after `terraform apply`:
|
||||
# terraform -chdir=servers/gcp output -raw gke_cluster_endpoint
|
||||
server: https://GKE_CLUSTER_ENDPOINT
|
||||
server: https://34.63.89.52
|
||||
namespace: vault
|
||||
syncPolicy:
|
||||
automated:
|
||||
|
||||
@@ -142,7 +142,7 @@ spec:
|
||||
destination:
|
||||
# Replace GKE_CLUSTER_ENDPOINT after `terraform apply`:
|
||||
# terraform -chdir=servers/gcp output -raw gke_cluster_endpoint
|
||||
server: https://GKE_CLUSTER_ENDPOINT
|
||||
server: https://34.63.89.52
|
||||
namespace: vault
|
||||
syncPolicy:
|
||||
automated:
|
||||
|
||||
@@ -7,4 +7,4 @@ metadata:
|
||||
# Workload Identity — allows the Cloud SQL Auth Proxy sidecar to authenticate
|
||||
# to Cloud SQL as the gitea GCP SA without a JSON key file.
|
||||
# The GCP SA binding is in servers/gcp/gke.tf (gitea_workload_identity).
|
||||
iam.gke.io/gcp-service-account: gitea@neuron-785695.iam.gserviceaccount.com
|
||||
iam.gke.io/gcp-service-account: gitea-gke@neuron-785695.iam.gserviceaccount.com
|
||||
|
||||
Reference in New Issue
Block a user