Merge branch 'feature/cloud-agnostic' of ssh://git.forteapps.net:2222/Forte/launchpad into feature/cloud-agnostic

token
Merge remote-tracking branch 'origin/main' into feature/cloud-agnostic
2026-04-22 13:43:09 +02:00 · 2026-04-22 13:39:43 +02:00 · 2026-04-22 13:38:55 +02:00 · 2026-04-22 11:33:03 +00:00 · 2026-04-22 13:31:09 +02:00
143 changed files with 2658 additions and 1735 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +0,0 @@
-# Force LF line endings for shell scripts
-*.sh text eol=lf
--- a/README.md
+++ b/README.md
@@ -98,23 +98,23 @@ This repository contains the complete GitOps configuration for our Kubernetes cl
 │   ├── overlays/              # Per-cluster overrides (Kustomize)
 │   │   ├── upc-dev/           # UpCloud Dev (uses base as-is)
 │   │   ├── upc-prod/         # UpCloud Prod (patches value paths)
-│   │   ├── eks-dev/           # AWS EKS Dev
-│   │   ├── eks-prod/         # AWS EKS Prod
-│   │   ├── aks-dev/        # Azure AKS Dev
-│   │   ├── aks-prod/       # Azure AKS Prod
-│   │   ├── gke-dev/          # GCP GKE Dev
-│   │   └── gke-prod/         # GCP GKE Prod
+│   │   ├── aws-dev/           # AWS EKS Dev
+│   │   ├── aws-prod/         # AWS EKS Prod
+│   │   ├── azure-dev/        # Azure AKS Dev
+│   │   ├── azure-prod/       # Azure AKS Prod
+│   │   ├── gcp-dev/          # GCP GKE Dev
+│   │   └── gcp-prod/         # GCP GKE Prod
 │   ├── dashboards/            # Grafana dashboard ConfigMaps
 │   └── values/                # Helm value overrides
 │       ├── base/              # Shared cloud-agnostic values
 │       ├── upc-dev/           # UpCloud Dev (storage, LB, pricing)
 │       ├── upc-prod/         # UpCloud Prod
-│       ├── eks-dev/           # AWS EKS Dev
-│       ├── eks-prod/         # AWS EKS Prod
-│       ├── aks-dev/        # Azure AKS Dev
-│       ├── aks-prod/       # Azure AKS Prod
-│       ├── gke-dev/          # GCP GKE Dev
-│       └── gke-prod/         # GCP GKE Prod
+│       ├── aws-dev/           # AWS EKS Dev
+│       ├── aws-prod/         # AWS EKS Prod
+│       ├── azure-dev/        # Azure AKS Dev
+│       ├── azure-prod/       # Azure AKS Prod
+│       ├── gcp-dev/          # GCP GKE Dev
+│       └── gcp-prod/         # GCP GKE Prod
 │
 ├── apps/                      # Business Applications
 │   ├── mcp10x.yaml
@@ -355,6 +355,7 @@ kubectl patch application myapp -n argocd \
 | **Fluent-Bit** | Log shipping | `monitoring` | DaemonSet |
 | **OpenCost** | Cost monitoring | `monitoring` | 1 |
 | **Renovate** | Dependency updates | `renovate` | CronJob |
