feat: multi-repo overlay architecture for addon values

cluster-providers/kind-crossplane/Taskfile.yaml

@@ -380,6 +380,9 @@ tasks:
             fleetRepoURL: "REPO_URL"
             fleetRepoRevision: "REPO_REVISION"
             fleetRepoBasepath: "REPO_BASEPATH"
+            overlay_repo_url: ""
+            overlay_repo_revision: ""
+            overlay_repo_basepath: ""
             aws_cluster_name: {{.HUB_CLUSTER_NAME}}
           labels:
             argocd.argoproj.io/secret-type: cluster

gitops/bootstrap/addons.yaml

@@ -23,7 +23,10 @@ spec:
       sources:
         - repoURL: '{{ .metadata.annotations.addonsRepoURL }}'
           targetRevision: '{{ .metadata.annotations.addonsRepoRevision }}'
-          ref: values
+          ref: defaults
+        - repoURL: '{{ or .metadata.annotations.overlay_repo_url .metadata.annotations.addonsRepoURL }}'
+          targetRevision: '{{ or .metadata.annotations.overlay_repo_revision .metadata.annotations.addonsRepoRevision }}'
+          ref: overlay
         - repoURL: '{{ .metadata.annotations.addonsRepoURL }}'
           path: 'platform-charts/appset-chart'
           targetRevision: '{{ .metadata.annotations.addonsRepoRevision }}'
@@ -32,16 +35,22 @@ spec:
             ignoreMissingValueFiles: true
             valueFiles:
               - values.yaml
-              - $values/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/_defaults.yaml
-              - $values/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/core.yaml
-              - $values/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/gitops.yaml
-              - $values/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/security.yaml
-              - $values/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/observability.yaml
-              - $values/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/platform.yaml
-              - $values/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/ml.yaml
-              - $values/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/agents.yaml
-              - $values/{{ .metadata.annotations.addonsRepoBasepath }}overlays/environments/{{ .metadata.labels.environment }}/overrides.yaml
-              - $values/{{ .metadata.annotations.addonsRepoBasepath }}overlays/clusters/{{ .nameNormalized }}/overrides.yaml
+              - $defaults/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/_defaults.yaml
+              - $defaults/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/core.yaml
+              - $defaults/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/gitops.yaml
+              - $defaults/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/security.yaml
+              - $defaults/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/observability.yaml
+              - $defaults/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/platform.yaml
+              - $defaults/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/ml.yaml
+              - $defaults/{{ .metadata.annotations.addonsRepoBasepath }}addons/registry/agents.yaml
+              - $defaults/{{ .metadata.annotations.addonsRepoBasepath }}overlays/environments/{{ .metadata.labels.environment }}/overrides.yaml
+              - $defaults/{{ .metadata.annotations.addonsRepoBasepath }}overlays/clusters/{{ .nameNormalized }}/overrides.yaml
+              - $overlay/{{ or .metadata.annotations.overlay_repo_basepath .metadata.annotations.addonsRepoBasepath }}overlays/environments/{{ .metadata.labels.environment }}/overrides.yaml
+              - $overlay/{{ or .metadata.annotations.overlay_repo_basepath .metadata.annotations.addonsRepoBasepath }}overlays/clusters/{{ .nameNormalized }}/overrides.yaml
+            valuesObject:
+              overlayRepoURLGit: '{{ .metadata.annotations.overlay_repo_url }}'
+              overlayRepoURLGitRevision: '{{ or .metadata.annotations.overlay_repo_revision "main" }}'
+              overlayRepoURLGitBasePath: '{{ .metadata.annotations.overlay_repo_basepath }}'
       destination:
         namespace: argocd
         name: '{{ .name }}'

platform-charts/appset-chart/templates/_application_set.tpl

@@ -54,6 +54,7 @@ Layering order:
   2. Per-addon custom valueFiles (from chartConfig.valueFiles)
   3. Environment overlay values (from overlayBasePath/environments/<env>/<addon>/values.yaml)
   4. Cluster overlay values (from overlayBasePath/clusters/<cluster>/<addon>/values.yaml)
