From 2b6ab5899dc779864617c0134e30f9c26f21d15b Mon Sep 17 00:00:00 2001 From: Mukul Sharma Date: Thu, 17 Sep 2026 19:10:41 +0530 Subject: [PATCH] Undo the Terraform bootstrap claim for ArgoCD toolshed-gke-infra's 20-bootstrap is superseded and never applied; ArgoCD on GKE was installed by hand as argocd-admin-prd, as the header originally said. Reverts c83d535 and corrects the same claim in the argo-cd README. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01Fn2kUxyYNY4ApytbLiGWeY --- .../argocd-admin-prd/custom-values.yaml | 9 +++------ helm-templates/argo-cd/README.md | 8 +++++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/helm-overrides/gke-toolshed-prd-usc1/argocd-admin-prd/custom-values.yaml b/helm-overrides/gke-toolshed-prd-usc1/argocd-admin-prd/custom-values.yaml index 37781de..ad94033 100644 --- a/helm-overrides/gke-toolshed-prd-usc1/argocd-admin-prd/custom-values.yaml +++ b/helm-overrides/gke-toolshed-prd-usc1/argocd-admin-prd/custom-values.yaml @@ -2,12 +2,9 @@ argo-cd: # GKE counterpart of the homelab's argocd-admin-prd override # (k8s-admin-prd-ase1, in the homelab devops-infra-helm-charts repo). # - # Bootstrapped by Terraform, not by hand: toolshed-gke-infra's - # envs/prod/20-bootstrap/argocd.tf installs the upstream argo-cd chart - # directly (release "argo-cd", namespace "argocd") with its own inline - # values. After that, ArgoCD manages itself through the argocd Application - # in devops-infra-argo-config-gcp (nameOverride "argocd-admin-prd"), which - # renders this wrapper chart with the values in this file. + # Installed once by hand with `helm install argocd-admin-prd` (namespace + # "argocd"), then manages itself through the argocd Application in + # devops-infra-argo-config-gcp, whose nameOverride matches that release. # Deliberately no image tag pin, unlike the homelab: the chart's own # appVersion (v3.5.2) governs, so the image cannot drift from the chart. # A pin that outlives its chart is close to the failure this upgrade diff --git a/helm-templates/argo-cd/README.md b/helm-templates/argo-cd/README.md index 4cea78d..725f1dc 100644 --- a/helm-templates/argo-cd/README.md +++ b/helm-templates/argo-cd/README.md @@ -9,9 +9,11 @@ so every step here is a manual, imperative command run once. > **Homelab only.** Every `k8s-admin-prd-ase1` path below lives in the > homelab `devops-infra-helm-charts` / `devops-infra-argo-config` repos, not -> in this GCP copy. On GKE, ArgoCD is installed by Terraform -> (`toolshed-gke-infra/envs/prod/20-bootstrap/argocd.tf`), and its values -> live in `helm-overrides/gke-toolshed-prd-usc1/argocd-admin-prd/`. +> in this GCP copy. On GKE the same steps apply with +> `helm-overrides/gke-toolshed-prd-usc1/argocd-admin-prd/custom-values.yaml` +> and `devops-infra-argo-config-gcp`'s +> `values/incubator-infra-gke-toolshed-prd-usc1-values.yaml`. +> `toolshed-gke-infra/envs/prod/20-bootstrap` is superseded and not applied. ## 0. Full uninstall (only if resetting)