+| **Trivy** | Vulnerability scanning | `trivy-system` | 1 |

 **Full specs**: [Technical Reference - Infrastructure Components](docs/REFERENCE.md#infrastructure-components)

@@ -372,7 +373,7 @@ kubectl patch application myapp -n argocd \
 ## 📖 Key Concepts

 ### App-of-Apps Pattern
-`_app-of-apps-{cluster}.yaml` is the root Application that manages all other Applications in `infra/`. Kustomize overlays in `infra/overlays/{cluster}/` render the base Applications with per-cluster patches (e.g., swapping value file paths). Supported clusters: `upc-dev`, `upc-prod`, `eks-dev`, `eks-prod`, `aks-dev`, `aks-prod`, `gke-dev`, `gke-prod`.
+`_app-of-apps-{cluster}.yaml` is the root Application that manages all other Applications in `infra/`. Kustomize overlays in `infra/overlays/{cluster}/` render the base Applications with per-cluster patches (e.g., swapping value file paths). Supported clusters: `upc-dev`, `upc-prod`, `aws-dev`, `aws-prod`, `azure-dev`, `azure-prod`, `gcp-dev`, `gcp-prod`.

 ### Multi-Source Pattern
 Applications reference both:
--- a/_app-of-apps-aws-dev.yaml
+++ b/_app-of-apps-aws-dev.yaml
@@ -18,9 +18,9 @@ metadata:
 spec:
  project: default
  source:
-    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
+    repoURL: git@github.com:fortedigital/sturdy-adventure.git
    targetRevision: HEAD
-    path: infra/overlays/gke-dev
+    path: infra/overlays/aws-dev
  destination:
    server: https://kubernetes.default.svc
    namespace: default
--- a/_app-of-apps-aws-prod.yaml
+++ b/_app-of-apps-aws-prod.yaml
@@ -18,9 +18,9 @@ metadata:
 spec:
  project: default
  source:
-    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
+    repoURL: git@github.com:fortedigital/sturdy-adventure.git
    targetRevision: HEAD
-    path: infra/overlays/aks-dev
+    path: infra/overlays/aws-prod
  destination:
    server: https://kubernetes.default.svc
    namespace: default
--- a/_app-of-apps-azure-dev.yaml
+++ b/_app-of-apps-azure-dev.yaml
@@ -18,9 +18,9 @@ metadata:
 spec:
  project: default
  source:
-    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
+    repoURL: git@github.com:fortedigital/sturdy-adventure.git
    targetRevision: HEAD
-    path: infra/overlays/eks-dev
+    path: infra/overlays/azure-dev
  destination:
    server: https://kubernetes.default.svc
    namespace: default
--- a/_app-of-apps-azure-prod.yaml
+++ b/_app-of-apps-azure-prod.yaml
@@ -18,9 +18,9 @@ metadata:
 spec:
  project: default
  source:
-    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
+    repoURL: git@github.com:fortedigital/sturdy-adventure.git
    targetRevision: HEAD
-    path: infra/overlays/aks-prod
+    path: infra/overlays/azure-prod
  destination:
    server: https://kubernetes.default.svc
    namespace: default
--- a/_app-of-apps-eks-prod.yaml
+++ b/_app-of-apps-eks-prod.yaml
@@ -1,32 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: monitoring
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
---
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: infrastructure-apps
-  namespace: argocd
-  labels:
-    app.kubernetes.io/name: infrastructure-apps
-    app.kubernetes.io/part-of: platform
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  source:
-    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    path: infra/overlays/eks-prod
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: default
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
--- a/_app-of-apps-gcp-dev.yaml
+++ b/_app-of-apps-gcp-dev.yaml
@@ -0,0 +1,32 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: monitoring
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: infrastructure-apps
+  namespace: argocd
+  labels:
+    app.kubernetes.io/name: infrastructure-apps
+    app.kubernetes.io/part-of: platform
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  source:
+    repoURL: git@github.com:fortedigital/sturdy-adventure.git
+    targetRevision: HEAD
+    path: infra/overlays/gcp-dev
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: default
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+    - CreateNamespace=true
--- a/_app-of-apps-gcp-prod.yaml
+++ b/_app-of-apps-gcp-prod.yaml
@@ -0,0 +1,32 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: monitoring
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: infrastructure-apps
+  namespace: argocd
+  labels:
+    app.kubernetes.io/name: infrastructure-apps
+    app.kubernetes.io/part-of: platform
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  source:
+    repoURL: git@github.com:fortedigital/sturdy-adventure.git
+    targetRevision: HEAD
+    path: infra/overlays/gcp-prod
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: default
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+    - CreateNamespace=true
--- a/_app-of-apps-gke-prod.yaml
+++ b/_app-of-apps-gke-prod.yaml
@@ -1,32 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: monitoring
-  annotations:
-    argocd.argoproj.io/sync-wave: "-1"
---
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: infrastructure-apps
-  namespace: argocd
-  labels:
-    app.kubernetes.io/name: infrastructure-apps
-    app.kubernetes.io/part-of: platform
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  source:
-    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    path: infra/overlays/gke-prod
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: default
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
--- a/_app-of-apps-upc-prod.yaml
+++ b/_app-of-apps-upc-prod.yaml
@@ -18,7 +18,7 @@ metadata:
 spec:
  project: default
  source:
-    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
+    repoURL: git@github.com:fortedigital/sturdy-adventure.git
    targetRevision: HEAD
    path: infra/overlays/upc-prod
  destination:
--- a/apps/base/dot-ai-stack.yaml
+++ b/apps/base/dot-ai-stack.yaml
@@ -37,7 +37,7 @@ spec:
      - $values/infra/values/base/dot-ai-stack-values.yaml
      - $values/infra/values/upc-dev/dot-ai-stack-values.yaml

-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
+  - repoURL: git@github.com:fortedigital/sturdy-adventure.git
    targetRevision: HEAD
    ref: values

--- a/apps/base/kustomization.yaml
+++ b/apps/base/kustomization.yaml
@@ -4,5 +4,4 @@ resources:
 - dot-ai-stack.yaml
 - mcp10x.yaml
 - musicman.yaml
- ts-mcp.yaml
 - argo-mcp.yaml
--- a/apps/base/ts-mcp.yaml
+++ b/apps/base/ts-mcp.yaml
@@ -1,40 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: ts-mcp
-  namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "11"
-    notifications.argoproj.io/subscribe.on-sync-succeeded.slack: ""
-    notifications.argoproj.io/subscribe.on-sync-failed.slack: ""
-    notifications.argoproj.io/subscribe.on-degraded.slack: ""
-  labels:
-    app.kubernetes.io/name: ts-mcp
-    app.kubernetes.io/part-of: apps
-    app.kubernetes.io/managed-by: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  sources:
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/forte-helm.git
-    path: forteapp
-    targetRevision: HEAD
-    helm:
-      valueFiles:
-      - $values/ts-mcp/values.yaml
-
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/helm-prod-values.git
-    targetRevision: HEAD
-    ref: values
-
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: ts-mcp
-
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,9 +1,8 @@
 #!/bin/zsh
-
 # in case of  $'\r': command not found error, run command below first
 # sed -i 's/\r$//' ./bootstrap.sh

-CLUSTER="${1:?Usage: ./bootstrap.sh <cluster> (upc-dev|upc-prod|aks-dev|aks-prod|eks-dev|eks-prod|gke-dev|gke-prod)}"
+CLUSTER="${1:?Usage: ./bootstrap.sh <cluster> (upc-dev|upc-prod)}"

 echo "running $0 for cluster: ${CLUSTER}..."

@@ -28,8 +27,8 @@ Bootstrap()
 Gitea()
 {
    echo "Installing secret..."
-    kubectl apply -f "private/${CLUSTER}/gitea-repo-main.yaml"
-    kubectl apply -f "private/${CLUSTER}/main.key"
+    kubectl apply -f private/gitea-repo-main.yaml
+    kubectl apply -f private/main.key
 }

 ############################################################
@@ -37,15 +36,10 @@ Gitea()
 ############################################################
 ArgoCd()
 {
-    # Pre-create ConfigMap for repo-server env (must exist before Helm upgrade)
-    kubectl create namespace argocd --dry-run=client -o yaml | kubectl apply -f -
-    kubectl apply -f cluster-resources/argocd-repo-server-config.yaml
-
    # install argocd
    echo "Installing ArgoCD..."
    helm upgrade --install argocd argo-cd \
            --repo https://argoproj.github.io/argo-helm \
-            --version "7.8.0" \
            --namespace argocd --create-namespace \
            --values infra/values/base/argocd-values.yaml \
            --values "infra/values/${CLUSTER}/argocd-values.yaml" \
@@ -55,4 +49,4 @@ ArgoCd()
    kubectl apply -f "_app-of-apps-${CLUSTER}.yaml" -n argocd
 }

-Bootstrap
+# Bootstrap
--- a/cluster-resources/argocd-oidc-secret-sync.yaml
+++ b/cluster-resources/argocd-oidc-secret-sync.yaml
@@ -1,83 +0,0 @@
-# CronJob: syncs OIDC client secret from registrar-managed
-# argocd-oidc-credentials into argocd-secret (oidc.clientSecret key).
-# Runs every 2 min. No-ops if source secret doesn't exist yet
-# (safe for fresh deploys before Keycloak is up).
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: argocd-oidc-sync
-  namespace: argocd
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: argocd-oidc-sync
-  namespace: argocd
-rules:
- apiGroups: [""]
-  resources: ["secrets"]
-  resourceNames: ["argocd-oidc-credentials", "argocd-secret"]
-  verbs: ["get", "patch"]
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: argocd-oidc-sync
-  namespace: argocd
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: argocd-oidc-sync
-subjects:
- kind: ServiceAccount
-  name: argocd-oidc-sync
-  namespace: argocd
---
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: argocd-oidc-sync
-  namespace: argocd
-spec:
-  schedule: "*/2 * * * *"
-  concurrencyPolicy: Forbid
-  successfulJobsHistoryLimit: 1
-  failedJobsHistoryLimit: 3
-  jobTemplate:
-    spec:
-      backoffLimit: 1
-      template:
-        spec:
-          serviceAccountName: argocd-oidc-sync
-          restartPolicy: Never
-          containers:
-          - name: sync
-            image: bitnami/kubectl:latest
-            command: ["/bin/sh", "-c"]
-            args:
-            - |
-              set -e
-
-              # Exit gracefully if source secret doesn't exist yet
-              if ! kubectl get secret argocd-oidc-credentials -n argocd >/dev/null 2>&1; then
-                echo "argocd-oidc-credentials not found — skipping (Keycloak not ready yet)"
-                exit 0
-              fi
-
-              # Read current OIDC client secret
-              NEW_SECRET=$(kubectl get secret argocd-oidc-credentials -n argocd \
-                -o jsonpath='{.data.client-secret}' | base64 -d)
-
-              # Read current value in argocd-secret (if any)
-              CURRENT=$(kubectl get secret argocd-secret -n argocd \
-                -o jsonpath='{.data.oidc\.clientSecret}' 2>/dev/null | base64 -d || echo "")
-
-              # Only patch if changed
-              if [ "$NEW_SECRET" = "$CURRENT" ]; then
-                echo "oidc.clientSecret already up to date"
-                exit 0
-              fi
-
-              kubectl patch secret argocd-secret -n argocd --type merge \
-                -p "{\"stringData\":{\"oidc.clientSecret\":\"${NEW_SECRET}\"}}"
-              echo "Patched argocd-secret with oidc.clientSecret"
--- a/cluster-resources/argocd-repo-server-config.yaml
+++ b/cluster-resources/argocd-repo-server-config.yaml
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: argocd-repo-server-config
-  namespace: argocd
-data:
-  # Disable git submodule checkout - submodules (e.g. shared-prompts)
-  # are not needed for K8s manifest generation
-  ARGOCD_GIT_MODULES_ENABLED: "false"
--- a/cluster-resources/network/deny-external-egress-trivy.yaml
+++ b/cluster-resources/network/deny-external-egress-trivy.yaml
@@ -0,0 +1,37 @@
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: deny-external-egress
+  namespace: trivy-system
+  labels:
+    app.kubernetes.io/managed-by: argocd
+    app.kubernetes.io/part-of: network-policies
+spec:
+  endpointSelector: {}
+  egress:
+    # Allow DNS resolution
+    - toEndpoints:
+        - matchLabels:
+            io.kubernetes.pod.namespace: kube-system
+            k8s-app: kube-dns
+      toPorts:
+        - ports:
+            - port: "53"
+              protocol: UDP
+            - port: "53"
+              protocol: TCP
+
+    # Allow cluster-internal traffic (RFC1918)
+    - toCIDR:
+        - 10.0.0.0/8
+        - 172.16.0.0/12
+        - 192.168.0.0/16
+
+    # Allow Trivy vulnerability DB downloads (ghcr.io OCI registry)
+    - toFQDNs:
+        - matchName: ghcr.io
+        - matchName: pkg-containers.githubusercontent.com
+      toPorts:
+        - ports:
+            - port: "443"
+              protocol: TCP
--- a/cluster-resources/policies/label-checker.yaml
+++ b/cluster-resources/policies/label-checker.yaml
@@ -26,6 +26,7 @@ spec:
          - monitoring
          - secrets
          - kyverno
+          - trivy-system
    match:
      any:
      - resources:
--- a/cluster-resources/policies/secret-cloner.yaml
+++ b/cluster-resources/policies/secret-cloner.yaml
@@ -16,6 +16,7 @@ spec:
      - resources:
          namespaces:
          - kube-system
+          - trivy-system
          - monitoring
          - argocd
          - cert-manager
--- a/clusters/aks-dev.yaml
+++ b/clusters/aks-dev.yaml
@@ -1,12 +0,0 @@
-# Cluster config reference — values must match the corresponding overlay files.
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
-clusterName: dev-aks                     # → infra/values/aks-dev/argocd-values.yaml (notifications.context.clusterName)
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.example.com         # → infra/values/aks-dev/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.example.com       # → infra/values/aks-dev/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.example.com           # → infra/values/aks-dev/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.example.com         # → infra/values/aks-dev/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/aks-dev/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "10.0.0.0/8,168.63.129.16/32" # → infra/values/aks-dev/traefik-values.yaml (ports.*.trustedIPs) — VNet CIDR + Azure health probe
-cloudProvider: azure                     # → determines overlay directory and cloud-specific LB/storage annotations
--- a/clusters/aks-prod.yaml
+++ b/clusters/aks-prod.yaml
@@ -1,12 +0,0 @@
-# Cluster config reference — values must match the corresponding overlay files.
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
-clusterName: prod-aks                    # → infra/values/aks-prod/argocd-values.yaml (notifications.context.clusterName)
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.example.com         # → infra/values/aks-prod/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.example.com       # → infra/values/aks-prod/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.example.com           # → infra/values/aks-prod/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.example.com         # → infra/values/aks-prod/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/aks-prod/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "10.0.0.0/8,168.63.129.16/32" # → infra/values/aks-prod/traefik-values.yaml (ports.*.trustedIPs) — VNet CIDR + Azure health probe
-cloudProvider: azure                     # → determines overlay directory and cloud-specific LB/storage annotations
--- a/clusters/aws-dev.yaml
+++ b/clusters/aws-dev.yaml
@@ -0,0 +1,10 @@
+clusterName: dev-eks                  # <- adjust to your EKS cluster name
+domain: example.com                   # <- adjust to your domain
+argocdDomain: argocd.example.com
+grafanaDomain: grafana.example.com
+keycloakDomain: id.example.com
+dotaiDomain: kubemcp.example.com
+dotaiUiDomain: kubemcpui.example.com
+letsencryptEmail: admin@example.com   # <- adjust
+trustedIPs: "10.0.0.0/8"             # <- adjust to your VPC CIDR
+cloudProvider: aws
--- a/clusters/aws-prod.yaml
+++ b/clusters/aws-prod.yaml
@@ -0,0 +1,10 @@
+clusterName: prod-eks                 # <- adjust to your EKS cluster name
+domain: example.com                   # <- adjust to your domain
+argocdDomain: argocd.example.com
+grafanaDomain: grafana.example.com
+keycloakDomain: id.example.com
+dotaiDomain: kubemcp.example.com
+dotaiUiDomain: kubemcpui.example.com
+letsencryptEmail: admin@example.com   # <- adjust
+trustedIPs: "10.0.0.0/8"             # <- adjust to your VPC CIDR
+cloudProvider: aws
--- a/clusters/azure-dev.yaml
+++ b/clusters/azure-dev.yaml
@@ -0,0 +1,10 @@
+clusterName: dev-aks                  # <- adjust to your AKS cluster name
+domain: example.com                   # <- adjust to your domain
+argocdDomain: argocd.example.com
+grafanaDomain: grafana.example.com
+keycloakDomain: id.example.com
+dotaiDomain: kubemcp.example.com
+dotaiUiDomain: kubemcpui.example.com
+letsencryptEmail: admin@example.com   # <- adjust
+trustedIPs: "10.0.0.0/8,168.63.129.16/32"  # <- VNet CIDR + Azure health probe
+cloudProvider: azure
--- a/clusters/azure-prod.yaml
+++ b/clusters/azure-prod.yaml
@@ -0,0 +1,10 @@
+clusterName: prod-aks                 # <- adjust to your AKS cluster name
+domain: example.com                   # <- adjust to your domain
+argocdDomain: argocd.example.com
+grafanaDomain: grafana.example.com
+keycloakDomain: id.example.com
+dotaiDomain: kubemcp.example.com
+dotaiUiDomain: kubemcpui.example.com
+letsencryptEmail: admin@example.com   # <- adjust
+trustedIPs: "10.0.0.0/8,168.63.129.16/32"  # <- VNet CIDR + Azure health probe
+cloudProvider: azure
--- a/clusters/eks-dev.yaml
+++ b/clusters/eks-dev.yaml
@@ -1,12 +0,0 @@
-# Cluster config reference — values must match the corresponding overlay files.
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
-clusterName: dev-eks                     # → infra/values/eks-dev/argocd-values.yaml (notifications.context.clusterName)
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.example.com         # → infra/values/eks-dev/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.example.com       # → infra/values/eks-dev/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.example.com           # → infra/values/eks-dev/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.example.com         # → infra/values/eks-dev/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/eks-dev/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "10.0.0.0/8"                # → infra/values/eks-dev/traefik-values.yaml (ports.*.trustedIPs) — VPC CIDR
-cloudProvider: eks                       # → determines overlay directory and cloud-specific LB/storage annotations
--- a/clusters/eks-prod.yaml
+++ b/clusters/eks-prod.yaml
@@ -1,12 +0,0 @@
-# Cluster config reference — values must match the corresponding overlay files.
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
-clusterName: prod-eks                    # → infra/values/eks-prod/argocd-values.yaml (notifications.context.clusterName)
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.example.com         # → infra/values/eks-prod/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.example.com       # → infra/values/eks-prod/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.example.com           # → infra/values/eks-prod/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.example.com         # → infra/values/eks-prod/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/eks-prod/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "10.0.0.0/8"                # → infra/values/eks-prod/traefik-values.yaml (ports.*.trustedIPs) — VPC CIDR
-cloudProvider: eks                       # → determines overlay directory and cloud-specific LB/storage annotations
--- a/clusters/gcp-dev.yaml
+++ b/clusters/gcp-dev.yaml
@@ -0,0 +1,10 @@
+clusterName: dev-gke                  # <- adjust to your GKE cluster name
+domain: example.com                   # <- adjust to your domain
+argocdDomain: argocd.example.com
+grafanaDomain: grafana.example.com
+keycloakDomain: id.example.com
+dotaiDomain: kubemcp.example.com
+dotaiUiDomain: kubemcpui.example.com
+letsencryptEmail: admin@example.com   # <- adjust
+trustedIPs: "10.0.0.0/8,35.191.0.0/16,130.211.0.0/22"  # <- subnet CIDR + GCP health checks
+cloudProvider: gcp
--- a/clusters/gcp-prod.yaml
+++ b/clusters/gcp-prod.yaml
@@ -0,0 +1,10 @@
+clusterName: prod-gke                 # <- adjust to your GKE cluster name
+domain: example.com                   # <- adjust to your domain
+argocdDomain: argocd.example.com
+grafanaDomain: grafana.example.com
+keycloakDomain: id.example.com
+dotaiDomain: kubemcp.example.com
+dotaiUiDomain: kubemcpui.example.com
+letsencryptEmail: admin@example.com   # <- adjust
+trustedIPs: "10.0.0.0/8,35.191.0.0/16,130.211.0.0/22"  # <- subnet CIDR + GCP health checks
+cloudProvider: gcp
--- a/clusters/gke-dev.yaml
+++ b/clusters/gke-dev.yaml
@@ -1,12 +0,0 @@
-# Cluster config reference — values must match the corresponding overlay files.
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
-clusterName: dev-gke                     # → infra/values/gke-dev/argocd-values.yaml (notifications.context.clusterName)
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.example.com         # → infra/values/gke-dev/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.example.com       # → infra/values/gke-dev/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.example.com           # → infra/values/gke-dev/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.example.com         # → infra/values/gke-dev/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/gke-dev/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "10.0.0.0/8,35.191.0.0/16,130.211.0.0/22" # → infra/values/gke-dev/traefik-values.yaml (ports.*.trustedIPs) — subnet + GCP health checks
-cloudProvider: gke                       # → determines overlay directory and cloud-specific LB/storage annotations
--- a/clusters/gke-prod.yaml
+++ b/clusters/gke-prod.yaml
@@ -1,12 +0,0 @@
-# Cluster config reference — values must match the corresponding overlay files.
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
-clusterName: prod-gke                    # → infra/values/gke-prod/argocd-values.yaml (notifications.context.clusterName)
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.example.com         # → infra/values/gke-prod/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.example.com       # → infra/values/gke-prod/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.example.com           # → infra/values/gke-prod/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.example.com         # → infra/values/gke-prod/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/gke-prod/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "10.0.0.0/8,35.191.0.0/16,130.211.0.0/22" # → infra/values/gke-prod/traefik-values.yaml (ports.*.trustedIPs) — subnet + GCP health checks
-cloudProvider: gke                       # → determines overlay directory and cloud-specific LB/storage annotations
--- a/clusters/upc-dev.yaml
+++ b/clusters/upc-dev.yaml
@@ -1,12 +1,10 @@
-# Cluster config reference — values must match the corresponding overlay files.
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
-clusterName: dev-fd-no-svg1              # → infra/values/upc-dev/argocd-values.yaml (notifications.context.clusterName)
-domain: forteapps.net                    # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.127.0.0.1.nip.io   # → infra/values/upc-dev/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.forteapps.net     # → infra/values/upc-dev/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.forteapps.net         # → infra/values/upc-dev/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.forteapps.net       # → infra/values/upc-dev/dot-ai-stack-values.yaml (dot-ai.ingress.host)
-dotaiUiDomain: kubemcpui.forteapps.net   # → infra/values/upc-dev/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host)
-letsencryptEmail: danijels@gmail.com     # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "172.16.1.0/24"             # → infra/values/upc-dev/traefik-values.yaml (ports.*.trustedIPs)
-cloudProvider: upcloud                   # → determines overlay directory and cloud-specific LB/storage annotations
+clusterName: dev-fd-no-svg1
+domain: forteapps.net
+argocdDomain: argocd.127.0.0.1.nip.io
+grafanaDomain: grafana.forteapps.net
+keycloakDomain: id.forteapps.net
+dotaiDomain: kubemcp.forteapps.net
+dotaiUiDomain: kubemcpui.forteapps.net
+letsencryptEmail: danijels@gmail.com
+trustedIPs: "172.16.1.0/24"
+cloudProvider: upcloud
--- a/clusters/upc-prod.yaml
+++ b/clusters/upc-prod.yaml
@@ -1,12 +1,10 @@
-# Cluster config reference — values must match the corresponding overlay files.
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
-clusterName: prod-fd-no-svg1             # → infra/values/upc-prod/argocd-values.yaml (notifications.context.clusterName)
-domain: fortedigital.com                 # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
-argocdDomain: argocd.127.0.0.1.nip.io   # → infra/values/upc-prod/argocd-values.yaml (global.domain)
-grafanaDomain: grafana.fortedigital.com  # → infra/values/upc-prod/grafana-values.yaml (ingress.hosts)
-keycloakDomain: id.fortedigital.com      # → infra/values/upc-prod/keycloak-values.yaml (ingress.hostname)
-dotaiDomain: kubemcp.fortedigital.com    # → infra/values/upc-prod/dot-ai-stack-values.yaml (dot-ai.ingress.host)
-dotaiUiDomain: kubemcpui.fortedigital.com # → infra/values/upc-prod/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host)
-letsencryptEmail: danijel.simeunovic@fortedigital.com # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
-trustedIPs: "172.16.1.0/24"             # → infra/values/upc-prod/traefik-values.yaml (ports.*.trustedIPs)
-cloudProvider: upcloud                   # → determines overlay directory and cloud-specific LB/storage annotations
+clusterName: prod-fd-no-svg1
+domain: fortedigital.com
+argocdDomain: argocd.127.0.0.1.nip.io
+grafanaDomain: grafana.fortedigital.com
+keycloakDomain: id.fortedigital.com
+dotaiDomain: kubemcp.fortedigital.com
+dotaiUiDomain: kubemcpui.fortedigital.com
+letsencryptEmail: danijel.simeunovic@fortedigital.com
+trustedIPs: "172.16.1.0/24"
+cloudProvider: upcloud
--- a/devbox.json
+++ b/devbox.json
@@ -1,32 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.16.0/.schema/devbox.schema.json",
-  "packages": [
-    "kubectl@1.33.2",
-    "kubernetes-helm@3.18.4",
-    "k9s@0.50.7",
-    "kubeseal@0.30.0",
-    "argocd@2.14.11",
-    "kubecm@0.33.1",
-    "kubectl-tree@0.4.3",
-    "kind@0.29.0",
-    "kustomize@5.7.0",
-    "kyverno@1.14.3",
-    "syft@1.29.0",
-    "grype@0.92.2",
-    "traefik@3.6.7",
-    "claude-code@latest",
-    "go@latest",
-    "dotnet-sdk@latest",
-    "opentofu@1.11.6"
-  ],
-  "shell": {
-    "init_hook": [
-      "echo 'Welcome to devbox!' > /dev/null"
-    ],
-    "scripts": {
-      "test": [
-        "echo \"Error: no test specified\" && exit 1"
-      ]
-    }
-  }
-}
--- a/docs/DEVELOPER-GUIDE.md
+++ b/docs/DEVELOPER-GUIDE.md
@@ -654,11 +654,21 @@ kubectl create secret generic myapp-credentials \

 #### Step 2: Seal the Secret