+  5. External overlay repo values (from overlayRepoURLGitBasePath, if configured)
 All paths use ignoreMissingValueFiles: true so missing files are silently skipped.
 */}}
 {{- define "application-sets.valueFiles" -}}
@@ -65,22 +66,28 @@ All paths use ignoreMissingValueFiles: true so missing files are silently skippe
 {{/* 1. Default addon config values */}}
 {{- with .valueFiles }}
 {{- range . }}
-- $values/{{ $values.repoURLGitBasePath }}/{{ $nameNormalize }}{{ if $chartType }}/{{ $chartType }}{{ end }}/{{ if $chartConfig.valuesFileName }}{{ $chartConfig.valuesFileName }}{{ else }}{{ . }}{{ end }}
+- $defaults/{{ $values.repoURLGitBasePath }}/{{ $nameNormalize }}{{ if $chartType }}/{{ $chartType }}{{ end }}/{{ if $chartConfig.valuesFileName }}{{ $chartConfig.valuesFileName }}{{ else }}{{ . }}{{ end }}
 {{- if $values.useValuesFilePrefix }}
-- $values/{{ $values.repoURLGitBasePath }}/{{ $values.valuesFilePrefix }}{{ . }}/{{ $nameNormalize }}{{ if $chartType }}/{{ $chartType }}{{ end }}/{{ if $chartConfig.valuesFileName }}{{ $chartConfig.valuesFileName }}{{ else }}values.yaml{{ end }}
+- $defaults/{{ $values.repoURLGitBasePath }}/{{ $values.valuesFilePrefix }}{{ . }}/{{ $nameNormalize }}{{ if $chartType }}/{{ $chartType }}{{ end }}/{{ if $chartConfig.valuesFileName }}{{ $chartConfig.valuesFileName }}{{ else }}values.yaml{{ end }}
 {{- end }}
 {{- end }}
 {{- end }}
 {{/* 2. Per-addon custom valueFiles */}}
 {{- with $chartConfig.valueFiles }}
 {{- range . }}
-- $values/{{ $values.repoURLGitBasePath }}/{{ $nameNormalize }}{{ if $chartType }}/{{ $chartType }}{{ end }}/{{ if $chartConfig.valuesFileName }}{{ $chartConfig.valuesFileName }}{{ else }}{{ . }}{{ end }}
+- $defaults/{{ $values.repoURLGitBasePath }}/{{ $nameNormalize }}{{ if $chartType }}/{{ $chartType }}{{ end }}/{{ if $chartConfig.valuesFileName }}{{ $chartConfig.valuesFileName }}{{ else }}{{ . }}{{ end }}
 {{- end }}
 {{- end }}
-{{/* 3. Environment overlay values */}}
+{{/* 3. Environment overlay values (same repo) */}}
 {{- if $values.overlayBasePath }}
-- $values/{{ $values.overlayBasePath }}/environments/{{`{{.metadata.labels.environment}}`}}/{{ $nameNormalize }}{{ if $chartType }}/{{ $chartType }}{{ end }}/values.yaml
-{{/* 4. Cluster overlay values */}}
-- $values/{{ $values.overlayBasePath }}/clusters/{{`{{.nameNormalized}}`}}/{{ $nameNormalize }}{{ if $chartType }}/{{ $chartType }}{{ end }}/values.yaml
+- $defaults/{{ $values.overlayBasePath }}/environments/{{`{{.metadata.labels.environment}}`}}/{{ $nameNormalize }}{{ if $chartType }}/{{ $chartType }}{{ end }}/values.yaml
+{{/* 4. Cluster overlay values (same repo) */}}
+- $defaults/{{ $values.overlayBasePath }}/clusters/{{`{{.nameNormalized}}`}}/{{ $nameNormalize }}{{ if $chartType }}/{{ $chartType }}{{ end }}/values.yaml
+{{- end }}
+{{/* 5. External overlay repo values */}}
+{{- if $values.overlayRepoURLGit }}
+- $overlay/{{ $values.overlayRepoURLGitBasePath }}configs/{{ $nameNormalize }}{{ if $chartType }}/{{ $chartType }}{{ end }}/values.yaml
+- $overlay/{{ $values.overlayRepoURLGitBasePath }}overlays/environments/{{`{{.metadata.labels.environment}}`}}/{{ $nameNormalize }}{{ if $chartType }}/{{ $chartType }}{{ end }}/values.yaml
+- $overlay/{{ $values.overlayRepoURLGitBasePath }}overlays/clusters/{{`{{.nameNormalized}}`}}/{{ $nameNormalize }}{{ if $chartType }}/{{ $chartType }}{{ end }}/values.yaml
 {{- end }}
 {{- end }}