+Get the public certificate (one-time setup):
+
+```bash
+# Fetch public cert from cluster
+kubeseal --fetch-cert \
+  --controller-name=sealed-secrets-controller \
+  --controller-namespace=kube-system \
+  > pub-cert.pem
+```
+
 Seal your secret:

 ```bash
 kubeseal --format=yaml \
-  --namespace=myapp \
+  --cert=pub-cert.pem \
  < private/myapp-credentials.yaml \
  > secrets/myapp-credentials-sealed.yaml
 ```
@@ -701,7 +711,7 @@ kubectl create secret generic myapp-credentials \

 # 2. Seal it
 kubeseal --format=yaml \
-  --namespace=myapp \
+  --cert=pub-cert.pem \
  < private/myapp-credentials.yaml \
  > secrets/myapp-credentials-sealed.yaml

@@ -952,46 +962,6 @@ User sees application (authenticated)

 ---

-### Accessing Authenticated User Information
-
-The auth sidecar handles all authentication before requests reach your application. Your app never sees unauthenticated traffic — the sidecar returns 401 or redirects to the IdP first.
-
-After successful authentication, the sidecar forwards the request to your application with user identity injected as HTTP headers:
-
-| Header | Description | Available in |
-|--------|-------------|-------------|
-| `X-Auth-User` | Username or display name | Token, OIDC, MCP |
-| `X-Auth-Email` | User email address | OIDC |
-| `X-Auth-Subject` | OIDC `sub` claim (stable user ID) | OIDC, MCP |
-| `X-Auth-Groups` | Comma-separated group memberships | OIDC (if scope includes `groups`) |
-| `X-Auth-Token` | The validated access token | All modes |
-
-**Your application reads these headers — no auth library needed:**
-
-```javascript
-// Express.js example
-app.get('/profile', (req, res) => {
-  const user = req.headers['x-auth-user'];
-  const email = req.headers['x-auth-email'];
-  res.json({ user, email });
-});
-```
-
-```python
-# Flask example
-@app.route('/profile')
-def profile():
-    user = request.headers.get('X-Auth-User')
-    email = request.headers.get('X-Auth-Email')
-    return jsonify(user=user, email=email)
-```
-
-**Why this is safe**: The Kyverno-generated NetworkPolicy restricts ingress to the sidecar port only. Traffic cannot bypass the sidecar to reach the application port directly, so the `X-Auth-*` headers can be trusted unconditionally.
-
-**Key principle**: Your application is zero-trust-unaware by design. It reads headers and renders UI. All authentication complexity lives in the sidecar and Kyverno policy.
-
---
-
 ### Authentication Configuration Reference

 #### Helm Values Schema
--- a/docs/GITOPS-ARCHITECTURE.md
+++ b/docs/GITOPS-ARCHITECTURE.md
@@ -134,18 +134,18 @@ launchpad/
 │   ├── overlays/                     # Per-cluster Kustomize overrides
 │   │   ├── upc-dev/                  # UpCloud Dev (uses base as-is)
 │   │   ├── upc-prod/                # UpCloud Prod (patches value paths)
-│   │   ├── eks-dev/                  # AWS EKS Dev
-│   │   ├── eks-prod/                # AWS EKS Prod
-│   │   ├── aks-dev/               # Azure AKS Dev
-│   │   ├── aks-prod/              # Azure AKS Prod
-│   │   ├── gke-dev/                 # GCP GKE Dev
-│   │   └── gke-prod/               # GCP GKE Prod
+│   │   ├── aws-dev/                  # AWS EKS Dev
+│   │   ├── aws-prod/                # AWS EKS Prod
+│   │   ├── azure-dev/               # Azure AKS Dev
+│   │   ├── azure-prod/              # Azure AKS Prod
+│   │   ├── gcp-dev/                 # GCP GKE Dev
+│   │   └── gcp-prod/               # GCP GKE Prod
 │   ├── dashboards/                   # Grafana dashboard ConfigMaps
 │   └── values/                       # Helm value overrides for infra
 │       ├── base/                     # Cloud-agnostic shared values
 │       ├── upc-{dev,prod}/           # UpCloud: storage class, LB, pricing
 │       ├── aws-{dev,prod}/           # AWS: gp3, NLB, CUR pricing
-│       ├── aks-{dev,prod}/         # Azure: managed-csi-premium, Standard LB
+│       ├── azure-{dev,prod}/         # Azure: managed-csi-premium, Standard LB
 │       └── gcp-{dev,prod}/           # GCP: premium-rwo, L4 LB
 │
 ├── apps/                             # Business Application ArgoCD manifests (Kustomize)
@@ -283,7 +283,7 @@ app-repository/
 ### The App-of-Apps Pattern

 ```
-_app-of-apps-{cluster}.yaml (Root, per cluster — e.g. upc-dev, eks-prod, gke-dev)
+_app-of-apps-{cluster}.yaml (Root, per cluster — e.g. upc-dev, aws-prod, gcp-dev)
    │
    ├── infrastructure-apps (manages infra/)
    │   ├── cluster-resources-application
--- a/docs/OPERATIONS-RUNBOOK.md
+++ b/docs/OPERATIONS-RUNBOOK.md
@@ -55,8 +55,8 @@ git clone https://git.forteapps.net/Forte/launchpad
 cd launchpad

 # 2. Run bootstrap script with cluster target
-# Available clusters: upc-dev, upc-prod, eks-dev, eks-prod,
-#                     aks-dev, aks-prod, gke-dev, gke-prod
+# Available clusters: upc-dev, upc-prod, aws-dev, aws-prod,
+#                     azure-dev, azure-prod, gcp-dev, gcp-prod
 ./bootstrap.sh upc-dev

 # Cluster config is loaded from clusters/<cluster>.yaml
@@ -1276,9 +1276,9 @@ spec:
 - ❌ Other persistent volumes (Prometheus, Loki, Tempo data)

 **Per-cloud backup scripts** (manual restore helpers):
- UpCloud/AWS: `scripts/gitea-backup.sh` / `scripts/gitea-backup-eks.sh` (MinIO CLI, S3-compatible)
- Azure: `scripts/gitea-backup-aks.sh` (Azure CLI + Blob Storage)
- GCP: `scripts/gitea-backup-gke.sh` (gsutil + GCS)
+- UpCloud/AWS: `scripts/gitea-backup.sh` / `scripts/gitea-backup-aws.sh` (MinIO CLI, S3-compatible)
+- Azure: `scripts/gitea-backup-azure.sh` (Azure CLI + Blob Storage)
+- GCP: `scripts/gitea-backup-gcp.sh` (gsutil + GCS)

 ### Cluster Rebuild

@@ -1527,9 +1527,9 @@ The repository supports multiple clusters across multiple clouds via Kustomize o
 - **upc-prod**: `infra/overlays/upc-prod/` — patches value file paths from `upc-dev` to `upc-prod`

 **Cloud-ready templates (fill in `clusters/*.yaml` before use):**
- **eks-dev** / **eks-prod**: AWS EKS with NLB, gp3 storage, AWS CUR pricing
- **aks-dev** / **aks-prod**: Azure AKS with Standard LB, managed-csi-premium storage
- **gke-dev** / **gke-prod**: GCP GKE with L4 LB, premium-rwo storage
+- **aws-dev** / **aws-prod**: AWS EKS with NLB, gp3 storage, AWS CUR pricing
+- **azure-dev** / **azure-prod**: Azure AKS with Standard LB, managed-csi-premium storage
+- **gcp-dev** / **gcp-prod**: GCP GKE with L4 LB, premium-rwo storage

 Each cluster has its own:
 - Root app-of-apps: `_app-of-apps-{cluster}.yaml`
@@ -1548,7 +1548,7 @@ Cloud-specific values handled per-cluster:
 | **Cost monitoring** | Custom pricing | AWS CUR | Azure Billing API | GCP Cloud Billing |
 | **Backup storage** | UpCloud S3-compat | AWS S3 (native) | Azure Blob Storage | GCS |

-To add a new cluster, create a new overlay directory (e.g., `infra/overlays/eks-staging/`) with patches that swap the value file paths, and a matching `clusters/eks-staging.yaml`.
+To add a new cluster, create a new overlay directory (e.g., `infra/overlays/aws-staging/`) with patches that swap the value file paths, and a matching `clusters/aws-staging.yaml`.

 ### Blue-Green Deployments

--- a/docs/REFERENCE.md
+++ b/docs/REFERENCE.md
@@ -9,7 +9,6 @@
 - [Kyverno Policies](#kyverno-policies)
 - [Configuration Reference](#configuration-reference)
 - [API Endpoints](#api-endpoints)
- [Cloud Overlay Pattern](#cloud-overlay-pattern)
 - [Glossary](#glossary)

 ---
@@ -21,9 +20,8 @@
 | Component | Value |
 |-----------|-------|
 | **Provider** | Multi-cloud (UpCloud, AWS EKS, Azure AKS, GCP GKE) |
-| **Environment** | Dev + Production per cloud |
 | **Active clusters** | UpCloud (upc-dev, upc-prod) |
-| **Cloud-ready templates** | EKS, AKS, GKE (dev + prod each) |
+| **Cloud-ready templates** | AWS, Azure, GCP (dev + prod each) |
 | **GitOps Tool** | ArgoCD |
 | **Ingress Controller** | Traefik v2 |
 | **Certificate Management** | Cert-Manager + Let's Encrypt |
@@ -88,39 +86,22 @@ launchpad/
 │   ├── loki.yaml
 │   ├── tempo.yaml
 │   ├── fluent-bit.yaml
+│   ├── trivy.yaml
 │   ├── gitea.yaml
 │   ├── gitea-actions.yaml
 │   ├── sealedsecrets.yaml
 │   ├── secrets.yaml
 │   ├── renovate.yaml
-│   ├── base/                      # ArgoCD Application manifests (Kustomize base)
-│   │   ├── gitea.yaml
-│   │   ├── opencost.yaml
-│   │   ├── traefik-application.yaml
-│   │   ├── keycloak.yaml
-│   │   ├── grafana.yaml
-│   │   └── ...
-│   ├── overlays/
-│   │   └── upc-prod/
-│   │       └── kustomization.yaml # Patches upc-dev → upc-prod valueFile paths
 │   └── values/
-│       ├── base/                   # Cloud-agnostic Helm values
-│       │   ├── gitea-values.yaml
-│       │   ├── opencost-values.yaml
-│       │   ├── prometheus-values.yaml
-│       │   └── ...
-│       ├── upc-dev/               # UpCloud dev overlay values
-│       │   ├── traefik-values.yaml
-│       │   ├── keycloak-values.yaml
-│       │   ├── grafana-values.yaml
-│       │   ├── gitea-values.yaml
-│       │   └── opencost-values.yaml
-│       └── upc-prod/              # UpCloud prod overlay values
-│           ├── traefik-values.yaml
-│           ├── keycloak-values.yaml
+│       ├── argocd-values.yaml
+│       ├── prometheus-values.yaml
 │       ├── grafana-values.yaml
+│       ├── loki-values.yaml
+│       ├── tempo-values.yaml
 │       ├── gitea-values.yaml
-│           └── opencost-values.yaml
+│       ├── gitea-actions-values.yaml
+│       ├── fluent-bit-values.yaml
+│       └── renovate-values.yaml
 │
 ├── apps/                          # Business applications
 │   ├── mcp10x.yaml
@@ -147,39 +128,12 @@ launchpad/
 │       └── auth-sidecar-injector.yaml
 │
 ├── secrets/                       # Application secrets (sealed)
-│   ├── base/                     # All SealedSecrets (shared across clouds)
-│   │   ├── kustomization.yaml
-│   │   ├── argocd-forte-helm-secret-sealed.yaml
-│   │   ├── argocd-mcp-credentials.yaml
-│   │   ├── argocdmcp-auth-oidc-sealed.yaml
-│   │   ├── dot-ai-secrets.yaml
-│   │   ├── forte10x-app-credentials-sealed.yaml
-│   │   ├── gitea-backup-s3-sealed.yaml
-│   │   ├── gitea-credentials-sealed.yaml
-│   │   ├── gitea-runner-token-sealed.yaml
-│   │   ├── gitea-smtp-secret-sealed.yaml
-│   │   ├── keycloak-credentials-sealed.yaml
-│   │   ├── musicman-auth-oidc-sealed.yaml
-│   │   ├── musicman-credentials.yaml
-│   │   └── renovate-env-sealed.yaml
-│   └── overlays/                 # Per-cloud overlays (reference base)
-│       ├── aks-dev/kustomization.yaml
-│       ├── aks-prod/kustomization.yaml
-│       ├── eks-dev/kustomization.yaml
-│       ├── eks-prod/kustomization.yaml
-│       ├── gke-dev/kustomization.yaml
-│       ├── gke-prod/kustomization.yaml
-│       ├── upc-dev/kustomization.yaml
-│       └── upc-prod/kustomization.yaml
-│
-├── scripts/                       # Operational helper scripts
-│   ├── gitea-backup.sh            # S3 backup helper (list/download)
-│   ├── gitea-restore.sh
-│   └── backup/                    # Per-cloud backup reference scripts
-│       ├── s3-minio.sh            # S3-compatible (UpCloud, MinIO, Wasabi)
-│       ├── aws-s3.sh              # Native AWS S3
-│       ├── azure-blob.sh          # Azure Blob Storage
-│       └── gcp-gcs.sh             # GCP Cloud Storage
+│   ├── argocd-mcp-credentials.yaml
+│   ├── dot-ai-secrets.yaml
+│   ├── gitea-credentials-sealed.yaml
+│   ├── gitea-runner-token-sealed.yaml
+│   ├── mcp10x-credentials-sealed.yaml
+│   └── musicman-credentials.yaml
 │
 ├── private/                       # Local-only (Git-ignored)
 │   ├── *.yaml
@@ -648,77 +602,6 @@ retry:
 4. 40 seconds
 5. 80 seconds (capped at 3 minutes)

-### Global Settings (`argocd-cm`)
-
-| Setting | Value | Purpose |
-|---------|-------|---------|
-| `application.resourceTrackingMethod` | `annotation` | Track resources via annotations |
-| `timeout.reconciliation` | `60s` | Reconciliation interval |
-| `admin.enabled` | `false` | Admin login disabled (SSO-only) |
-| `url` | `https://argocd.forteapps.net` | External URL for ArgoCD UI |
-
-**Git Submodule Disable**: Set via `configs.params` (NOT `repoServer.env` — that causes strategic merge conflicts with chart's `valueFrom` entries):
-```yaml
-configs:
-  params:
-    "reposerver.enable.git.submodule": "false"
-```
-This writes to `argocd-cmd-params-cm` ConfigMap, which the chart already reads via `valueFrom`. Submodules (e.g., `shared-prompts`) are not needed for K8s manifest generation.
-
-**Break-Glass Admin Access**: Admin login is disabled (`admin.enabled: false`). The admin password remains in `argocd-secret`. To re-enable temporarily:
-```bash
-# Enable admin login
-kubectl patch cm argocd-cm -n argocd -p '{"data":{"admin.enabled":"true"}}'
-# Log in as admin, do what's needed, then disable again
-kubectl patch cm argocd-cm -n argocd -p '{"data":{"admin.enabled":"false"}}'
-```
-ArgoCD picks up ConfigMap changes within the reconciliation timeout (60s). Note: ArgoCD will revert this on next sync — this is intentional (temporary access only).
-
-**OIDC Authentication** (Keycloak):
-```yaml
-configs:
-  cm:
-    oidc.config: |
-      name: Forte SSO
-      issuer: https://id.forteapps.net/realms/forte
-      clientID: argocd
-      clientSecret: $oidc.clientSecret
-      requestedScopes: ["openid", "email", "profile"]
-  rbacConfig:
-    policy.csv: |
-      g, ArgoCD Admins, role:admin
-      g, ArgoCD Viewers, role:readonly
-    # Deny users not in any declared KC group
-    policy.default: ""
-    scopes: '[groups]'
-```
-
-**Access Control**: Only users in Keycloak groups `ArgoCD Admins` or `ArgoCD Viewers` can access ArgoCD. Users not in either group are denied (empty `policy.default`). Assign users to groups in Keycloak admin console.
-
- ArgoCD does NOT add `openid` implicitly — must include in `requestedScopes`
- Do NOT add `groups` as a scope — the KC groups mapper emits the claim regardless
- `$oidc.clientSecret` references the `oidc.clientSecret` key in `argocd-secret`
- OIDC secret is synced by CronJob `argocd-oidc-sync` (see `cluster-resources/argocd-oidc-secret-sync.yaml`)
- The CronJob bridges `argocd-oidc-credentials` (from KC registrar) → `argocd-secret` every 2 min
- Safe for fresh deploys: no-ops if source secret doesn't exist yet
-
-**Ingress** (Traefik + TLS):
-```yaml
-server:
-  ingress:
-    enabled: true
-    ingressClassName: traefik
-    annotations:
-      cert-manager.io/cluster-issuer: letsencrypt-prod
-    tls: true
-  extraArgs:
-  - --insecure
-configs:
-  params:
-    "server.insecure": true
-```
-TLS terminates at Traefik; ArgoCD runs in insecure mode behind the proxy.
-
 ---

 ## Infrastructure Components
@@ -794,10 +677,6 @@ spec:
 **Chart**: `sealed-secrets/sealed-secrets-controller`
 **Namespace**: `kube-system`

-**Directory Structure**: `secrets/base/` contains all SealedSecrets with a `kustomization.yaml`. Per-cloud overlays in `secrets/overlays/<cloud>/` reference the base via Kustomize. The ArgoCD `secrets` Application points to the active overlay (e.g., `secrets/overlays/upc-dev`), and `infra/overlays/upc-prod` patches the path to `secrets/overlays/upc-prod`.
-
-To add cloud-specific secrets, create a new SealedSecret in the overlay directory and add it to the overlay's `kustomization.yaml`.
-
 **Public Certificate**:
 ```bash
 kubeseal --fetch-cert \
@@ -838,15 +717,6 @@ kubeStateMetrics:
 - Loki
 - Tempo

-**Ingress**: Exposed via Traefik at `https://grafana.forteapps.net` with cert-manager TLS.
-
-**OIDC Authentication** (Keycloak):
- Uses `grafana.ini.auth.generic_oauth` with KC `grafana` client
- Secret `grafana-oidc-credentials` synced by KC registrar, loaded via `envFromSecrets`
- SSO-only mode: `auth.disable_login_form: true` + `auth.generic_oauth.auto_login: true`
- Role mapping via JMESPath on `resource_access.grafana.roles` claim (requires KC client role mapper)
- Roles: KC client roles `Admin`/`Editor` map to Grafana roles; default is `Viewer`
-
 ### Loki

 **Chart**: `grafana/loki-stack`
@@ -1199,33 +1069,6 @@ kubectl get secret keycloak-client-<app> -n keycloak -o jsonpath='{.metadata.ann

 **See**: [Developer Guide - Adding a New Keycloak Client](DEVELOPER-GUIDE.md#adding-a-new-keycloak-client)

-### Karpor
-
-**Chart**: `karpor` from `https://kusionstack.github.io/charts`
-**Version**: 0.7.6 (app v0.6.4)
-**Namespace**: `karpor`
-**Sync Wave**: 1
-
-**Purpose**: Kubernetes visualization and intelligence tool. Provides cross-cluster resource search, compliance checking, and topology visualization. Gives platform engineers a unified view of all cluster resources and their relationships.
-
-**Architecture** (4 components):
- **Server** — main Karpor API/UI (port 7443)
- **Syncer** — syncs cluster state into the search index
- **ElasticSearch** — search backend for resource indexing
- **etcd** — persistent key-value store (10Gi PVC)
-
-**Configuration** (`infra/values/base/karpor-values.yaml`):
- `namespaceEnabled: false` — ArgoCD manages namespace creation
- Default resource limits tuned for small clusters
- ElasticSearch: 2 CPU / 4Gi memory (the heaviest component)
- AI features available but not enabled (requires `server.ai.authToken` + backend config)
-
-**Access**: Port-forward to reach the UI:
-```bash
-kubectl port-forward svc/karpor-release-server -n karpor 7443:7443
-# Open https://localhost:7443
-```
-
 ### Renovate

 **Chart**: `renovate` (OCI: `ghcr.io/renovatebot/charts`)
@@ -1673,23 +1516,7 @@ Forward to Application (localhost:3000)
 Application processes request
 ```

-#### Forwarded Headers
-
-After successful authentication, the sidecar injects user identity as HTTP headers before forwarding the request to the application container:
-
-| Header | Description | Auth Modes |
-|--------|-------------|------------|
-| `X-Auth-User` | Username or display name | Token, OIDC, MCP |
-| `X-Auth-Email` | User email address | OIDC |
-| `X-Auth-Subject` | OIDC `sub` claim (stable user ID) | OIDC, MCP |
-| `X-Auth-Groups` | Comma-separated group memberships | OIDC (if `groups` scope) |
-| `X-Auth-Token` | The validated access token | All modes |
-
-These headers are trustworthy because the auto-generated `NetworkPolicy` restricts pod ingress to the sidecar port only — external traffic cannot reach the application container directly, so headers cannot be spoofed.
-
-Applications should read these headers to obtain authenticated user information (e.g. for display, authorisation decisions, or audit logging) instead of implementing their own authentication.
-
-**See**: [Developer Guide - Accessing Authenticated User Information](DEVELOPER-GUIDE.md#accessing-authenticated-user-information) for code examples.
+**See**: [Developer Guide - Enabling Authentication](DEVELOPER-GUIDE.md#enabling-authentication-for-applications) for usage examples.

 ---

@@ -1802,88 +1629,6 @@ POST /loki/api/v1/push

 ---

-## Cloud Overlay Pattern
-
-### Overview
-
-Cloud-specific configuration (StorageClass, LoadBalancer annotations, pricing models, etc.) lives in per-cloud overlay value files, **not** in `base/`. Adding a new cloud provider only requires a new overlay directory — no base changes.
-
-### Supported Clouds
-
-| Cloud | Dev overlay | Prod overlay | StorageClass | LB type |
-|-------|-----------|-------------|-------------|---------|
-| **UpCloud** | `upc-dev` | `upc-prod` | `upcloud-block-storage-maxiops` | UpCloud LB (proxy protocol v2) |
-| **Azure AKS** | `aks-dev` | `aks-prod` | `managed-csi-premium` | Azure LB |
-| **AWS EKS** | `eks-dev` | `eks-prod` | `gp3` | AWS NLB (proxy protocol) |
-| **GCP GKE** | `gke-dev` | `gke-prod` | `premium-rwo` | GCP NEG |
-
-Bootstrap any cluster with: `./bootstrap.sh <cluster>` (e.g., `./bootstrap.sh aks-dev`)
-
-### How It Works
-
-Each ArgoCD Application uses **multi-source Helm values** with two value files:
-
-```yaml
-# infra/base/gitea.yaml (example)
-helm:
-  valueFiles:
-  - $values/infra/values/base/gitea-values.yaml      # [0] cloud-agnostic
-  - $values/infra/values/upc-dev/gitea-values.yaml    # [1] cloud-specific (default: upc-dev)
-```
-
-The `upc-prod` Kustomize overlay patches index `[1]` to swap the cloud-specific file:
-
-```yaml
-# infra/overlays/upc-prod/kustomization.yaml
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/upc-prod/gitea-values.yaml
-```
-
-### Components Using Cloud Overlays
-
-| Component | Cloud-specific config | Overlay value file |
-|-----------|----------------------|-------------------|
-| **Traefik** | LB annotations, proxy protocol IPs | `traefik-values.yaml` |
-| **Keycloak** | Hostname, TLS settings | `keycloak-values.yaml` |
-| **Grafana** | Hostname, datasource URLs | `grafana-values.yaml` |
-| **Gitea** | StorageClass (persistence + PostgreSQL) | `gitea-values.yaml` |
-| **OpenCost** | Custom pricing model (CPU/RAM/storage rates) | `opencost-values.yaml` |
-
-### Backup CronJob
-
-The `gitea-backup` CronJob uses a generic `s3` alias for `minio/mc`. The actual endpoint and credentials come from the `gitea-backup-s3` Sealed Secret, which is per-cloud. Reference scripts for different cloud providers are in `scripts/backup/`:
-
-| Script | Provider | Tool |
-|--------|----------|------|
-| `s3-minio.sh` | S3-compatible (UpCloud, MinIO, Wasabi) | `minio/mc` |
-| `aws-s3.sh` | AWS S3 | `aws` CLI |
-| `azure-blob.sh` | Azure Blob Storage | `az` CLI |
-| `gcp-gcs.sh` | GCP Cloud Storage | `gsutil` |
-
-### Adding a New Cloud Provider
-
-To add support for a new cloud (e.g., `oci-dev` for Oracle Cloud):
-
-1. **Cluster config**: `clusters/oci-dev.yaml` — clusterName, domain, trustedIPs, cloudProvider
-2. **Overlay value files** in `infra/values/oci-dev/`:
-   - `traefik-values.yaml` — LB annotations, proxy protocol config
-   - `keycloak-values.yaml` — hostname
-   - `grafana-values.yaml` — hostname
-   - `gitea-values.yaml` — `storageClass` for persistence + PostgreSQL
-   - `opencost-values.yaml` — pricing model or cloud billing integration
-3. **Kustomize overlay**: `infra/overlays/oci-dev/kustomization.yaml` — patch `valueFiles[1]` for each Application
-4. **App-of-apps**: `_app-of-apps-oci-dev.yaml` — points to `infra/overlays/oci-dev`
-5. **Secrets overlay**: `secrets/overlays/oci-dev/kustomization.yaml` — references `../../base`, add cloud-specific SealedSecrets if needed
-6. **Secrets patch**: Add patch to `infra/overlays/oci-dev/kustomization.yaml` to swap secrets path to `secrets/overlays/oci-dev`
-7. **Bootstrap**: `./bootstrap.sh oci-dev`
-
---
-
 ## Glossary

 ### Terms
--- a/infra/base/karpor.yaml
+++ b/infra/base/karpor.yaml
@@ -1,48 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: karpor
-  namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "1"
-  labels:
-    app.kubernetes.io/name: karpor
-    app.kubernetes.io/part-of: developer-portal
-    app.kubernetes.io/managed-by: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-
-  sources:
-  - repoURL: https://kusionstack.github.io/charts
-    chart: karpor
-    targetRevision: "0.7.6"
-    helm:
-      releaseName: karpor
-      valueFiles:
-      - $values/infra/values/base/karpor-values.yaml
-
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    ref: values
-
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: karpor
-
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-      allowEmpty: false
-    syncOptions:
-    - CreateNamespace=true
-    - Validate=true
-    - ServerSideApply=true
-
-  ignoreDifferences:
-  - group: apps
-    kind: StatefulSet
-    jsonPointers:
-    - /spec/volumeClaimTemplates
--- a/infra/base/keycloak.yaml
+++ b/infra/base/keycloak.yaml
@@ -15,7 +15,7 @@ spec:
  project: default

  sources:
-  - repoURL: registry-1.docker.io/bitnamicharts
+  - repoURL: https://charts.bitnami.com/bitnami
    chart: keycloak
    targetRevision: "25.2.0"
    helm:
@@ -47,7 +47,3 @@ spec:
    kind: CronJob
    jsonPointers:
    - /spec/jobTemplate/spec/template/spec/containers/0/args
-  - group: apps
-    kind: StatefulSet
-    jsonPointers:
-    - /spec/volumeClaimTemplates
--- a/infra/base/kustomization.yaml
+++ b/infra/base/kustomization.yaml
@@ -10,6 +10,7 @@ resources:
 - prometheus.yaml
 - loki.yaml
 - fluent-bit.yaml
+- trivy.yaml
 - enterprise-apps.yaml
 - cluster-resources-application.yaml
 - kyverno-policies.yaml
@@ -21,4 +22,3 @@ resources:
 - tempo.yaml
 - grafana-dashboards.yaml
 - network-policies-application.yaml
- karpor.yaml
--- a/infra/base/opencost.yaml
+++ b/infra/base/opencost.yaml
@@ -24,7 +24,7 @@ spec:
      - $values/infra/values/base/opencost-values.yaml
      - $values/infra/values/upc-dev/opencost-values.yaml

-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
+  - repoURL: git@github.com:fortedigital/sturdy-adventure.git
    targetRevision: HEAD
    ref: values

--- a/infra/base/secrets.yaml
+++ b/infra/base/secrets.yaml
@@ -18,7 +18,7 @@ spec:
  project: default
  source:
    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    path: secrets/overlays/upc-dev
+    path: secrets/upc-dev
  destination:
    server: https://kubernetes.default.svc
    namespace: secrets
--- a/infra/base/traefik-application.yaml
+++ b/infra/base/traefik-application.yaml
@@ -31,7 +31,7 @@ spec:
      - $values/infra/values/base/traefik-values.yaml
      - $values/infra/values/upc-dev/traefik-values.yaml

-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
+  - repoURL: git@github.com:fortedigital/sturdy-adventure.git
    targetRevision: HEAD
    ref: values

--- a/infra/base/trivy.yaml
+++ b/infra/base/trivy.yaml
@@ -0,0 +1,67 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: trivy-system
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
+---
+
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: trivy-operator
+  namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
+  labels:
+    app.kubernetes.io/name: trivy-operator
+    app.kubernetes.io/part-of: platform
+    app.kubernetes.io/managed-by: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+
+  source:
+    repoURL: https://aquasecurity.github.io/helm-charts
+    chart: trivy-operator
+    targetRevision: 0.31.0
+    helm:
+      releaseName: trivy-operator
+      valuesObject:
+        operator:
+          targetNamespaces: ""
+          excludeNamespaces: "argocd,trivy-system,kube-system,monitoring,kyverno,cert-manager"
+          scanJobsInSameNamespace: true
+          metricsVulnIdEnabled: true
+          metricsImageInfo: true
+        trivy:
+          ignoreUnfixed: false
+
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: trivy-system
+
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+      allowEmpty: false
+    syncOptions:
+    - CreateNamespace=true
+    - Validate=true
+    - ServerSideApply=true
+    retry:
+      limit: 5
+      backoff:
+        duration: 5s
+        factor: 2
+        maxDuration: 3m
+
+  ignoreDifferences:
+  - group: apiextensions.k8s.io
+    kind: CustomResourceDefinition
+    jsonPointers:
+    - /metadata/labels
+    - /metadata/annotations
+    - /metadata/finalizers
--- a/infra/dashboards/kustomization.yaml
+++ b/infra/dashboards/kustomization.yaml
@@ -8,6 +8,9 @@ generatorOptions:
    grafana_dashboard: "1"

 configMapGenerator:
+- name: grafana-dashboard-trivy
+  files:
+  - trivy.json
 - name: grafana-dashboard-traefik-loki
  files:
  - traefik-loki.json
--- a/infra/dashboards/trivy.json
+++ b/infra/dashboards/trivy.json
--- a/infra/overlays/aks-dev/kustomization.yaml
+++ b/infra/overlays/aks-dev/kustomization.yaml
@@ -1,68 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-patches:
-# Traefik: swap upc-dev → aks-dev
- target:
-    kind: Application
-    name: traefik
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-dev/traefik-values.yaml
-
-# Keycloak: swap upc-dev → aks-dev
- target:
-    kind: Application
-    name: keycloak
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-dev/keycloak-values.yaml
-
-# Grafana: swap upc-dev → aks-dev
- target:
-    kind: Application
-    name: grafana
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-dev/grafana-values.yaml
-
-# Gitea: swap upc-dev → aks-dev
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-dev/gitea-values.yaml
-
-# OpenCost: swap upc-dev → aks-dev
- target:
-    kind: Application
-    name: opencost
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-dev/opencost-values.yaml
-
-# Secrets: change path to aks-dev
- target:
-    kind: Application
-    name: secrets
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: secrets/aks-dev
-
-# Enterprise-apps: point to aks-dev overlay
- target:
-    kind: Application
-    name: enterprise-apps
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: apps/overlays/aks-dev
--- a/infra/overlays/aks-prod/kustomization.yaml
+++ b/infra/overlays/aks-prod/kustomization.yaml
@@ -1,68 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-patches:
-# Traefik: swap upc-dev → aks-prod
- target:
-    kind: Application
-    name: traefik
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-prod/traefik-values.yaml
-
-# Keycloak: swap upc-dev → aks-prod
- target:
-    kind: Application
-    name: keycloak
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-prod/keycloak-values.yaml
-
-# Grafana: swap upc-dev → aks-prod
- target:
-    kind: Application
-    name: grafana
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-prod/grafana-values.yaml
-
-# Gitea: swap upc-dev → aks-prod
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-prod/gitea-values.yaml
-
-# OpenCost: swap upc-dev → aks-prod
- target:
-    kind: Application
-    name: opencost
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-prod/opencost-values.yaml
-
-# Secrets: change path to aks-prod
- target:
-    kind: Application
-    name: secrets
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: secrets/aks-prod
-
-# Enterprise-apps: point to aks-prod overlay
- target:
-    kind: Application
-    name: enterprise-apps
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: apps/overlays/aks-prod
--- a/infra/overlays/aws-dev/kustomization.yaml
+++ b/infra/overlays/aws-dev/kustomization.yaml
@@ -0,0 +1,35 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base
+
+patches:
+# Traefik: swap upc-dev → aws-dev
+- target:
+    kind: Application
+    name: traefik
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/aws-dev/traefik-values.yaml
+
+# Gitea: swap upc-dev → aws-dev
+- target:
+    kind: Application
+    name: gitea
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/aws-dev/gitea-values.yaml
+
+# OpenCost: swap upc-dev → aws-dev
+- target:
+    kind: Application
+    name: opencost
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/aws-dev/opencost-values.yaml
+
+# TODO: add patches for keycloak, grafana, secrets, enterprise-apps
+# when deploying to this cluster (these are deployment-specific, not cloud-specific)
--- a/infra/overlays/aws-prod/kustomization.yaml
+++ b/infra/overlays/aws-prod/kustomization.yaml
@@ -0,0 +1,35 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base
+
+patches:
+# Traefik: swap upc-dev → aws-prod
+- target:
+    kind: Application
+    name: traefik
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/aws-prod/traefik-values.yaml
+
+# Gitea: swap upc-dev → aws-prod
+- target:
+    kind: Application
+    name: gitea
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/aws-prod/gitea-values.yaml
+
+# OpenCost: swap upc-dev → aws-prod
+- target:
+    kind: Application
+    name: opencost
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/aws-prod/opencost-values.yaml
+
+# TODO: add patches for keycloak, grafana, secrets, enterprise-apps
+# when deploying to this cluster (these are deployment-specific, not cloud-specific)
--- a/infra/overlays/azure-dev/kustomization.yaml
+++ b/infra/overlays/azure-dev/kustomization.yaml
@@ -0,0 +1,35 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base
+
+patches:
+# Traefik: swap upc-dev → azure-dev
+- target:
+    kind: Application
+    name: traefik
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/azure-dev/traefik-values.yaml
+
+# Gitea: swap upc-dev → azure-dev
+- target:
+    kind: Application
+    name: gitea
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/azure-dev/gitea-values.yaml
+
+# OpenCost: swap upc-dev → azure-dev
+- target:
+    kind: Application
+    name: opencost
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/azure-dev/opencost-values.yaml
+
+# TODO: add patches for keycloak, grafana, secrets, enterprise-apps
+# when deploying to this cluster (these are deployment-specific, not cloud-specific)
--- a/infra/overlays/azure-prod/kustomization.yaml
+++ b/infra/overlays/azure-prod/kustomization.yaml
@@ -0,0 +1,35 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base
+
+patches:
+# Traefik: swap upc-dev → azure-prod
+- target:
+    kind: Application
+    name: traefik
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/azure-prod/traefik-values.yaml
+
+# Gitea: swap upc-dev → azure-prod
+- target:
+    kind: Application
+    name: gitea
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/azure-prod/gitea-values.yaml
+
+# OpenCost: swap upc-dev → azure-prod
+- target:
+    kind: Application
+    name: opencost
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/azure-prod/opencost-values.yaml
+
+# TODO: add patches for keycloak, grafana, secrets, enterprise-apps
+# when deploying to this cluster (these are deployment-specific, not cloud-specific)
--- a/infra/overlays/eks-dev/kustomization.yaml
+++ b/infra/overlays/eks-dev/kustomization.yaml
@@ -1,68 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-patches:
-# Traefik: swap upc-dev → eks-dev
- target:
-    kind: Application
-    name: traefik
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-dev/traefik-values.yaml
-
-# Keycloak: swap upc-dev → eks-dev
- target:
-    kind: Application
-    name: keycloak
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-dev/keycloak-values.yaml
-
-# Grafana: swap upc-dev → eks-dev
- target:
-    kind: Application
-    name: grafana
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-dev/grafana-values.yaml
-
-# Gitea: swap upc-dev → eks-dev
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-dev/gitea-values.yaml
-
-# OpenCost: swap upc-dev → eks-dev
- target:
-    kind: Application
-    name: opencost
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-dev/opencost-values.yaml
-
-# Secrets: change path to eks-dev
- target:
-    kind: Application
-    name: secrets
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: secrets/eks-dev
-
-# Enterprise-apps: point to eks-dev overlay
- target:
-    kind: Application
-    name: enterprise-apps
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: apps/overlays/eks-dev
--- a/infra/overlays/eks-prod/kustomization.yaml
+++ b/infra/overlays/eks-prod/kustomization.yaml
@@ -1,68 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-patches:
-# Traefik: swap upc-dev → eks-prod
- target:
-    kind: Application
-    name: traefik
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-prod/traefik-values.yaml
-
-# Keycloak: swap upc-dev → eks-prod
- target:
-    kind: Application
-    name: keycloak
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-prod/keycloak-values.yaml
-
-# Grafana: swap upc-dev → eks-prod
- target:
-    kind: Application
-    name: grafana
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-prod/grafana-values.yaml
-
-# Gitea: swap upc-dev → eks-prod
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-prod/gitea-values.yaml
-
-# OpenCost: swap upc-dev → eks-prod
- target:
-    kind: Application
-    name: opencost
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/eks-prod/opencost-values.yaml
-
-# Secrets: change path to eks-prod
- target:
-    kind: Application
-    name: secrets
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: secrets/eks-prod
-
-# Enterprise-apps: point to eks-prod overlay
- target:
-    kind: Application
-    name: enterprise-apps
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: apps/overlays/eks-prod
--- a/infra/overlays/gcp-dev/kustomization.yaml
+++ b/infra/overlays/gcp-dev/kustomization.yaml
@@ -0,0 +1,35 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base
+
+patches:
+# Traefik: swap upc-dev → gcp-dev
+- target:
+    kind: Application
+    name: traefik
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/gcp-dev/traefik-values.yaml
+
+# Gitea: swap upc-dev → gcp-dev
+- target:
+    kind: Application
+    name: gitea
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/gcp-dev/gitea-values.yaml
+
+# OpenCost: swap upc-dev → gcp-dev
+- target:
+    kind: Application
+    name: opencost
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/gcp-dev/opencost-values.yaml
+
+# TODO: add patches for keycloak, grafana, secrets, enterprise-apps
+# when deploying to this cluster (these are deployment-specific, not cloud-specific)
--- a/infra/overlays/gcp-prod/kustomization.yaml
+++ b/infra/overlays/gcp-prod/kustomization.yaml
@@ -0,0 +1,35 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base
+
+patches:
+# Traefik: swap upc-dev → gcp-prod
+- target:
+    kind: Application
+    name: traefik
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/gcp-prod/traefik-values.yaml
+
+# Gitea: swap upc-dev → gcp-prod
+- target:
+    kind: Application
+    name: gitea
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/gcp-prod/gitea-values.yaml
+
+# OpenCost: swap upc-dev → gcp-prod
+- target:
+    kind: Application
+    name: opencost
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/gcp-prod/opencost-values.yaml
+
+# TODO: add patches for keycloak, grafana, secrets, enterprise-apps
+# when deploying to this cluster (these are deployment-specific, not cloud-specific)
--- a/infra/overlays/gke-dev/kustomization.yaml
+++ b/infra/overlays/gke-dev/kustomization.yaml
@@ -1,68 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-patches:
-# Traefik: swap upc-dev → gke-dev
- target:
-    kind: Application
-    name: traefik
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-dev/traefik-values.yaml
-
-# Keycloak: swap upc-dev → gke-dev
- target:
-    kind: Application
-    name: keycloak
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-dev/keycloak-values.yaml
-
-# Grafana: swap upc-dev → gke-dev
- target:
-    kind: Application
-    name: grafana
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-dev/grafana-values.yaml
-
-# Gitea: swap upc-dev → gke-dev
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-dev/gitea-values.yaml
-
-# OpenCost: swap upc-dev → gke-dev
- target:
-    kind: Application
-    name: opencost
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-dev/opencost-values.yaml
-
-# Secrets: change path to gke-dev
- target:
-    kind: Application
-    name: secrets
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: secrets/gke-dev
-
-# Enterprise-apps: point to gke-dev overlay
- target:
-    kind: Application
-    name: enterprise-apps
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: apps/overlays/gke-dev
--- a/infra/overlays/gke-prod/kustomization.yaml
+++ b/infra/overlays/gke-prod/kustomization.yaml
@@ -1,68 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
- ../../base
-
-patches:
-# Traefik: swap upc-dev → gke-prod
- target:
-    kind: Application
-    name: traefik
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-prod/traefik-values.yaml
-
-# Keycloak: swap upc-dev → gke-prod
- target:
-    kind: Application
-    name: keycloak
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-prod/keycloak-values.yaml
-
-# Grafana: swap upc-dev → gke-prod
- target:
-    kind: Application
-    name: grafana
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-prod/grafana-values.yaml
-
-# Gitea: swap upc-dev → gke-prod
- target:
-    kind: Application
-    name: gitea
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-prod/gitea-values.yaml
-
-# OpenCost: swap upc-dev → gke-prod
- target:
-    kind: Application
-    name: opencost
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/gke-prod/opencost-values.yaml
-
-# Secrets: change path to gke-prod
- target:
-    kind: Application
-    name: secrets
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: secrets/gke-prod
-
-# Enterprise-apps: point to gke-prod overlay
- target:
-    kind: Application
-    name: enterprise-apps
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: apps/overlays/gke-prod
--- a/infra/overlays/upc-prod/kustomization.yaml
+++ b/infra/overlays/upc-prod/kustomization.yaml
@@ -31,6 +31,24 @@ patches:
      path: /spec/sources/0/helm/valueFiles/1
      value: $values/infra/values/upc-prod/grafana-values.yaml

+# Secrets: change path to upc-prod
+- target:
+    kind: Application
+    name: secrets
+  patch: |
+    - op: replace
+      path: /spec/source/path
+      value: secrets/upc-prod
+
+# Enterprise-apps: point to upc-prod overlay
+- target:
+    kind: Application
+    name: enterprise-apps
+  patch: |
+    - op: replace
+      path: /spec/source/path
+      value: apps/overlays/upc-prod
+
 # Gitea: swap upc-dev → upc-prod
 - target:
    kind: Application
@@ -48,21 +66,3 @@ patches:
    - op: replace
      path: /spec/sources/0/helm/valueFiles/1
      value: $values/infra/values/upc-prod/opencost-values.yaml
-
-# Secrets: change path to upc-prod
- target:
-    kind: Application
-    name: secrets
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: secrets/overlays/upc-prod
-
-# Enterprise-apps: point to upc-prod overlay
- target:
-    kind: Application
-    name: enterprise-apps
-  patch: |
-    - op: replace
-      path: /spec/source/path
-      value: apps/overlays/upc-prod
--- a/infra/values/aks-dev/grafana-values.yaml
+++ b/infra/values/aks-dev/grafana-values.yaml
@@ -1,4 +0,0 @@
-# AKS-specific: Grafana hostname
-ingress:
-  hosts:
-  - grafana.forteapps.net
--- a/infra/values/aks-dev/keycloak-values.yaml
+++ b/infra/values/aks-dev/keycloak-values.yaml
@@ -1,3 +0,0 @@
-# AKS-specific: Keycloak hostname
-ingress:
-  hostname: id.forteapps.net
--- a/infra/values/aks-dev/opencost-values.yaml
+++ b/infra/values/aks-dev/opencost-values.yaml
@@ -1,8 +0,0 @@
-# AKS-specific: Azure pricing via Cloud Billing API
-opencost:
-  exporter:
-    cloudProviderApiKey: ""
-    customPricing:
-      enabled: false
-    azure:
-      secretName: opencost-azure-billing
--- a/infra/values/aks-dev/traefik-values.yaml
+++ b/infra/values/aks-dev/traefik-values.yaml
@@ -1,11 +0,0 @@
-# AKS-specific: Azure Load Balancer for Traefik
-service:
-  annotations:
-    service.beta.kubernetes.io/azure-load-balancer-health-probe-request-path: /ping
-ports:
-  web:
-    forwardedHeaders:
-      trustedIPs: "10.0.0.0/8"
-  websecure:
-    forwardedHeaders:
-      trustedIPs: "10.0.0.0/8"
--- a/infra/values/aks-prod/grafana-values.yaml
+++ b/infra/values/aks-prod/grafana-values.yaml
@@ -1,4 +0,0 @@
-# AKS-specific: Grafana hostname (prod)
-ingress:
-  hosts:
-  - grafana.fortedigital.com
--- a/infra/values/aks-prod/keycloak-values.yaml
+++ b/infra/values/aks-prod/keycloak-values.yaml
@@ -1,3 +0,0 @@
-# AKS-specific: Keycloak hostname (prod)
-ingress:
-  hostname: id.fortedigital.com
--- a/infra/values/aks-prod/opencost-values.yaml
+++ b/infra/values/aks-prod/opencost-values.yaml
@@ -1,8 +0,0 @@
-# AKS-specific: Azure pricing via Cloud Billing API (prod)
-opencost:
-  exporter:
-    cloudProviderApiKey: ""
-    customPricing:
-      enabled: false
-    azure:
-      secretName: opencost-azure-billing
--- a/infra/values/aks-prod/traefik-values.yaml
+++ b/infra/values/aks-prod/traefik-values.yaml
@@ -1,12 +0,0 @@
-# AKS-specific: Azure Load Balancer for Traefik (prod)
-service:
-  annotations:
-    service.beta.kubernetes.io/azure-load-balancer-health-probe-request-path: /ping
-    service.beta.kubernetes.io/azure-load-balancer-internal: "false"
-ports:
-  web:
-    forwardedHeaders:
-      trustedIPs: "10.0.0.0/8"
-  websecure:
-    forwardedHeaders:
-      trustedIPs: "10.0.0.0/8"
--- a/infra/values/aws-dev/gitea-values.yaml
+++ b/infra/values/aws-dev/gitea-values.yaml
@@ -1,4 +1,4 @@
-# EKS-specific: gp3 storage class
+# AWS EBS gp3 storage class (requires EBS CSI driver)
 persistence:
  storageClass: gp3
 postgresql:
--- a/infra/values/aws-dev/opencost-values.yaml
+++ b/infra/values/aws-dev/opencost-values.yaml
@@ -0,0 +1,13 @@
+# AWS native pricing via Cost and Usage Reports
+opencost:
+  exporter:
+    customPricing:
+      enabled: true
+      provider: aws
+    aws:
+      service_key_name: ""      # <- populate or use IRSA
+      service_key_secret: ""
+      spot_data_region: ""
+      spot_data_bucket: ""
+      spot_data_prefix: ""
+      account_id: ""
--- a/infra/values/aws-dev/traefik-values.yaml
+++ b/infra/values/aws-dev/traefik-values.yaml
@@ -0,0 +1,18 @@
+# AWS EKS — NLB with Proxy Protocol v2 for real client IPs
+service:
+  annotations:
+    service.beta.kubernetes.io/aws-load-balancer-type: "external"
+    service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
+    service.beta.kubernetes.io/aws-load-balancer-scheme: "internet-facing"
+    service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
+ports:
+  web:
+    proxyProtocol:
+      trustedIPs: "10.0.0.0/8"       # <- adjust to your VPC CIDR
+    forwardedHeaders:
+      trustedIPs: "10.0.0.0/8"
+  websecure:
+    proxyProtocol:
+      trustedIPs: "10.0.0.0/8"
+    forwardedHeaders:
+      trustedIPs: "10.0.0.0/8"
--- a/infra/values/aws-prod/gitea-values.yaml
+++ b/infra/values/aws-prod/gitea-values.yaml
@@ -1,4 +1,4 @@
-# EKS-specific: gp3 storage class (prod)
+# AWS EBS gp3 storage class (requires EBS CSI driver)
 persistence:
  storageClass: gp3
 postgresql:
--- a/infra/values/aws-prod/opencost-values.yaml
+++ b/infra/values/aws-prod/opencost-values.yaml
@@ -0,0 +1,13 @@
+# AWS native pricing via Cost and Usage Reports
+opencost:
+  exporter:
+    customPricing:
+      enabled: true
+      provider: aws
+    aws:
+      service_key_name: ""      # <- populate or use IRSA
+      service_key_secret: ""
+      spot_data_region: ""
+      spot_data_bucket: ""
+      spot_data_prefix: ""
+      account_id: ""
--- a/infra/values/aws-prod/traefik-values.yaml
+++ b/infra/values/aws-prod/traefik-values.yaml
@@ -0,0 +1,18 @@
+# AWS EKS — NLB with Proxy Protocol v2 for real client IPs
+service:
+  annotations:
+    service.beta.kubernetes.io/aws-load-balancer-type: "external"
+    service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
+    service.beta.kubernetes.io/aws-load-balancer-scheme: "internet-facing"
+    service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
+ports:
+  web:
+    proxyProtocol:
+      trustedIPs: "10.0.0.0/8"       # <- adjust to your VPC CIDR
+    forwardedHeaders:
+      trustedIPs: "10.0.0.0/8"
+  websecure:
+    proxyProtocol:
+      trustedIPs: "10.0.0.0/8"
+    forwardedHeaders:
+      trustedIPs: "10.0.0.0/8"
--- a/infra/values/azure-dev/gitea-values.yaml
+++ b/infra/values/azure-dev/gitea-values.yaml
@@ -1,4 +1,4 @@
-# AKS-specific: Azure managed disk storage class
+# Azure Managed Disk (Premium SSD via CSI driver)
 persistence:
  storageClass: managed-csi-premium
 postgresql:
--- a/infra/values/azure-dev/opencost-values.yaml
+++ b/infra/values/azure-dev/opencost-values.yaml
@@ -0,0 +1,11 @@
+# Azure native pricing via Billing API
+opencost:
+  exporter:
+    customPricing:
+      enabled: true
+      provider: azure
+    azure:
+      subscriptionID: ""          # <- populate
+      clientID: ""
+      clientSecret: ""
+      tenantID: ""
--- a/infra/values/azure-dev/traefik-values.yaml
+++ b/infra/values/azure-dev/traefik-values.yaml
@@ -0,0 +1,16 @@
+# Azure AKS — Standard Load Balancer
+# Note: Azure Standard LB does not support Proxy Protocol.
+# Use externalTrafficPolicy: Local on the Traefik service to preserve
+# client IPs, or deploy behind Azure Application Gateway.
+service:
+  annotations:
+    service.beta.kubernetes.io/azure-load-balancer-health-probe-request-path: "/ping"
+  spec:
+    externalTrafficPolicy: Local
+ports:
+  web:
+    forwardedHeaders:
+      trustedIPs: "10.0.0.0/8,168.63.129.16/32"    # <- VNet CIDR + Azure health probe
+  websecure:
+    forwardedHeaders:
+      trustedIPs: "10.0.0.0/8,168.63.129.16/32"
--- a/infra/values/azure-prod/gitea-values.yaml
+++ b/infra/values/azure-prod/gitea-values.yaml
@@ -1,4 +1,4 @@
-# AKS-specific: Azure managed disk storage class (prod)
+# Azure Managed Disk (Premium SSD via CSI driver)
 persistence:
  storageClass: managed-csi-premium
 postgresql:
--- a/infra/values/azure-prod/opencost-values.yaml
+++ b/infra/values/azure-prod/opencost-values.yaml
@@ -0,0 +1,11 @@
+# Azure native pricing via Billing API
+opencost:
+  exporter:
+    customPricing:
+      enabled: true
+      provider: azure
+    azure:
+      subscriptionID: ""          # <- populate
+      clientID: ""
+      clientSecret: ""
+      tenantID: ""
--- a/infra/values/azure-prod/traefik-values.yaml
+++ b/infra/values/azure-prod/traefik-values.yaml
@@ -0,0 +1,16 @@
+# Azure AKS — Standard Load Balancer
+# Note: Azure Standard LB does not support Proxy Protocol.
+# Use externalTrafficPolicy: Local on the Traefik service to preserve
+# client IPs, or deploy behind Azure Application Gateway.
+service:
+  annotations:
+    service.beta.kubernetes.io/azure-load-balancer-health-probe-request-path: "/ping"
+  spec:
+    externalTrafficPolicy: Local
+ports:
+  web:
+    forwardedHeaders:
+      trustedIPs: "10.0.0.0/8,168.63.129.16/32"    # <- VNet CIDR + Azure health probe
+  websecure:
+    forwardedHeaders:
+      trustedIPs: "10.0.0.0/8,168.63.129.16/32"
--- a/infra/values/base/argocd-values.yaml
+++ b/infra/values/base/argocd-values.yaml
@@ -2,40 +2,16 @@ configs:
  secret:
    createSecret: true
    argocdServerAdminPassword: "$2b$12$Tmb1jH7ADvwWoUoNPXXsfOf6JqEluqhq8mL06a8DGT2AP1GzbNsCm"
-    # oidc.clientSecret managed by argocd-oidc-sync CronJob
-    # (reads from argocd-oidc-credentials, patches argocd-secret)
-  ssh:
-    knownHosts: |
-      [git.forteapps.net]:2222 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDTwi40de8yTGUuRT0i/XGicQ672BLhYR6D/lDquJrp/tdrWoZhVVPy0wxSkWsq1V92iiAUuQnXagOGsLBGZT9uDLWKvEmNDnCfjzTMq3J1iA3vk2rQ8WBlCzhvmeCV/r0ufl6vsgfwxSRomLZeqa2UkLHx69gy2Njb1S2/aZK1Q53f466hCUfDULZrTn2Nn5Sj8cEbJ8EyvVN2YG9HYBxQdzKRPZEmS1vyzmn8YrYIkZseIRQElabzWGh86owuaaqnwJhTJj1j2sEUeIet04sGKJcnxx2UL4H90N66LKMldmMiuli+ve/CjJmMwDl0zGkjIniT3XR8CyEXYHli7B1hR8Z+dbK6DBgjz+28lFgMIRY70KkZJNsJcBNZLZ5fHwCI13a9U3Uhg3Pu/6s0zlosM4CrAQNQCRe95ZPtCpdFhlGrOl4m1rdSK2meL6rND0TBBuZbaFF6Py7TawLCAiO2KRaVqhu9OFVjwJ/nifgLzFGwWj+WcYmpuR+DwozrF/Hl7QYsz1x4GO1SONY07KbIFkUCHOMAh0AELY5YE4eGI4mtG6SecdPaAdLREGZYK4IcyP5i1QW9g0wmfRSsV9jy+r0ivBxixxh4yJiNpkg6NXak40gQtGIme9EJ+DxrRLruNsfDILWcdSuH/wvuorv56NpQFGB0FzB6LXMloSYptQ==
  cm:
    application.resourceTrackingMethod: annotation
    timeout.reconciliation: 60s
-    # Admin login disabled — SSO only. Break-glass: kubectl patch cm argocd-cm -n argocd -p '{"data":{"admin.enabled":"true"}}'
-    admin.enabled: "false"
-    url: https://argocd.forteapps.net
-    oidc.config: |
-      name: Forte SSO
-      issuer: https://id.forteapps.net/realms/forte
-      clientID: argocd
-      clientSecret: $oidc.clientSecret
-      requestedScopes: ["openid", "email", "profile"]
-  rbac:
-    policy.csv: |
-      g, ArgoCD Admins, role:admin
-      g, ArgoCD Viewers, role:readonly
-    # Deny users not in any declared KC group (ArgoCD Admins / ArgoCD Viewers)
-    policy.default: ""
-    scopes: '[groups]'
+    admin.enabled: "true"
  params:
    "server.insecure": true
-    "reposerver.enable.git.submodule": "false"
 server:
  ingress:
-    enabled: true
-    ingressClassName: traefik
-    annotations:
-      cert-manager.io/cluster-issuer: letsencrypt-prod
-    tls: true
+    enabled: false
+    ingressClassName: nginx
  extraArgs:
  - --insecure

--- a/infra/values/base/gitea-values.yaml
+++ b/infra/values/base/gitea-values.yaml
@@ -77,7 +77,7 @@ gitea:
      FROM: "noreply@fortedigital.com"

    admin:
-      DEFAULT_EMAIL_NOTIFICATIONS: onmention
+      DEFAULT_EMAIL_NOTIFICATIONS: enabled

  # -- SMTP credentials injected from secret (USER and PASSWD)
  additionalConfigFromEnvs:
@@ -98,7 +98,7 @@ gitea:
    existingSecret: gitea-oidc-credentials
    key: gitea
    autoDiscoverUrl: "https://id.forteapps.net/realms/forte/.well-known/openid-configuration"
-    scopes: "email profile organization"
+    scopes: "openid email profile organization"
    groupClaimName: "groups"
    adminGroup: ""
    restrictedGroup: ""
--- a/infra/values/base/grafana-values.yaml
+++ b/infra/values/base/grafana-values.yaml
@@ -1,13 +1,5 @@
 ingress:
  enabled: true
-  ingressClassName: traefik
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-prod
-  tls:
-  - secretName: grafana-tls
-    hosts:
-    - grafana.forteapps.net
-
 resources:
  requests:
    cpu: 50m
@@ -19,29 +11,6 @@ resources:
 adminUser: admin
 adminPassword: "forte"

-envFromSecrets:
- name: grafana-oidc-credentials
-
-grafana.ini:
-  server:
-    root_url: https://grafana.forteapps.net
-  auth.generic_oauth:
-    enabled: true
-    name: Forte SSO
-    allow_sign_up: true
-    client_id: ${client-id}
-    client_secret: ${client-secret}
-    scopes: openid email profile
-    auth_url: https://id.forteapps.net/realms/forte/protocol/openid-connect/auth
-    token_url: https://id.forteapps.net/realms/forte/protocol/openid-connect/token
-    api_url: https://id.forteapps.net/realms/forte/protocol/openid-connect/userinfo
-    role_attribute_path: "contains(resource_access.grafana.roles[*], 'Admin') && 'Admin' || contains(resource_access.grafana.roles[*], 'Editor') && 'Editor' || 'Viewer'"
-    role_attribute_strict: true
-    allow_assign_grafana_admin: true
-    auto_login: true
-  auth:
-    disable_login_form: true
-
 datasources:
  datasources.yaml:
    apiVersion: 1
--- a/infra/values/base/karpor-values.yaml
+++ b/infra/values/base/karpor-values.yaml
@@ -1,44 +0,0 @@
-# Karpor - Kubernetes Visualization & Intelligence Tool
-# Helm chart: https://github.com/KusionStack/charts/tree/master/charts/karpor
-
-# Let the ArgoCD Application manage the namespace
-namespaceEnabled: false
-
-server:
-  replicas: 1
-  port: 7443
-  resources:
-    requests:
-      cpu: 250m
-      memory: 256Mi
-    limits:
-      cpu: 500m
-      memory: 1Gi
-
-syncer:
-  replicas: 1
-  port: 7443
-  resources:
-    requests:
-      cpu: 250m
-      memory: 256Mi
-    limits:
-      cpu: 500m
-      memory: 1Gi
-
-elasticsearch:
-  replicas: 1
-  port: 9200
-  resources:
-    requests:
-      cpu: 500m
-      memory: 2Gi
-    limits:
-      cpu: "2"
-      memory: 4Gi
-
-etcd:
-  replicas: 1
-  port: 2379
-  persistence:
-    size: 5Gi
--- a/infra/values/base/keycloak-values.yaml
+++ b/infra/values/base/keycloak-values.yaml
@@ -75,6 +75,7 @@ keycloakConfigCli:
            "publicClient": false,
            "redirectUris": ["https://git.forteapps.net/*"],
            "webOrigins": ["https://git.forteapps.net"],
+            "defaultClientScopes": ["openid", "email", "profile"],
            "attributes": {
              "k8s.secret.sync": "true",
              "k8s.secret.namespace": "gitea",
@@ -97,84 +98,6 @@ keycloakConfigCli:
                }
              }
            ]
-          },
-          {
-            "clientId": "grafana",
-            "name": "Grafana",
-            "enabled": true,
-            "protocol": "openid-connect",
-            "clientAuthenticatorType": "client-secret",
-            "standardFlowEnabled": true,
-            "directAccessGrantsEnabled": false,
-            "publicClient": false,
-            "redirectUris": ["https://grafana.forteapps.net/*"],
-            "webOrigins": ["https://grafana.forteapps.net"],
-            "attributes": {
-              "k8s.secret.sync": "true",
-              "k8s.secret.namespace": "monitoring",
-              "k8s.secret.name": "grafana-oidc-credentials",
-              "k8s.secret.client-id-key": "client-id",
-              "k8s.secret.client-secret-key": "client-secret"
-            },
-            "protocolMappers": [
-              {
-                "name": "client-roles",
-                "protocol": "openid-connect",
-                "protocolMapper": "oidc-usermodel-client-role-mapper",
-                "config": {
-                  "claim.name": "resource_access.grafana.roles",
-                  "jsonType.label": "String",
-                  "multivalued": "true",
-                  "usermodel.clientRoleMapping.clientId": "grafana",
-                  "id.token.claim": "true",
-                  "access.token.claim": "true",
-                  "userinfo.token.claim": "true"
-                }
-              }
-            ]
-          },
-          {
-            "clientId": "argocd",
-            "name": "ArgoCD",
-            "enabled": true,
-            "protocol": "openid-connect",
-            "clientAuthenticatorType": "client-secret",
-            "standardFlowEnabled": true,
-            "directAccessGrantsEnabled": false,
-            "publicClient": false,
-            "redirectUris": ["https://argocd.forteapps.net/auth/callback"],
-            "webOrigins": ["https://argocd.forteapps.net"],
-            "attributes": {
-              "k8s.secret.sync": "true",
-              "k8s.secret.namespace": "argocd",
-              "k8s.secret.name": "argocd-oidc-credentials",
-              "k8s.secret.client-id-key": "client-id",
-              "k8s.secret.client-secret-key": "client-secret"
-            },
-            "protocolMappers": [
-              {
-                "name": "groups",
-                "protocol": "openid-connect",
-                "protocolMapper": "oidc-group-membership-mapper",
-                "config": {
-                  "claim.name": "groups",
-                  "full.path": "false",
-                  "id.token.claim": "true",
-                  "access.token.claim": "true",
-                  "userinfo.token.claim": "true"
-                }
-              }
-            ]
-          }
-        ],
-        "groups": [
-          {
-            "name": "ArgoCD Admins",
-            "path": "/ArgoCD Admins"
-          },
-          {
-            "name": "ArgoCD Viewers",
-            "path": "/ArgoCD Viewers"
          }
        ]
      }
--- a/infra/values/base/prometheus-values.yaml
+++ b/infra/values/base/prometheus-values.yaml
@@ -36,6 +36,28 @@ extraScrapeConfigs: |
      - source_labels: [__meta_kubernetes_namespace]
        target_label: namespace

+  - job_name: trivy-operator
+    scrape_interval: 30s
+    metrics_path: /metrics
+    kubernetes_sd_configs:
+      - role: pod
+        namespaces:
+          names:
+            - trivy-system
+    relabel_configs:
+      - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_name]
+        regex: trivy-operator
+        action: keep
+      - source_labels: [__meta_kubernetes_pod_container_port_number]
+        regex: "8080"
+        action: keep
+      - source_labels: [__meta_kubernetes_pod_name]
+        target_label: pod
+      - source_labels: [__meta_kubernetes_namespace]
+        target_label: namespace
+      - source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_instance]
+        target_label: instance
+
  - job_name: traefik
    scrape_interval: 15s
    metrics_path: /metrics
--- a/infra/values/eks-dev/grafana-values.yaml
+++ b/infra/values/eks-dev/grafana-values.yaml
@@ -1,4 +0,0 @@
-# EKS-specific: Grafana hostname
-ingress:
-  hosts:
-  - grafana.forteapps.net
--- a/infra/values/eks-dev/keycloak-values.yaml
+++ b/infra/values/eks-dev/keycloak-values.yaml
@@ -1,3 +0,0 @@
-# EKS-specific: Keycloak hostname
-ingress:
-  hostname: id.forteapps.net
--- a/infra/values/eks-dev/opencost-values.yaml
+++ b/infra/values/eks-dev/opencost-values.yaml
@@ -1,11 +0,0 @@
-# EKS-specific: AWS pricing via Cost and Usage Report
-opencost:
-  exporter:
-    cloudProviderApiKey: ""
-    customPricing:
-      enabled: false
-    aws:
-      spot_data_region: ""
-      spot_data_bucket: ""
-      spot_data_prefix: ""
-      account_id: ""
--- a/infra/values/eks-dev/traefik-values.yaml
+++ b/infra/values/eks-dev/traefik-values.yaml
@@ -1,17 +0,0 @@
-# EKS-specific: AWS NLB for Traefik
-service:
-  annotations:
-    service.beta.kubernetes.io/aws-load-balancer-type: nlb
-    service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
-    service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
-ports:
-  web:
-    proxyProtocol:
-      trustedIPs: "10.0.0.0/8"
-    forwardedHeaders:
-      trustedIPs: "10.0.0.0/8"
-  websecure:
-    proxyProtocol:
-      trustedIPs: "10.0.0.0/8"
-    forwardedHeaders:
-      trustedIPs: "10.0.0.0/8"
--- a/infra/values/eks-prod/grafana-values.yaml
+++ b/infra/values/eks-prod/grafana-values.yaml
@@ -1,4 +0,0 @@
-# EKS-specific: Grafana hostname (prod)
-ingress:
-  hosts:
-  - grafana.fortedigital.com
--- a/infra/values/eks-prod/keycloak-values.yaml
+++ b/infra/values/eks-prod/keycloak-values.yaml
@@ -1,3 +0,0 @@
-# EKS-specific: Keycloak hostname (prod)
-ingress:
-  hostname: id.fortedigital.com
--- a/infra/values/eks-prod/opencost-values.yaml
+++ b/infra/values/eks-prod/opencost-values.yaml
@@ -1,11 +0,0 @@
-# EKS-specific: AWS pricing via Cost and Usage Report (prod)
-opencost:
-  exporter:
-    cloudProviderApiKey: ""
-    customPricing:
-      enabled: false
-    aws:
-      spot_data_region: ""
-      spot_data_bucket: ""
-      spot_data_prefix: ""
-      account_id: ""
--- a/infra/values/eks-prod/traefik-values.yaml
+++ b/infra/values/eks-prod/traefik-values.yaml
@@ -1,18 +0,0 @@
-# EKS-specific: AWS NLB for Traefik (prod)
-service:
-  annotations:
-    service.beta.kubernetes.io/aws-load-balancer-type: nlb
-    service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
-    service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
-    service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: "true"
-ports:
-  web:
-    proxyProtocol:
-      trustedIPs: "10.0.0.0/8"
-    forwardedHeaders:
-      trustedIPs: "10.0.0.0/8"
-  websecure:
-    proxyProtocol:
-      trustedIPs: "10.0.0.0/8"
-    forwardedHeaders:
-      trustedIPs: "10.0.0.0/8"
--- a/infra/values/gcp-dev/gitea-values.yaml
+++ b/infra/values/gcp-dev/gitea-values.yaml
@@ -1,4 +1,4 @@
-# GKE-specific: SSD persistent disk storage class
+# GCP Persistent Disk (SSD via CSI driver)
 persistence:
  storageClass: premium-rwo
 postgresql:
--- a/infra/values/gcp-dev/opencost-values.yaml
+++ b/infra/values/gcp-dev/opencost-values.yaml
@@ -0,0 +1,9 @@
+# GCP native pricing via Cloud Billing API
+opencost:
+  exporter:
+    customPricing:
+      enabled: true
+      provider: gcp
+    gcp:
+      projectID: ""               # <- populate with your GCP project ID
+      key: ""                     # <- or use Workload Identity
--- a/infra/values/gcp-dev/traefik-values.yaml
+++ b/infra/values/gcp-dev/traefik-values.yaml
@@ -0,0 +1,15 @@
+# GCP GKE — External passthrough Network Load Balancer
+service:
+  annotations:
+    cloud.google.com/l4-rbs: "enabled"
+ports:
+  web:
+    proxyProtocol:
+      trustedIPs: "10.0.0.0/8,35.191.0.0/16,130.211.0.0/22"   # <- subnet CIDR + GCP health checks
+    forwardedHeaders:
+      trustedIPs: "10.0.0.0/8,35.191.0.0/16,130.211.0.0/22"
+  websecure:
+    proxyProtocol:
+      trustedIPs: "10.0.0.0/8,35.191.0.0/16,130.211.0.0/22"
+    forwardedHeaders:
+      trustedIPs: "10.0.0.0/8,35.191.0.0/16,130.211.0.0/22"
--- a/infra/values/gcp-prod/gitea-values.yaml
+++ b/infra/values/gcp-prod/gitea-values.yaml
@@ -1,4 +1,4 @@
-# GKE-specific: SSD persistent disk storage class (prod)
+# GCP Persistent Disk (SSD via CSI driver)
 persistence:
  storageClass: premium-rwo
 postgresql:
--- a/infra/values/gcp-prod/opencost-values.yaml
+++ b/infra/values/gcp-prod/opencost-values.yaml
@@ -0,0 +1,9 @@
+# GCP native pricing via Cloud Billing API
+opencost:
+  exporter:
+    customPricing:
+      enabled: true
+      provider: gcp
+    gcp:
+      projectID: ""               # <- populate with your GCP project ID
+      key: ""                     # <- or use Workload Identity
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Danijel Simeunovic	c3f723333b	Merge branch 'feature/cloud-agnostic' of ssh://git.forteapps.net:2222/Forte/launchpad into feature/cloud-agnostic All checks were successful AI Code Review / ai-review (pull_request) Successful in 1m3s Details	2026-04-22 13:43:09 +02:00
Danijel Simeunovic	4144b1c1ac	token	2026-04-22 13:39:43 +02:00
Danijel Simeunovic	16eadbe181	Merge remote-tracking branch 'origin/main' into feature/cloud-agnostic	2026-04-22 13:38:55 +02:00
Danijel Simeunovic	230ea7ebeb	Merge branch 'main' into feature/cloud-agnostic Some checks failed AI Code Review / ai-review (pull_request) Failing after 3s Details	2026-04-22 11:33:03 +00:00
Danijel Simeunovic	cab0866e14	multi-cloud no mcp	2026-04-22 13:31:09 +02:00