platform-charts/appset-chart/templates/application-set.yaml

@@ -7,6 +7,9 @@
 {{- $repoURLGit := .Values.repoURLGit -}}
 {{- $repoURLGitRevision := .Values.repoURLGitRevision -}}
 {{- $repoURLGitBasePath := .Values.repoURLGitBasePath -}}
+{{- $overlayRepoURLGit := .Values.overlayRepoURLGit -}}
+{{- $overlayRepoURLGitRevision := .Values.overlayRepoURLGitRevision -}}
+{{- $overlayRepoURLGitBasePath := .Values.overlayRepoURLGitBasePath -}}
 {{- $valueFiles := .Values.valueFiles -}}
 {{- $valuesFilePrefix :=  .Values.valuesFilePrefix -}}
 {{- $useValuesFilePrefix := (default false .Values.useValuesFilePrefix )  -}}
@@ -129,7 +132,12 @@ spec:
       sources:
       - repoURL: {{ $repoURLGit | squote}}
         targetRevision: {{ $repoURLGitRevision | squote }}
-        ref: values
+        ref: defaults
+        {{- if $overlayRepoURLGit }}
+      - repoURL: {{ $overlayRepoURLGit | squote }}
+        targetRevision: {{ $overlayRepoURLGitRevision | squote }}
+        ref: overlay
+        {{- end }}
         {{- if eq (toString $chartConfig.enableAckPodIdentity) "true" }}
         {{ include "application-sets.pod-identity" (dict
           "chartName" ($chartConfig.chartName | default $nameNormalize)

platform-charts/appset-chart/values.yaml

@@ -29,3 +29,8 @@ repoURLGit: "{{.metadata.annotations.addonsRepoURL}}"
 repoURLGitRevision: "{{.metadata.annotations.addonsRepoRevision}}"
 repoURLGitBasePath: "{{.metadata.annotations.addonsRepoBasepath}}"
 overlayBasePath: ""
+
+# Overlay multi-repo (optional, injected by bootstrap/addons.yaml valuesObject)
+overlayRepoURLGit: ""
+overlayRepoURLGitRevision: "main"
+overlayRepoURLGitBasePath: ""

platform/infra/terraform/common/locals.tf

@@ -146,6 +146,11 @@ locals {
         addons_repo_basepath = var.gitops_addons_repo_base_path
         addons_repo_revision = var.gitops_addons_repo_revision
       },
+      {
+        overlay_repo_url      = var.overlay_repo_url
+        overlay_repo_revision = var.overlay_repo_revision
+        overlay_repo_basepath = var.overlay_repo_base_path
+      },
       {
         workload_repo_url      = local.gitops_workload_repo_url
         workload_repo_path     = var.gitops_workload_repo_path

platform/infra/terraform/common/variables.tf

@@ -133,6 +133,26 @@ variable "gitops_addons_repo_revision" {
   description = "The name of branch or tag"
   default     = "main"
 }
+
+# Overlay (optional multi-repo values override)
+variable "overlay_repo_url" {
+  description = "Git URL for overlay values repo (empty = no overlay)"
+  type        = string
+  default     = ""
+}
+
+variable "overlay_repo_revision" {
+  description = "Branch or tag for overlay repo"
+  type        = string
+  default     = "main"
+}
+
+variable "overlay_repo_base_path" {
+  description = "Base path within overlay repo for addon values"
+  type        = string
+  default     = "gitops/addons/"
+}
+
 # Fleet
 variable "gitops_fleet_repo_name" {
   description = "The name of Git repo"