repo url

.gitattributes

@@ -1,2 +0,0 @@
-# Force LF line endings for shell scripts
-*.sh text eol=lf

README.md

@@ -1,9 +1,9 @@
 # Kubernetes Cluster - GitOps Configuration
 
-> **Kubernetes cluster bootstrapping and GitOps configuration repository** using ArgoCD for multi-cloud Kubernetes (UpCloud, AWS EKS, Azure AKS, GCP GKE)
+> **Kubernetes cluster bootstrapping and GitOps configuration repository** using ArgoCD for UpCloud Managed Kubernetes
 
 [![GitOps](https://img.shields.io/badge/GitOps-ArgoCD-blue)](https://argoproj.github.io/cd/)
-[![Kubernetes](https://img.shields.io/badge/Kubernetes-Multi--Cloud-orange)]()
+[![Kubernetes](https://img.shields.io/badge/Kubernetes-UpCloud-orange)](https://upcloud.com/)
 
 ---
 
@@ -57,7 +57,7 @@ This repository contains the complete GitOps configuration for our Kubernetes cl
 
 ### What's Inside
 
-- **Infrastructure Applications**: Traefik, Cert-Manager, Kyverno, Prometheus, Grafana, Loki, Tempo, Sealed Secrets, Homepage (platform dashboard)
+- **Infrastructure Applications**: Traefik, Cert-Manager, Kyverno, Prometheus, Grafana, Loki, Tempo, Sealed Secrets
 - **Business Applications**: MCP10X, MusicMan, Dot-AI Stack, ArgoCD MCP
 - **Policies**: Kyverno security policies for secret management, namespace controls, pod verification
 - **Monitoring**: Full observability stack with metrics, logs, traces, and alerting
@@ -84,51 +84,31 @@ This repository contains the complete GitOps configuration for our Kubernetes cl
 ├── _app-of-apps.yaml          # Root ArgoCD Application (App-of-Apps pattern)
 │
 ├── infra/                     # Infrastructure ArgoCD Applications (Kustomize multi-cluster)
-│   ├── base/                  # Base ArgoCD Application manifests (one dir per component)
+│   ├── base/                  # Base ArgoCD Application manifests (EU defaults)
-│   │   ├── kustomization.yaml # Aggregates all component subdirectories
+│   │   ├── kustomization.yaml
-│   │   ├── traefik-application/
+│   │   ├── traefik-application.yaml
-│   │   │   ├── kustomization.yaml
+│   │   ├── keycloak.yaml
-│   │   │   └── traefik-application.yaml
+│   │   ├── grafana.yaml
-│   │   ├── keycloak/
+│   │   ├── gitea.yaml
-│   │   │   ├── kustomization.yaml
+│   │   ├── gitea-actions.yaml
-│   │   │   └── keycloak.yaml
+│   │   ├── tempo.yaml
-│   │   ├── grafana/
+│   │   ├── renovate.yaml
-│   │   ├── prometheus/
+│   │   ├── ...                # All other Application manifests
-│   │   ├── ...               # Each component in its own subdirectory
+│   │   └── secrets.yaml
-│   │   └── secrets/
+│   ├── overlays/              # Per-cluster overrides
-│   ├── overlays/              # Per-cluster overrides (Kustomize)
+│   │   ├── upc-dev/           # UpCloud Dev cluster (uses base as-is)
-│   │   ├── upc-dev/           # UpCloud Dev — includes all base components
+│   │   └── upc-prod/         # UpCloud Prod cluster (patches value paths)
-│   │   ├── upc-prod/         # UpCloud Prod — all components + patches
-│   │   ├── aks-dev/          # Azure AKS Dev — selective components only
-│   │   ├── aks-prod/         # Azure AKS Prod
-│   │   ├── eks-dev/           # AWS EKS Dev
-│   │   ├── eks-prod/         # AWS EKS Prod
-│   │   ├── gke-dev/          # GCP GKE Dev
-│   │   └── gke-prod/         # GCP GKE Prod
 │   ├── dashboards/            # Grafana dashboard ConfigMaps
 │   └── values/                # Helm value overrides
-│       ├── base/              # Shared cloud-agnostic values
+│       ├── base/              # Shared values (all clusters)
-│       ├── upc-dev/           # UpCloud Dev (storage, LB, pricing)
+│       ├── upc-dev/           # UpCloud Dev-specific values
-│       ├── upc-prod/         # UpCloud Prod
+│       └── upc-prod/         # UpCloud Prod-specific values
-│       ├── 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
 │
-├── apps/                      # Business Applications (Kustomize, same pattern as infra)
+├── apps/                      # Business Applications
-│   ├── base/                  # One subdirectory per app
+│   ├── mcp10x.yaml
-│   │   ├── kustomization.yaml
+│   ├── musicman.yaml
-│   │   ├── musicman/
+│   ├── dot-ai-stack.yaml
-│   │   ├── mcp10x/
+│   └── argo-mcp.yaml
-│   │   ├── dot-ai-stack/
-│   │   ├── ts-mcp/
-│   │   └── argo-mcp/
-│   └── overlays/              # Per-cluster: cherry-pick or include all
-│       ├── upc-dev/           # All apps
-│       ├── upc-prod/         # All apps + patches
-│       └── aks-dev/          # Selective apps only
 │
 ├── cluster-resources/         # Cluster-wide Kubernetes resources
 │   ├── letsencrypt-issuer.yaml
@@ -363,6 +343,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)
 
@@ -380,7 +361,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/`. Each component in `infra/base/` lives in its own subdirectory (e.g., `infra/base/grafana/`). Overlays can either include **all** components (via `../../base`) or **cherry-pick** specific ones (via `../../base/grafana`, `../../base/prometheus`, etc.). Per-cluster patches swap Helm value file paths. Supported clusters: `upc-dev`, `upc-prod`, `eks-dev`, `eks-prod`, `aks-dev`, `aks-prod`, `gke-dev`, `gke-prod`.
+`_app-of-apps.yaml` is the root Application that manages all other Applications in `infra/`. Kustomize overlays in `infra/overlays/{upc-dev,upc-prod}/` render the base Applications with per-cluster patches (e.g., swapping value file paths from `upc-dev` to `upc-prod`).
 
 ### Multi-Source Pattern
 Applications reference both:
@@ -477,14 +458,16 @@ Documentation lives in `docs/`. To update:
 ## 📝 Notes
 
 ### Current Environment
-- **Provider**: Multi-cloud (UpCloud, AWS EKS, Azure AKS, GCP GKE)
+- **Provider**: UpCloud Managed Kubernetes
-- **Active clusters**: UpCloud (upc-dev, upc-prod)
 - **Environment**: Production (internal use only)
+- **Clusters**: Multi-cluster (upc-dev, upc-prod) via Kustomize overlays
 - **Auth**: Disabled for ArgoCD (internal access)
-- **Backup**: Gitea daily backup to S3-compatible storage
+- **Backup**: None (cluster rebuildable via GitOps)
 
 ### Known Limitations
+- No automated backups (yet)
 - Secret rotation not automated
+- Multi-cluster limited to upc-dev and upc-prod environments
 - DNS management is manual
 
 **Future improvements**: See [Operations Runbook - Disaster Recovery](docs/OPERATIONS-RUNBOOK.md#disaster-recovery)
@@ -521,7 +504,7 @@ Internal use only. Not for public distribution.
 
 ---
 
-**Last Updated**: 2026-04-22
+**Last Updated**: 2026-03-16
 **Documentation Version**: 1.0.0
 
 **🚀 Ready to get started? Check out the [Documentation Index](docs/README.md)!**

apps/base/argo-mcp/kustomization.yaml

@@ -1,6 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- argo-mcp.yaml
-- argocdmcp-auth-oidc-sealed.yaml
-- argocd-mcp-credentials.yaml

apps/base/dot-ai-stack/kustomization.yaml

@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- dot-ai-stack.yaml
-- dot-ai-secrets.yaml

apps/base/kustomization.yaml

@@ -1,8 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- dot-ai-stack
+- dot-ai-stack.yaml
-- mcp10x
+- mcp10x.yaml
-- musicman
+- musicman.yaml
-- ts-mcp
+- argo-mcp.yaml
-- argo-mcp

apps/base/mcp10x/kustomization.yaml

@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- mcp10x.yaml
-- forte10x-app-credentials-sealed.yaml

apps/base/musicman.yaml

@@ -36,8 +36,13 @@ spec:
     automated:
       prune: true
       selfHeal: true
+      allowEmpty: false
+
     syncOptions:
     - CreateNamespace=true
+    - Validate=true
+    - ServerSideApply=false
+    - Replace=false
     retry:
       limit: 5
       backoff:

apps/base/musicman/kustomization.yaml

@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- musicman.yaml
-- musicman-credentials.yaml

apps/base/ts-mcp/kustomization.yaml

@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- ts-mcp.yaml
-- ts-mcp-secrets-sealed.yaml

apps/base/ts-mcp/ts-mcp-secrets-sealed.yaml

@@ -1,13 +0,0 @@
----
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  name: ts-mcp-secrets
-  namespace: ts-mcp
-spec:
-  encryptedData:
-    AZURE_CLIENT_SECRET: AgCWj525+NHkZ8XG97hEe4RS0SDC0QIGDXmEvzSlIqJQ9XVZEeKxVuAYmJ+w/HH7zBXD3qlZISeOPKn3FbMEeRukmYK0d5PsH26tRUMPoMzwWCuQkZIQ83uX9Pz/wMiqW8aZFIxpdEiUgVdanxHSFoDRPC1VlSEtV9B9yN2MgXBID5s0oje5BM9ttc4WVRe6+9pMeaOC6u+YUgcfY7xPLetZfC9nQO4zn4jYhoQXfAddwMzNODvQNGPzIv6PXDXJweTwdmtGaxM6eDdcCJI/30bEV9prA5m6UlgTZ/Qp+onU70KdkBA9gM9tMMVUR6j/2sbWzqMP/rVaFLeUH1PjHv15n4EieWyuDyYEfmZNDFXc7O9RIK6P0jCIE+t3myxK2ZQ7cfXprdOSj94au0qP6leat0UUVoc9CFJHHtrNxXYWl7IYVhwvIQCMSgO2qoAXkdW4wKVJAcbJadJjoL2pWxzjaD4GgnUaAxWBANqZI2lD8CED4VfUVMB0ZUYRS/zvy/eqIGlT8WbzwTYFi3YDZRvAUIknxaWEavIG4x52d0FqTmFYY06W53fGYfBrUjJI54GWYyBpKdZTf7b/AlAN0+kwkk6OqsUWwWDqxR7LVCcPhjSIKd/THp+Tbq9z5TiPIHxOO9V60u51f8IoQrEgQfNov7CEGQZ8B9HUGObjNc5MhujzBJasMhrUcd2Ddk6KWk07B7223p/gIEM+81ZWQYUcc29+U/j1dQyRNZy/TC56ywe5DDBJSoGp
-  template:
-    metadata:
-      name: ts-mcp-secrets
-      namespace: ts-mcp

apps/overlays/aks-dev/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- ../../base/musicman

bootstrap.sh

@@ -1,5 +1,4 @@
 #!/bin/zsh
-
 # in case of  $'\r': command not found error, run command below first
 # sed -i 's/\r$//' ./bootstrap.sh
 
@@ -18,7 +17,7 @@ echo "Bootstrapping cluster: ${clusterName} (${CLUSTER})..."
 Bootstrap()
 {
     ArgoCd
-    Gitea
+#    Gitea
 }
 
 
@@ -28,9 +27,8 @@ Bootstrap()
 Gitea()
 {
     echo "Installing secret..."
-    kubectl apply -f "secrets/"
+    kubectl apply -f private/gitea-repo-main.yaml
-    kubectl apply -f "private/${CLUSTER}/gitea-repo-main.yaml"
+    kubectl apply -f private/main.key
-    kubectl apply -f "private/${CLUSTER}/main.key"
 }
 
 ############################################################
@@ -38,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" \
@@ -56,4 +49,4 @@ ArgoCd()
     kubectl apply -f "_app-of-apps-${CLUSTER}.yaml" -n argocd
 }
 
-Bootstrap
+# Bootstrap

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"

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"

cluster-resources/policies/label-checker.yaml

@@ -26,6 +26,7 @@ spec:
           - monitoring
           - secrets
           - kyverno
+          - trivy-system
     match:
       any:
       - resources:

cluster-resources/policies/secret-cloner.yaml

@@ -16,6 +16,7 @@ spec:
       - resources:
           namespaces:
           - kube-system
+          - trivy-system
           - monitoring
           - argocd
           - cert-manager

clusters/aks-dev.yaml

@@ -1,12 +1,10 @@
-# Cluster config reference — values must match the corresponding overlay files.
+clusterName: dev-fd-aks
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
+domain: forteapps.net
-clusterName: k8s-launchpad # → infra/values/aks-dev/argocd-values.yaml (notifications.context.clusterName)
+argocdDomain: argocd.127.0.0.1.nip.io
-domain: example.com # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
+grafanaDomain: grafana.forteapps.net
-argocdDomain: argocd.example.com # → infra/values/aks-dev/argocd-values.yaml (global.domain)
+keycloakDomain: id.forteapps.net
-grafanaDomain: grafana.example.com # → infra/values/aks-dev/grafana-values.yaml (ingress.hosts)
+dotaiDomain: kubemcp.forteapps.net
-keycloakDomain: id.example.com # → infra/values/aks-dev/keycloak-values.yaml (ingress.hostname)
+dotaiUiDomain: kubemcpui.forteapps.net
-dotaiDomain: kubemcp.example.com # → infra/values/aks-dev/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
+letsencryptEmail: danijels@gmail.com
-dotaiUiDomain: kubemcpui.example.com # → infra/values/aks-dev/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
+trustedIPs: "10.0.0.0/8"
-letsencryptEmail: admin@example.com # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
+cloudProvider: azure
-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

clusters/aks-prod.yaml

@@ -1,12 +1,10 @@
-# Cluster config reference — values must match the corresponding overlay files.
+clusterName: prod-fd-aks
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
+domain: fortedigital.com
-clusterName: prod-aks                    # → infra/values/aks-prod/argocd-values.yaml (notifications.context.clusterName)
+argocdDomain: argocd.127.0.0.1.nip.io
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
+grafanaDomain: grafana.fortedigital.com
-argocdDomain: argocd.example.com         # → infra/values/aks-prod/argocd-values.yaml (global.domain)
+keycloakDomain: id.fortedigital.com
-grafanaDomain: grafana.example.com       # → infra/values/aks-prod/grafana-values.yaml (ingress.hosts)
+dotaiDomain: kubemcp.fortedigital.com
-keycloakDomain: id.example.com           # → infra/values/aks-prod/keycloak-values.yaml (ingress.hostname)
+dotaiUiDomain: kubemcpui.fortedigital.com
-dotaiDomain: kubemcp.example.com         # → infra/values/aks-prod/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
+letsencryptEmail: danijel.simeunovic@fortedigital.com
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/aks-prod/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
+trustedIPs: "10.0.0.0/8"
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
+cloudProvider: azure
-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

clusters/eks-dev.yaml

@@ -1,12 +1,10 @@
-# Cluster config reference — values must match the corresponding overlay files.
+clusterName: dev-fd-eks
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
+domain: forteapps.net
-clusterName: dev-eks                     # → infra/values/eks-dev/argocd-values.yaml (notifications.context.clusterName)
+argocdDomain: argocd.127.0.0.1.nip.io
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
+grafanaDomain: grafana.forteapps.net
-argocdDomain: argocd.example.com         # → infra/values/eks-dev/argocd-values.yaml (global.domain)
+keycloakDomain: id.forteapps.net
-grafanaDomain: grafana.example.com       # → infra/values/eks-dev/grafana-values.yaml (ingress.hosts)
+dotaiDomain: kubemcp.forteapps.net
-keycloakDomain: id.example.com           # → infra/values/eks-dev/keycloak-values.yaml (ingress.hostname)
+dotaiUiDomain: kubemcpui.forteapps.net
-dotaiDomain: kubemcp.example.com         # → infra/values/eks-dev/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
+letsencryptEmail: danijels@gmail.com
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/eks-dev/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
+trustedIPs: "10.0.0.0/8"
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
+cloudProvider: aws
-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

clusters/eks-prod.yaml

@@ -1,12 +1,10 @@
-# Cluster config reference — values must match the corresponding overlay files.
+clusterName: prod-fd-eks
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
+domain: fortedigital.com
-clusterName: prod-eks                    # → infra/values/eks-prod/argocd-values.yaml (notifications.context.clusterName)
+argocdDomain: argocd.127.0.0.1.nip.io
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
+grafanaDomain: grafana.fortedigital.com
-argocdDomain: argocd.example.com         # → infra/values/eks-prod/argocd-values.yaml (global.domain)
+keycloakDomain: id.fortedigital.com
-grafanaDomain: grafana.example.com       # → infra/values/eks-prod/grafana-values.yaml (ingress.hosts)
+dotaiDomain: kubemcp.fortedigital.com
-keycloakDomain: id.example.com           # → infra/values/eks-prod/keycloak-values.yaml (ingress.hostname)
+dotaiUiDomain: kubemcpui.fortedigital.com
-dotaiDomain: kubemcp.example.com         # → infra/values/eks-prod/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
+letsencryptEmail: danijel.simeunovic@fortedigital.com
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/eks-prod/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
+trustedIPs: "10.0.0.0/8"
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
+cloudProvider: aws
-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

clusters/gke-dev.yaml

@@ -1,12 +1,10 @@
-# Cluster config reference — values must match the corresponding overlay files.
+clusterName: dev-fd-gke
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
+domain: forteapps.net
-clusterName: dev-gke                     # → infra/values/gke-dev/argocd-values.yaml (notifications.context.clusterName)
+argocdDomain: argocd.127.0.0.1.nip.io
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
+grafanaDomain: grafana.forteapps.net
-argocdDomain: argocd.example.com         # → infra/values/gke-dev/argocd-values.yaml (global.domain)
+keycloakDomain: id.forteapps.net
-grafanaDomain: grafana.example.com       # → infra/values/gke-dev/grafana-values.yaml (ingress.hosts)
+dotaiDomain: kubemcp.forteapps.net
-keycloakDomain: id.example.com           # → infra/values/gke-dev/keycloak-values.yaml (ingress.hostname)
+dotaiUiDomain: kubemcpui.forteapps.net
-dotaiDomain: kubemcp.example.com         # → infra/values/gke-dev/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
+letsencryptEmail: danijels@gmail.com
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/gke-dev/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
+trustedIPs: "10.0.0.0/8"
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
+cloudProvider: gcp
-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

clusters/gke-prod.yaml

@@ -1,12 +1,10 @@
-# Cluster config reference — values must match the corresponding overlay files.
+clusterName: prod-fd-gke
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
+domain: fortedigital.com
-clusterName: prod-gke                    # → infra/values/gke-prod/argocd-values.yaml (notifications.context.clusterName)
+argocdDomain: argocd.127.0.0.1.nip.io
-domain: example.com                      # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
+grafanaDomain: grafana.fortedigital.com
-argocdDomain: argocd.example.com         # → infra/values/gke-prod/argocd-values.yaml (global.domain)
+keycloakDomain: id.fortedigital.com
-grafanaDomain: grafana.example.com       # → infra/values/gke-prod/grafana-values.yaml (ingress.hosts)
+dotaiDomain: kubemcp.fortedigital.com
-keycloakDomain: id.example.com           # → infra/values/gke-prod/keycloak-values.yaml (ingress.hostname)
+dotaiUiDomain: kubemcpui.fortedigital.com
-dotaiDomain: kubemcp.example.com         # → infra/values/gke-prod/dot-ai-stack-values.yaml (dot-ai.ingress.host) — create if needed
+letsencryptEmail: danijel.simeunovic@fortedigital.com
-dotaiUiDomain: kubemcpui.example.com     # → infra/values/gke-prod/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host) — create if needed
+trustedIPs: "10.0.0.0/8"
-letsencryptEmail: admin@example.com      # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
+cloudProvider: gcp
-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

clusters/upc-dev.yaml

@@ -1,12 +1,10 @@
-# Cluster config reference — values must match the corresponding overlay files.
+clusterName: dev-fd-no-svg1
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
+domain: forteapps.net
-clusterName: dev-fd-no-svg1              # → infra/values/upc-dev/argocd-values.yaml (notifications.context.clusterName)
+argocdDomain: argocd.127.0.0.1.nip.io
-domain: forteapps.net                    # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
+grafanaDomain: grafana.forteapps.net
-argocdDomain: argocd.127.0.0.1.nip.io   # → infra/values/upc-dev/argocd-values.yaml (global.domain)
+keycloakDomain: id.forteapps.net
-grafanaDomain: grafana.forteapps.net     # → infra/values/upc-dev/grafana-values.yaml (ingress.hosts)
+dotaiDomain: kubemcp.forteapps.net
-keycloakDomain: id.forteapps.net         # → infra/values/upc-dev/keycloak-values.yaml (ingress.hostname)
+dotaiUiDomain: kubemcpui.forteapps.net
-dotaiDomain: kubemcp.forteapps.net       # → infra/values/upc-dev/dot-ai-stack-values.yaml (dot-ai.ingress.host)
+letsencryptEmail: danijels@gmail.com
-dotaiUiDomain: kubemcpui.forteapps.net   # → infra/values/upc-dev/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host)
+trustedIPs: "172.16.1.0/24"
-letsencryptEmail: danijels@gmail.com     # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
+cloudProvider: upcloud
-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

clusters/upc-prod.yaml

@@ -1,12 +1,10 @@
-# Cluster config reference — values must match the corresponding overlay files.
+clusterName: prod-fd-no-svg1
-# Read by bootstrap.sh at install time; NOT auto-propagated to ArgoCD value files.
+domain: fortedigital.com
-clusterName: prod-fd-no-svg1             # → infra/values/upc-prod/argocd-values.yaml (notifications.context.clusterName)
+argocdDomain: argocd.127.0.0.1.nip.io
-domain: fortedigital.com                 # → infra/values/base/gitea-values.yaml, renovate-values.yaml, keycloak-values.yaml (subdomains)
+grafanaDomain: grafana.fortedigital.com
-argocdDomain: argocd.127.0.0.1.nip.io   # → infra/values/upc-prod/argocd-values.yaml (global.domain)
+keycloakDomain: id.fortedigital.com
-grafanaDomain: grafana.fortedigital.com  # → infra/values/upc-prod/grafana-values.yaml (ingress.hosts)
+dotaiDomain: kubemcp.fortedigital.com
-keycloakDomain: id.fortedigital.com      # → infra/values/upc-prod/keycloak-values.yaml (ingress.hostname)
+dotaiUiDomain: kubemcpui.fortedigital.com
-dotaiDomain: kubemcp.fortedigital.com    # → infra/values/upc-prod/dot-ai-stack-values.yaml (dot-ai.ingress.host)
+letsencryptEmail: danijel.simeunovic@fortedigital.com
-dotaiUiDomain: kubemcpui.fortedigital.com # → infra/values/upc-prod/dot-ai-stack-values.yaml (dot-ai-ui.ingress.host)
+trustedIPs: "172.16.1.0/24"
-letsencryptEmail: danijel.simeunovic@fortedigital.com # → cluster-resources/letsencrypt-issuer.yaml (spec.acme.email)
+cloudProvider: upcloud
-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

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"
-      ]
-    }
-  }
-}

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

docs/GITOPS-ARCHITECTURE.md

@@ -12,11 +12,11 @@
 
 ## Overview
 
-This Kubernetes cluster uses a **GitOps approach** powered by **ArgoCD**, where Git repositories serve as the single source of truth for both infrastructure and application deployments. The cluster setup is **cloud-agnostic**, with ready-to-use configurations for **UpCloud**, **AWS EKS**, **Azure AKS**, and **GCP GKE**.
+This Kubernetes cluster uses a **GitOps approach** powered by **ArgoCD**, where Git repositories serve as the single source of truth for both infrastructure and application deployments. The cluster is running on **UpCloud Managed Kubernetes** but is designed to be cloud-agnostic.
 
 ### Key Characteristics
 - **Environment**: Production (internal use only)
-- **Cluster Type**: Multi-cloud, multi-cluster via Kustomize overlays (UpCloud, AWS, Azure, GCP)
+- **Cluster Type**: Multi-cluster (upc-dev, upc-prod) via Kustomize overlays
 - **GitOps Tool**: ArgoCD
 - **Deployment Pattern**: App-of-Apps
 - **Secret Management**: Sealed Secrets (kubeseal)
@@ -63,7 +63,7 @@ This Kubernetes cluster uses a **GitOps approach** powered by **ArgoCD**, where
                                                         ▼
                                            ┌────────────────────────────────┐
                                            │   Kubernetes Clusters          │
-                                           │   (UpCloud, AWS, Azure, GCP)    │
+                                           │   (UpCloud: upc-dev, upc-prod) │
                                            │                                │
                                            │  ┌──────────────────────────┐  │
                                            │  │    ArgoCD                │  │
@@ -120,47 +120,46 @@ launchpad/
 ├── _app-of-apps-upc-prod.yaml       # Root ArgoCD Application (upc-prod cluster)
 │
 ├── infra/                            # Infrastructure ArgoCD Applications (Kustomize)
-│   ├── base/                         # Base Application manifests (one dir per component)
+│   ├── base/                         # Base Application manifests (upc-dev defaults)
-│   │   ├── kustomization.yaml        # Aggregates all component subdirectories
+│   │   ├── kustomization.yaml
-│   │   ├── traefik-application/
+│   │   ├── traefik-application.yaml
-│   │   │   ├── kustomization.yaml
+│   │   ├── keycloak.yaml
-│   │   │   └── traefik-application.yaml
+│   │   ├── grafana.yaml
-│   │   ├── keycloak/
+│   │   ├── gitea.yaml
-│   │   │   ├── kustomization.yaml
+│   │   ├── gitea-actions.yaml
-│   │   │   └── keycloak.yaml
+│   │   ├── tempo.yaml
-│   │   ├── grafana/
+│   │   ├── renovate.yaml
-│   │   ├── prometheus/
+│   │   ├── ...                       # All other Application manifests
-│   │   ├── ...                       # Each component in its own subdirectory
+│   │   └── secrets.yaml
-│   │   └── secrets/
+│   ├── overlays/                     # Per-cluster overrides
-│   ├── overlays/                     # Per-cluster Kustomize overrides
+│   │   ├── upc-dev/                  # UpCloud Dev (uses base as-is)
-│   │   ├── upc-dev/                  # UpCloud Dev — includes all (resources: ../../base)
+│   │   └── upc-prod/                # UpCloud Prod (patches value paths)
-│   │   ├── upc-prod/                # UpCloud Prod — all + patches
-│   │   ├── aks-dev/                 # Azure AKS Dev — selective components
-│   │   ├── aks-prod/               # Azure AKS Prod
-│   │   ├── eks-dev/                  # AWS EKS Dev
-│   │   ├── eks-prod/                # AWS EKS Prod
-│   │   ├── gke-dev/                 # GCP GKE Dev
-│   │   └── gke-prod/               # GCP GKE Prod
 │   ├── dashboards/                   # Grafana dashboard ConfigMaps
 │   └── values/                       # Helm value overrides for infra
-│       ├── base/                     # Cloud-agnostic shared values
+│       ├── base/                     # Shared values (all clusters)
-│       ├── upc-{dev,prod}/           # UpCloud: storage class, LB, pricing
+│       │   ├── traefik-values.yaml
-│       ├── aws-{dev,prod}/           # AWS: gp3, NLB, CUR pricing
+│       │   ├── keycloak-values.yaml
-│       ├── aks-{dev,prod}/         # Azure: managed-csi-premium, Standard LB
+│       │   ├── grafana-values.yaml
-│       └── gcp-{dev,prod}/           # GCP: premium-rwo, L4 LB
+│       │   ├── prometheus-values.yaml
+│       │   ├── gitea-values.yaml
+│       │   └── ...
+│       ├── upc-dev/                  # upc-dev cluster-specific values
+│       │   ├── traefik-values.yaml
+│       │   ├── keycloak-values.yaml
+│       │   └── grafana-values.yaml
+│       └── upc-prod/                # upc-prod cluster-specific values
+│           ├── traefik-values.yaml
+│           ├── keycloak-values.yaml
+│           └── grafana-values.yaml
 │
 ├── apps/                             # Business Application ArgoCD manifests (Kustomize)
-│   ├── base/                         # One subdirectory per app
+│   ├── base/                         # Base app manifests
 │   │   ├── kustomization.yaml
-│   │   ├── musicman/
+│   │   ├── dot-ai-stack.yaml
-│   │   ├── mcp10x/
+│   │   └── ...
-│   │   ├── dot-ai-stack/
-│   │   ├── ts-mcp/
-│   │   └── argo-mcp/
 │   └── overlays/
-│       ├── upc-dev/                  # All apps (resources: ../../base)
+│       ├── upc-dev/                  # Uses base as-is
-│       ├── upc-prod/                # All apps + patches
+│       └── upc-prod/                # Patches value paths
-│       └── aks-dev/                 # Selective apps only
 │
 ├── cluster-resources/                # Cluster-wide Kubernetes resources
 │   ├── ...
@@ -176,8 +175,6 @@ launchpad/
 
 **Key Points**:
 - `_app-of-apps-upc-dev.yaml` and `_app-of-apps-upc-prod.yaml` are the per-cluster root Applications
-- Each component in `base/` has its own subdirectory with a `kustomization.yaml`
-- Overlays can include **all** components (`resources: [../../base]`) or **cherry-pick** specific ones (`resources: [../../base/grafana, ../../base/prometheus]`)
 - Kustomize overlays in `infra/overlays/` render base Applications with per-cluster patches
 - Helm values are split: `values/base/` (shared) + `values/upc-dev/` or `values/upc-prod/` (cluster-specific)
 - `apps/` follows the same base/overlays pattern for business applications
@@ -290,7 +287,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-{upc-dev,upc-prod}.yaml (Root, per cluster)
     │
     ├── infrastructure-apps (manages infra/)
     │   ├── cluster-resources-application
@@ -360,30 +357,16 @@ spec:
 
 ### Multi-Cluster Pattern
 
-Kustomize overlays enable deploying the same Applications across clusters with different configurations.
+Kustomize overlays enable deploying the same Applications across clusters with different configurations:
-
-Each component in `infra/base/` and `apps/base/` lives in its own subdirectory. Overlays define **which components to include** and optionally **patch** them:
 
 ```yaml
-# Option 1: Include ALL components (full cluster)
+# infra/base/ contains default (upc-dev) Applications
-# infra/overlays/upc-dev/kustomization.yaml
+# Helm values are layered: base + cluster-specific
-resources:
+valueFiles:
-- ../../base                    # Pulls in every component subdirectory
+- $values/infra/values/base/traefik-values.yaml    # Shared config
+- $values/infra/values/upc-dev/traefik-values.yaml  # Cluster-specific
 
-# Option 2: Cherry-pick specific components (lightweight cluster)
+# infra/overlays/upc-prod/kustomization.yaml patches the second valueFile
-# infra/overlays/aks-dev/kustomization.yaml
-resources:
-- ../../base/traefik-application
-- ../../base/grafana
-- ../../base/prometheus
-- ../../base/loki
-# Only listed components are deployed — others are excluded
-```
-
-Per-cluster patches swap Helm value file paths:
-
-```yaml
-# infra/overlays/upc-prod/kustomization.yaml
 patches:
 - target:
     kind: Application
@@ -394,15 +377,6 @@ patches:
       value: $values/infra/values/upc-prod/traefik-values.yaml
 ```
 
-Cloud-specific values (storage classes, load balancer annotations, cost model) are isolated in per-cluster value files. Base values are fully cloud-agnostic:
-
-| Cloud | Storage Class | Load Balancer | OpenCost Provider |
-|-------|--------------|---------------|-------------------|
-| **UpCloud** | `upcloud-block-storage-maxiops` | UpCloud LB (ProxyProtocol v2) | Custom pricing |
-| **AWS EKS** | `gp3` (EBS CSI) | NLB (ProxyProtocol v2) | AWS CUR |
-| **Azure AKS** | `managed-csi-premium` | Standard LB (`externalTrafficPolicy: Local`) | Azure Billing API |
-| **GCP GKE** | `premium-rwo` (PD CSI) | L4 passthrough NLB | GCP Cloud Billing |
-
 **Benefits**:
 - Single source of truth for Application definitions
 - Cluster-specific values isolated per overlay
@@ -684,6 +658,6 @@ Notifications include:
 
 ---
 
-**Last Updated**: 2026-04-22
+**Last Updated**: 2026-03-16
 **Maintained By**: Platform Team
 **Questions?**: Contact #platform-support on Slack

docs/OPERATIONS-RUNBOOK.md

@@ -37,7 +37,7 @@ Bootstrap a new cluster from scratch:
 
 #### Prerequisites
 
-1. **Kubernetes cluster running** (UpCloud, AWS EKS, Azure AKS, GCP GKE, or any K8s cluster)
+1. **Kubernetes cluster running** (UpCloud or any K8s cluster)
 2. **kubectl configured** with admin access
 3. **Repositories cloned** locally
 
@@ -54,13 +54,11 @@ kubectl get nodes
 git clone https://git.forteapps.net/Forte/launchpad
 cd launchpad
 
-# 2. Run bootstrap script with cluster target
+# 2. Set cluster name (optional)
-# Available clusters: upc-dev, upc-prod, eks-dev, eks-prod,
+export CLUSTER_NAME="prod-cluster-01"
-#                     aks-dev, aks-prod, gke-dev, gke-prod
-./bootstrap.sh upc-dev
 
-# Cluster config is loaded from clusters/<cluster>.yaml
+# 3. Run bootstrap script
-# (cloudProvider, trustedIPs, domain, etc.)
+./bootstrap.sh
 ```
 
 **What Happens:**
@@ -1264,21 +1262,13 @@ spec:
 
 ### Backup Strategy
 
-**Current State**: Gitea daily backups to S3-compatible storage
+**Current State**: No automated backups
 
-**What Is Backed Up**:
+**What Needs Backup**:
-- ✅ Gitea repositories + database: Daily CronJob (`cluster-resources/gitea-backup-cronjob.yaml`) uploads to S3-compatible storage with 7-day retention
+- ❌ Cluster state (not backed up - recreate via GitOps)
-- ✅ Git repositories: Full cluster config recoverable from Git
+- ❌ Persistent volumes (currently not critical)
-- ⚠️ Secrets: Sealed secrets in Git; unseal keys need safekeeping
+- ✅ Git repositories (Gitea provides backup)
-
+- ⚠️ Secrets (sealed secrets in Git, unseal keys need safekeeping)
-**What Is NOT Backed Up**:
-- ❌ Cluster state (recreate via GitOps)
-- ❌ 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)
 
 ### Cluster Rebuild
 
@@ -1380,9 +1370,6 @@ kubectl get pods -n argocd
 
 ```bash
 # UpCloud: Upgrade via control panel or CLI
-# AWS EKS: eksctl upgrade cluster / AWS Console
-# Azure AKS: az aks upgrade / Azure Portal
-# GCP GKE: gcloud container clusters upgrade / Cloud Console
 
 # After upgrade, verify cluster
 kubectl version
@@ -1520,35 +1507,18 @@ git push
 
 ### Multi-Cluster Setup
 
-The repository supports multiple clusters across multiple clouds via Kustomize overlays:
+The repository supports multiple clusters via Kustomize overlays:
 
-**Active clusters:**
 - **upc-dev** (default): `infra/overlays/upc-dev/` — uses base Applications as-is
 - **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
-
 Each cluster has its own:
-- Root app-of-apps: `_app-of-apps-{cluster}.yaml`
+- Root app-of-apps file: `_app-of-apps-upc-dev.yaml` / `_app-of-apps-upc-prod.yaml`
-- Cluster config: `clusters/{cluster}.yaml` (domain, trustedIPs, cloudProvider)
+- Cluster-specific Helm values: `infra/values/upc-dev/` / `infra/values/upc-prod/`
-- Kustomize overlay: `infra/overlays/{cluster}/kustomization.yaml`
+- Sealed secrets: `secrets/upc-dev/` (others as needed)
-- Helm value overrides: `infra/values/{cluster}/` (traefik, gitea, opencost)
+- Apps overlay: `apps/overlays/upc-dev/` / `apps/overlays/upc-prod/`
-- Sealed secrets: `secrets/{cluster}/` (as needed)
-- Apps overlay: `apps/overlays/{cluster}/`
 
-Cloud-specific values handled per-cluster:
+To add a new cluster, create a new overlay directory (e.g., `infra/overlays/upc-staging/`) with patches that swap the value file paths.
-
-| Concern | UpCloud | AWS EKS | Azure AKS | GCP GKE |
-|---------|---------|---------|-----------|---------|
-| **Storage class** | `upcloud-block-storage-maxiops` | `gp3` | `managed-csi-premium` | `premium-rwo` |
-| **Load balancer** | UpCloud LB + ProxyProtocol v2 | NLB + ProxyProtocol v2 | Standard LB + `externalTrafficPolicy: Local` | L4 passthrough NLB |
-| **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`.
 
 ### Blue-Green Deployments
 
@@ -1691,6 +1661,6 @@ echo "Remember to delete: $SECRET_FILE"
 
 ---
 
-**Last Updated**: 2026-04-22
+**Last Updated**: 2026-03-16
 **Maintained By**: Platform Team
 **Emergency Contact**: #platform-support on Slack

docs/README.md

@@ -180,7 +180,7 @@ Reference for:
                             │
                             ▼
 ┌──────────────────────────────────────────────────────────────┐
-│          Kubernetes Clusters (UpCloud, AWS, Azure, GCP)       │
+│          Kubernetes Clusters (UpCloud: upc-dev, upc-prod)     │
 │  ┌──────────────────────────────────────────────────────┐    │
 │  │  Infrastructure: Traefik, Cert-Manager, Kyverno     │    │
 │  ├──────────────────────────────────────────────────────┤    │
@@ -194,7 +194,7 @@ Reference for:
 ### Key Technologies
 
 - **GitOps**: ArgoCD
-- **Kubernetes**: Multi-cloud (UpCloud, AWS EKS, Azure AKS, GCP GKE)
+- **Kubernetes**: UpCloud Managed Kubernetes (multi-cluster: upc-dev, upc-prod)
 - **Ingress**: Traefik v2
 - **Certificates**: Cert-Manager + Let's Encrypt
 - **Policies**: Kyverno
@@ -299,16 +299,11 @@ docs/
 ## 🔄 Documentation Versions
 
 **Current Version**: 1.0.0
-**Last Updated**: 2026-04-22
+**Last Updated**: 2026-03-16
 **Maintained By**: Platform Team
 
 ### Changelog
 
-- **v1.1.0 (2026-04-22)**: Multi-cloud support
-  - Cloud-agnostic base values (storage, LB, pricing moved to per-cluster overlays)
-  - Added AWS EKS, Azure AKS, GCP GKE configurations
-  - Per-cloud backup scripts
-  - Updated all documentation
 - **v1.0.0 (2026-03-16)**: Initial comprehensive documentation release
   - GitOps Architecture guide
   - Developer Onboarding guide

docs/REFERENCE.md

@@ -20,10 +20,9 @@
 
 | Component | Value |
 |-----------|-------|
-| **Provider** | Multi-cloud (UpCloud, AWS EKS, Azure AKS, GCP GKE) |
+| **Provider** | Multi-cloud (UpCloud, AKS, EKS, GKE) |
 | **Environment** | Dev + Production per cloud |
-| **Active clusters** | UpCloud (upc-dev, upc-prod) |
+| **Cluster Count** | Multi-cluster (upc-dev/prod, aks-dev/prod, eks-dev/prod, gke-dev/prod) |
-| **Cloud-ready templates** | EKS, AKS, GKE (dev + prod each) |
 | **GitOps Tool** | ArgoCD |
 | **Ingress Controller** | Traefik v2 |
 | **Certificate Management** | Cert-Manager + Let's Encrypt |
@@ -44,7 +43,7 @@ Internet
 [DNS: *.forteapps.net]
    │
    ▼
-[Cloud Load Balancer]
+[UpCloud LoadBalancer]
    │
    ▼
 [Traefik Ingress Controller]
@@ -76,28 +75,34 @@ launchpad/
 ├── _app-of-apps-upc-dev.yaml     # Root ArgoCD Application (upc-dev)
 ├── _app-of-apps-upc-prod.yaml    # Root ArgoCD Application (upc-prod)
 │
-├── infra/                         # Infrastructure applications (Kustomize)
+├── infra/                         # Infrastructure applications
-│   ├── base/                      # One subdirectory per component
+│   ├── cluster-resources-application.yaml
-│   │   ├── kustomization.yaml     # Aggregates all component subdirectories
+│   ├── enterprise-apps.yaml
-│   │   ├── traefik-application/
+│   ├── traefik-application.yaml
-│   │   │   ├── kustomization.yaml
+│   ├── cert-manager-application.yaml
-│   │   │   └── traefik-application.yaml
+│   ├── kyverno.yaml
-│   │   ├── keycloak/
+│   ├── kyverno-policies.yaml
-│   │   │   ├── kustomization.yaml
+│   ├── prometheus.yaml
-│   │   │   └── keycloak.yaml
+│   ├── grafana.yaml
-│   │   ├── grafana/
+│   ├── loki.yaml
-│   │   ├── prometheus/
+│   ├── tempo.yaml
-│   │   ├── loki/
+│   ├── fluent-bit.yaml
-│   │   ├── tempo/
+│   ├── trivy.yaml
-│   │   ├── gitea/
+│   ├── gitea.yaml
-│   │   ├── opencost/
+│   ├── gitea-actions.yaml
-│   │   ├── ...                    # Each component in own directory
+│   ├── sealedsecrets.yaml
-│   │   └── secrets/
+│   ├── secrets.yaml
-│   ├── overlays/                  # Per-cluster: include all or cherry-pick
+│   ├── renovate.yaml
-│   │   ├── upc-dev/              # resources: [../../base] (all components)
+│   ├── base/                      # ArgoCD Application manifests (Kustomize base)
-│   │   ├── upc-prod/            # resources: [../../base] + patches
+│   │   ├── gitea.yaml
-│   │   ├── aks-dev/             # resources: [../../base/grafana, ...] (selective)
+│   │   ├── opencost.yaml
-│   │   └── .../                  # 8 clusters total
+│   │   ├── 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
@@ -117,18 +122,11 @@ launchpad/
 │           ├── gitea-values.yaml
 │           └── opencost-values.yaml
 │
-├── apps/                          # Business applications (Kustomize)
+├── apps/                          # Business applications
-│   ├── base/                     # One subdirectory per app
+│   ├── mcp10x.yaml
-│   │   ├── kustomization.yaml
+│   ├── musicman.yaml
-│   │   ├── musicman/
+│   ├── dot-ai-stack.yaml
-│   │   ├── mcp10x/
+│   └── argo-mcp.yaml
-│   │   ├── dot-ai-stack/
-│   │   ├── ts-mcp/
-│   │   └── argo-mcp/
-│   └── overlays/                 # Per-cluster: include all or cherry-pick
-│       ├── upc-dev/
-│       ├── upc-prod/
-│       └── aks-dev/              # Selective apps only
 │
 ├── cluster-resources/             # Cluster-level resources
 │   ├── cert-manager-namespace.yaml
@@ -149,30 +147,12 @@ launchpad/
 │       └── auth-sidecar-injector.yaml
 │
 ├── secrets/                       # Application secrets (sealed)
-│   ├── base/                     # All SealedSecrets (shared across clouds)
+│   ├── argocd-mcp-credentials.yaml
-│   │   ├── kustomization.yaml
+│   ├── dot-ai-secrets.yaml
-│   │   ├── argocd-forte-helm-secret-sealed.yaml
+│   ├── gitea-credentials-sealed.yaml
-│   │   ├── argocd-mcp-credentials.yaml
+│   ├── gitea-runner-token-sealed.yaml
-│   │   ├── argocdmcp-auth-oidc-sealed.yaml
+│   ├── mcp10x-credentials-sealed.yaml
-│   │   ├── dot-ai-secrets.yaml
+│   └── musicman-credentials.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)
@@ -650,134 +630,10 @@ 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
 
-### Homepage (Platform Dashboard)
-
-**Chart**: `jameswynn/homepage`
-**Namespace**: `homepage`
-**URL**: `https://start.forteapps.net`
-
-Platform dashboard that auto-discovers deployed apps via Kubernetes service annotations.
-
-**Discovery mechanism**: Services annotated with `gethomepage.dev/enabled: "true"` appear in the dashboard. Apps not deployed = annotations absent = not shown. Fully dynamic per environment.
-
-**Annotated services**:
-| Service | Namespace | Group | Widget |
-|---------|-----------|-------|--------|
-| `gitea-http` | `gitea` | DevOps | `gitea` |
-| `argocd-server` | `argocd` | DevOps | `argocd` |
-| `keycloak` | `keycloak` | Identity | none |
-| `grafana` | `monitoring` | Monitoring | `grafana` |
-| `karpor-server` | `karpor` | DevOps | none |
-
-**Adding a new app**: Annotate the app's Service in its Helm values:
-```yaml
-service:
-  annotations:
-    gethomepage.dev/enabled: "true"
-    gethomepage.dev/name: "My App"
-    gethomepage.dev/description: "What it does"
-    gethomepage.dev/group: "GroupName"
-    gethomepage.dev/icon: "icon-name"     # https://github.com/walkxcode/dashboard-icons
-    gethomepage.dev/href: "https://myapp.forteapps.net"
-    # Optional live widget:
-    gethomepage.dev/widget.type: "myapp"
-    gethomepage.dev/widget.url: "https://myapp.forteapps.net"
-    # gethomepage.dev/widget.key: "{{HOMEPAGE_VAR_MYAPP_TOKEN}}"
-```
-
-**Widget API credentials**: Inject via env vars into the Homepage pod:
-```yaml
-# In homepage-values.yaml per environment
-env:
-- name: HOMEPAGE_VAR_GRAFANA_TOKEN
-  valueFrom:
-    secretKeyRef:
-      name: homepage-widget-credentials
-      key: grafana-token
-```
-Then reference as `gethomepage.dev/widget.key: "{{HOMEPAGE_VAR_GRAFANA_TOKEN}}"`.
-
-**Values files**:
-- `infra/values/base/homepage-values.yaml` — RBAC, kubernetes mode, layout
-- `infra/values/{env}/homepage-values.yaml` — hostname per environment
-
----
-
 ### Traefik
 
 **Chart**: `traefik/traefik`
@@ -849,10 +705,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 \
@@ -893,15 +745,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`
@@ -1254,33 +1097,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`)
@@ -1728,23 +1544,7 @@ Forward to Application (localhost:3000)
 Application processes request
 ```
 
-#### Forwarded Headers
+**See**: [Developer Guide - Enabling Authentication](DEVELOPER-GUIDE.md#enabling-authentication-for-applications) for usage examples.
-
-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.
 
 ---
 
@@ -1778,22 +1578,14 @@ Recommended resource allocation:
 
 ### Storage Classes
 
-Storage classes are cloud-specific and configured in per-cluster value overrides (`infra/values/{cluster}/gitea-values.yaml`):
+Default storage class used: **UpCloud default** (varies by provider)
-
-| Cloud | Storage Class | Driver |
-|-------|--------------|--------|
-| **UpCloud** | `upcloud-block-storage-maxiops` | UpCloud CSI |
-| **AWS EKS** | `gp3` | EBS CSI |
-| **Azure AKS** | `managed-csi-premium` | Azure Disk CSI |
-| **GCP GKE** | `premium-rwo` | PD CSI |
 
 ```yaml
-# Example: base values omit storageClass (set in per-cluster overlay)
 persistence:
   enabled: true
+  storageClass: ""     # Uses default
   accessMode: ReadWriteOnce
   size: 5Gi
-  # storageClass set by infra/values/{cluster}/gitea-values.yaml
 ```
 
 ---
@@ -1933,9 +1725,8 @@ To add support for a new cloud (e.g., `oci-dev` for Oracle Cloud):
    - `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
+5. **Sealed Secrets**: `secrets/oci-dev/` — TLS certs, credentials, backup S3 config
-6. **Secrets patch**: Add patch to `infra/overlays/oci-dev/kustomization.yaml` to swap secrets path to `secrets/overlays/oci-dev`
+6. **Bootstrap**: `./bootstrap.sh oci-dev`
-7. **Bootstrap**: `./bootstrap.sh oci-dev`
 
 ---
 
@@ -2071,6 +1862,6 @@ team: platform
 
 ---
 
-**Last Updated**: 2026-04-22
+**Last Updated**: 2026-04-16
 **Maintained By**: Platform Team
 **Version**: 1.0.0

infra/base/cert-manager-application/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- cert-manager-application.yaml

infra/base/cluster-resources-application/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- cluster-resources-application.yaml

infra/base/databunker/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- databunker.yaml

infra/base/enterprise-apps/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- enterprise-apps.yaml

infra/base/fluent-bit/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- fluent-bit.yaml

infra/base/gitea-actions/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- gitea-actions.yaml

infra/base/gitea/kustomization.yaml

@@ -1,8 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- gitea.yaml
-- gitea-backup-s3-sealed.yaml
-- gitea-credentials-sealed.yaml
-- gitea-runner-token-sealed.yaml
-- gitea-smtp-secret-sealed.yaml

infra/base/grafana-dashboards/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- grafana-dashboards.yaml

infra/base/grafana/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- grafana.yaml

infra/base/homepage/homepage.yaml

@@ -1,43 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: homepage
-  namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "3"
-  labels:
-    app.kubernetes.io/name: homepage
-    app.kubernetes.io/part-of: platform
-    app.kubernetes.io/managed-by: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-
-  sources:
-  - repoURL: https://jameswynn.github.io/helm-charts
-    chart: homepage
-    targetRevision: "2.1.0"
-    helm:
-      releaseName: homepage
-      valueFiles:
-      - $values/infra/values/base/homepage-values.yaml
-      - $values/infra/values/upc-dev/homepage-values.yaml
-
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    ref: values
-
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: homepage
-
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-      allowEmpty: false
-    syncOptions:
-    - CreateNamespace=true
-    - Validate=true
-    - ServerSideApply=true

infra/base/homepage/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- homepage.yaml

infra/base/karpor/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

infra/base/karpor/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- karpor.yaml

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

infra/base/keycloak/kustomization.yaml

@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- keycloak.yaml
-- keycloak-credentials-sealed.yaml

infra/base/kustomization.yaml

@@ -1,24 +1,24 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- traefik-application
+- traefik-application.yaml
-- keycloak
+- keycloak.yaml
-- grafana
+- grafana.yaml
-- cert-manager-application
+- cert-manager-application.yaml
-- kyverno
+- kyverno.yaml
-- sealedsecrets
+- sealedsecrets.yaml
-- prometheus
+- prometheus.yaml
-- loki
+- loki.yaml
-- fluent-bit
+- fluent-bit.yaml
-- enterprise-apps
+- trivy.yaml
-- cluster-resources-application
+- enterprise-apps.yaml
-- kyverno-policies
+- cluster-resources-application.yaml
-- gitea
+- kyverno-policies.yaml
-- gitea-actions
+- secrets.yaml
-- opencost
+- gitea.yaml
-- renovate
+- gitea-actions.yaml
-- tempo
+- opencost.yaml
-- grafana-dashboards
+- renovate.yaml
-- karpor
+- tempo.yaml
-- databunker
+- grafana-dashboards.yaml
-- homepage
+- network-policies-application.yaml

infra/base/kyverno-policies/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- kyverno-policies.yaml

infra/base/kyverno/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- kyverno.yaml

infra/base/loki.yaml

@@ -40,9 +40,3 @@ spec:
     - CreateNamespace=true
     - Validate=true
     - ServerSideApply=true
-
-  ignoreDifferences:
-  - group: apps
-    kind: StatefulSet
-    jsonPointers:
-    - /spec/volumeClaimTemplates

infra/base/loki/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- loki.yaml

infra/base/network-policies-application.yaml

@@ -1,42 +1,33 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: databunker
+  name: network-policies
   namespace: argocd
+  labels:
+    app.kubernetes.io/name: network-policies
+    app.kubernetes.io/part-of: platform
+    app.kubernetes.io/managed-by: argocd
   annotations:
     argocd.argoproj.io/sync-wave: "1"
-  labels:
-    app.kubernetes.io/name: databunker
-    app.kubernetes.io/part-of: identity
-    app.kubernetes.io/managed-by: argocd
   finalizers:
   - resources-finalizer.argocd.argoproj.io
 spec:
   project: default
 
-  sources:
+  source:
-  - repoURL: https://securitybunker.github.io/databunkerpro-setup
+    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    chart: databunkerpro
-    targetRevision: "0.1.0"
-    helm:
-      releaseName: databunkerpro
-      valueFiles:
-      - $values/infra/values/base/databunker-values.yaml
-
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
     targetRevision: HEAD
-    ref: values
+    path: cluster-resources/network
 
   destination:
     server: https://kubernetes.default.svc
-    namespace: databunker
 
   syncPolicy:
     automated:
       prune: true
       selfHeal: true
       allowEmpty: false
+
     syncOptions:
-    - CreateNamespace=true
     - Validate=true
     - ServerSideApply=true

infra/base/opencost/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- opencost.yaml

infra/base/prometheus/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- prometheus.yaml

infra/base/renovate/kustomization.yaml

@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- renovate.yaml
-- renovate-env-sealed.yaml

infra/base/sealedsecrets/kustomization.yaml

@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- sealedsecrets.yaml
-- argocd-forte-helm-secret-sealed.yaml

infra/base/secrets.yaml

@@ -1,37 +1,27 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: ts-mcp
+  name: secrets
   namespace: argocd
   annotations:
-    argocd.argoproj.io/sync-wave: "11"
+    argocd.argoproj.io/sync-wave: "2"
     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/name: secrets
-    app.kubernetes.io/part-of: apps
+    app.kubernetes.io/part-of: platform
     app.kubernetes.io/managed-by: argocd
   finalizers:
   - resources-finalizer.argocd.argoproj.io
 spec:
   project: default
-  sources:
+  source:
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/forte-helm.git
+    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    path: forteapp
+    path: secrets/upc-dev
-    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
+    namespace: secrets
-
   syncPolicy:
     automated:
       prune: true

infra/base/tempo.yaml

@@ -40,9 +40,3 @@ spec:
     - CreateNamespace=true
     - Validate=true
     - ServerSideApply=true
-
-  ignoreDifferences:
-  - group: apps
-    kind: StatefulSet
-    jsonPointers:
-    - /spec/volumeClaimTemplates

infra/base/tempo/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- tempo.yaml

infra/base/traefik-application/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- traefik-application.yaml

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

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

infra/overlays/aks-dev/kustomization.yaml

@@ -1,31 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base/cert-manager-application
+- ../../base
-- ../../base/cluster-resources-application
-- ../../base/grafana
-- ../../base/grafana-dashboards
-- ../../base/kyverno
-- ../../base/kyverno-policies
-- ../../base/loki
-- ../../base/enterprise-apps
-- ../../base/opencost
-- ../../base/prometheus
-- ../../base/sealedsecrets
-- ../../base/tempo
-- ../../base/homepage
-- ../../base/traefik-application
 
 patches:
-# Homepage: swap upc-dev → aks-dev
-- target:
-    kind: Application
-    name: homepage
-  patch: |
-    - op: replace
-      path: /spec/sources/0/helm/valueFiles/1
-      value: $values/infra/values/aks-dev/homepage-values.yaml
-
 # Traefik: swap upc-dev → aks-dev
 - target:
     kind: Application
@@ -35,6 +13,15 @@ patches:
       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
@@ -44,6 +31,15 @@ patches:
       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
@@ -53,7 +49,16 @@ patches:
       path: /spec/sources/0/helm/valueFiles/1
       value: $values/infra/values/aks-dev/opencost-values.yaml
 
-# Ent apps: swap upc-dev → aks-prod
+# 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

infra/overlays/aks-prod/kustomization.yaml

@@ -1,18 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base/cert-manager-application
+- ../../base
-- ../../base/cluster-resources-application
-- ../../base/grafana
-- ../../base/grafana-dashboards
-- ../../base/kyverno
-- ../../base/kyverno-policies
-- ../../base/loki
-- ../../base/opencost
-- ../../base/prometheus
-- ../../base/sealedsecrets
-- ../../base/tempo
-- ../../base/traefik-application
 
 patches:
 # Traefik: swap upc-dev → aks-prod
@@ -24,7 +13,16 @@ patches:
       path: /spec/sources/0/helm/valueFiles/1
       value: $values/infra/values/aks-prod/traefik-values.yaml
 
-# Grafana: swap upc-dev → aks-prod  
+# 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
@@ -33,6 +31,15 @@ patches:
       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
@@ -41,3 +48,21 @@ patches:
     - 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

infra/overlays/eks-dev/kustomization.yaml

@@ -1,18 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base/cert-manager-application
+- ../../base
-- ../../base/cluster-resources-application
-- ../../base/grafana
-- ../../base/grafana-dashboards
-- ../../base/kyverno
-- ../../base/kyverno-policies
-- ../../base/loki
-- ../../base/opencost
-- ../../base/prometheus
-- ../../base/sealedsecrets
-- ../../base/tempo
-- ../../base/traefik-application
 
 patches:
 # Traefik: swap upc-dev → eks-dev
@@ -24,7 +13,16 @@ patches:
       path: /spec/sources/0/helm/valueFiles/1
       value: $values/infra/values/eks-dev/traefik-values.yaml
 
-# Grafana: swap upc-dev → eks-dev  
+# 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
@@ -33,6 +31,15 @@ patches:
       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
@@ -41,3 +48,21 @@ patches:
     - 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

infra/overlays/eks-prod/kustomization.yaml

@@ -1,18 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base/cert-manager-application
+- ../../base
-- ../../base/cluster-resources-application
-- ../../base/grafana
-- ../../base/grafana-dashboards
-- ../../base/kyverno
-- ../../base/kyverno-policies
-- ../../base/loki
-- ../../base/opencost
-- ../../base/prometheus
-- ../../base/sealedsecrets
-- ../../base/tempo
-- ../../base/traefik-application
 
 patches:
 # Traefik: swap upc-dev → eks-prod
@@ -24,7 +13,16 @@ patches:
       path: /spec/sources/0/helm/valueFiles/1
       value: $values/infra/values/eks-prod/traefik-values.yaml
 
-# Grafana: swap upc-dev → eks-prod  
+# 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
@@ -33,6 +31,15 @@ patches:
       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
@@ -41,3 +48,21 @@ patches:
     - 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

infra/overlays/gke-dev/kustomization.yaml

@@ -1,18 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base/cert-manager-application
+- ../../base
-- ../../base/cluster-resources-application
-- ../../base/grafana
-- ../../base/grafana-dashboards
-- ../../base/kyverno
-- ../../base/kyverno-policies
-- ../../base/loki
-- ../../base/opencost
-- ../../base/prometheus
-- ../../base/sealedsecrets
-- ../../base/tempo
-- ../../base/traefik-application
 
 patches:
 # Traefik: swap upc-dev → gke-dev
@@ -24,7 +13,16 @@ patches:
       path: /spec/sources/0/helm/valueFiles/1
       value: $values/infra/values/gke-dev/traefik-values.yaml
 
-# Grafana: swap upc-dev → gke-dev  
+# 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
@@ -33,6 +31,15 @@ patches:
       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
@@ -41,3 +48,21 @@ patches:
     - 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

infra/overlays/gke-prod/kustomization.yaml

@@ -1,18 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base/cert-manager-application
+- ../../base
-- ../../base/cluster-resources-application
-- ../../base/grafana
-- ../../base/grafana-dashboards
-- ../../base/kyverno
-- ../../base/kyverno-policies
-- ../../base/loki
-- ../../base/opencost
-- ../../base/prometheus
-- ../../base/sealedsecrets
-- ../../base/tempo
-- ../../base/traefik-application
 
 patches:
 # Traefik: swap upc-dev → gke-prod
@@ -24,7 +13,16 @@ patches:
       path: /spec/sources/0/helm/valueFiles/1
       value: $values/infra/values/gke-prod/traefik-values.yaml
 
-# Grafana: swap upc-dev → gke-prod  
+# 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
@@ -33,6 +31,15 @@ patches:
       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
@@ -41,3 +48,21 @@ patches:
     - 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

infra/overlays/upc-dev/kustomization.yaml

@@ -5,12 +5,3 @@ resources:
 
 # No patches needed — base already has "upc-dev" paths
 # upc-dev is the default/base cluster
-
-patches:
-- target:
-    kind: Application
-    name: databunker
-  patch: |
-    - op: add
-      path: /spec/sources/0/helm/valueFiles/-
-      value: $values/infra/values/upc-dev/databunker-values.yaml

infra/overlays/upc-prod/kustomization.yaml

@@ -1,21 +1,10 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base/cert-manager-application
+- ../../base
-- ../../base/cluster-resources-application
-- ../../base/grafana
-- ../../base/grafana-dashboards
-- ../../base/kyverno
-- ../../base/kyverno-policies
-- ../../base/loki
-- ../../base/opencost
-- ../../base/prometheus
-- ../../base/sealedsecrets
-- ../../base/tempo
-- ../../base/traefik-application
 
 patches:
-# Traefik: swap upc-dev → upc-prod
+# Traefik: swap upc-dev → upc-prod in valueFiles
 - target:
     kind: Application
     name: traefik
@@ -24,7 +13,16 @@ patches:
       path: /spec/sources/0/helm/valueFiles/1
       value: $values/infra/values/upc-prod/traefik-values.yaml
 
-# Grafana: swap upc-dev → upc-prod  
+# Keycloak: swap upc-dev → upc-prod
+- target:
+    kind: Application
+    name: keycloak
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/upc-prod/keycloak-values.yaml
+
+# Grafana: swap upc-dev → upc-prod
 - target:
     kind: Application
     name: grafana
@@ -33,6 +31,15 @@ patches:
       path: /spec/sources/0/helm/valueFiles/1
       value: $values/infra/values/upc-prod/grafana-values.yaml
 
+# Gitea: swap upc-dev → upc-prod
+- target:
+    kind: Application
+    name: gitea
+  patch: |
+    - op: replace
+      path: /spec/sources/0/helm/valueFiles/1
+      value: $values/infra/values/upc-prod/gitea-values.yaml
+
 # OpenCost: swap upc-dev → upc-prod
 - target:
     kind: Application
@@ -41,3 +48,21 @@ 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/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

infra/values/aks-dev/argocd-values.yaml

@@ -1,5 +0,0 @@
-global:
-  domain: argocd.127.0.0.1.nip.io
-notifications:
-  context:
-    clusterName: "aks-dev-launchpad"

infra/values/aks-dev/homepage-values.yaml

@@ -1,15 +0,0 @@
-ingress:
-  main:
-    enabled: true
-    ingressClassName: traefik
-    annotations:
-      cert-manager.io/cluster-issuer: letsencrypt-prod
-    hosts:
-    - host: start.forteapps.net
-      paths:
-      - path: /
-        pathType: Prefix
-    tls:
-    - secretName: homepage-tls
-      hosts:
-      - start.forteapps.net

infra/values/base/argocd-values.yaml

@@ -2,49 +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: "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]'
   params:
     "server.insecure": true
-    "reposerver.enable.git.submodule": "false"
 server:
   ingress:
-    enabled: true
+    enabled: false
-    ingressClassName: traefik
+    ingressClassName: nginx
-    annotations:
-      cert-manager.io/cluster-issuer: letsencrypt-prod
-      gethomepage.dev/enabled: "true"
-      gethomepage.dev/name: "ArgoCD"
-      gethomepage.dev/description: "GitOps continuous delivery"
-      gethomepage.dev/group: "DevOps"
-      gethomepage.dev/icon: "argocd"
-      gethomepage.dev/href: "https://argocd.forteapps.net"
-      gethomepage.dev/widget.type: "argocd"
-      gethomepage.dev/widget.url: "https://argocd.forteapps.net"
-      # gethomepage.dev/widget.key: "{{HOMEPAGE_VAR_ARGOCD_TOKEN}}"
-    tls: true
   extraArgs:
   - --insecure
 

infra/values/base/databunker-values.yaml

@@ -1,42 +0,0 @@
-# Default values for databunkerpro
-image:
-  tag: 0.14.15
-
-ingress:
-  enabled: false # Set to true to enable ingress
-  className: traefik
-  # Set host to enable ingress
-  host: databunker.example.com
-  annotations:
-    kubernetes.io/ingress.class: traefik
-    cert-manager.io/cluster-issuer: "letsencrypt-prod" # or your cluster issuer
-    traefik.ingress.kubernetes.io/ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/force-ssl-redirect: "true"
-    traefik.ingress.kubernetes.io/ssl-passthrough: "false"
-    # Security headers
-    traefik.ingress.kubernetes.io/configuration-snippet: |
-      add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
-      add_header X-Frame-Options DENY always;
-      add_header X-Content-Type-Options nosniff always;
-      add_header X-XSS-Protection "1; mode=block" always;
-  # TLS configuration
-  tls:
-    enabled: true # Set to true to enable TLS
-    secretName: "databunker-tls" # Name of the secret containing TLS certificate
-
-# Pin PostgreSQL password — chart uses randAlphaNum without lookup,
-# so each ArgoCD sync would regenerate the password while PVC keeps the old one.
-# Same issue as Backstage PostgreSQL (see MEMORY.md).
-internal:
-  postgresql:
-    auth:
-      password: "databunker-pg-pass-2026"
-
-resources:
-  # Uncomment and adjust these values based on your requirements
-  # requests:
-  #   memory: "512Mi"
-  #   cpu: "250m"
-  # limits:
-  #   memory: "1Gi"
-  #   cpu: "500m"

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: ""
@@ -114,15 +114,6 @@ ingress:
   className: traefik
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
-    gethomepage.dev/enabled: "true"
-    gethomepage.dev/name: "Gitea"
-    gethomepage.dev/description: "Git hosting & CI/CD"
-    gethomepage.dev/group: "DevOps"
-    gethomepage.dev/icon: "gitea"
-    gethomepage.dev/href: "https://git.forteapps.net"
-    gethomepage.dev/widget.type: "gitea"
-    gethomepage.dev/widget.url: "https://git.forteapps.net"
-    # gethomepage.dev/widget.key: "{{HOMEPAGE_VAR_GITEA_TOKEN}}"
   hosts:
   - host: git.forteapps.net
     paths:

infra/values/base/grafana-values.yaml

@@ -1,23 +1,5 @@
 ingress:
   enabled: true
-  ingressClassName: traefik
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-prod
-    gethomepage.dev/enabled: "true"
-    gethomepage.dev/name: "Grafana"
-    gethomepage.dev/description: "Metrics & observability dashboards"
-    gethomepage.dev/group: "Monitoring"
-    gethomepage.dev/icon: "grafana"
-    gethomepage.dev/href: "https://grafana.forteapps.net"
-    gethomepage.dev/widget.type: "grafana"
-    gethomepage.dev/widget.url: "https://grafana.forteapps.net"
-    # gethomepage.dev/widget.username: "{{HOMEPAGE_VAR_GRAFANA_USER}}"
-    # gethomepage.dev/widget.password: "{{HOMEPAGE_VAR_GRAFANA_PASSWORD}}"
-  tls:
-  - secretName: grafana-tls
-    hosts:
-    - grafana.forteapps.net
-
 resources:
   requests:
     cpu: 50m
@@ -29,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

infra/values/base/homepage-values.yaml

@@ -1,57 +0,0 @@
-# Homepage Helm Values
-# Chart: jameswynn/homepage — https://gethomepage.dev
-# Discovery: K8s service annotations (gethomepage.dev/*)
-# Each deployed app annotates its own Service — apps not deployed = not visible.
-
-# RBAC ClusterRole — required for cluster-wide service annotation scanning
-enableRbac: true
-
-serviceAccount:
-  create: true
-  name: homepage
-
-config:
-  # Scan all namespaces for services with gethomepage.dev/enabled: "true"
-  kubernetes:
-    mode: cluster
-
-  settings:
-    title: "Forte Platform"
-    headerStyle: clean
-    layout:
-      DevOps:
-        style: row
-        columns: 4
-      Identity:
-        style: row
-        columns: 4
-      Monitoring:
-        style: row
-        columns: 4
-
-  # Top-of-page cluster overview widget
-  widgets:
-  - kubernetes:
-      cluster:
-        show: true
-        cpu: true
-        memory: true
-        showLabel: true
-        label: "Cluster"
-      nodes:
-        show: false
-  # Both empty — all entries come from K8s service annotations
-  bookmarks: []
-  services: []
-  # Widget API credentials (optional — add via SealedSecret + envFrom below)
-  # Homepage reads HOMEPAGE_VAR_* env vars and substitutes them in widget annotations.
-  # Example: gethomepage.dev/widget.key: "{{HOMEPAGE_VAR_GRAFANA_TOKEN}}"
-  # To enable: create a sealed secret and add envFrom to load it.
-
-resources:
-  requests:
-    cpu: 10m
-    memory: 128Mi
-  limits:
-    cpu: 100m
-    memory: 256Mi

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

infra/values/base/keycloak-values.yaml

@@ -18,12 +18,6 @@ ingress:
   ingressClassName: traefik
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
-    gethomepage.dev/enabled: "true"
-    gethomepage.dev/name: "Keycloak"
-    gethomepage.dev/description: "Identity & access management"
-    gethomepage.dev/group: "Identity"
-    gethomepage.dev/icon: "keycloak"
-    gethomepage.dev/href: "https://id.forteapps.net"
 
 metrics:
   enabled: true
@@ -81,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",
@@ -103,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"
           }
         ]
       }
@@ -199,12 +116,12 @@ extraDeploy:
   metadata:
     name: keycloak-client-registrar
   rules:
-  - apiGroups: [ "" ]
+  - apiGroups: [""]
-    resources: [ "secrets" ]
+    resources: ["secrets"]
-    verbs: [ "get", "list", "create", "update", "patch" ]
+    verbs: ["get", "list", "create", "update", "patch"]
-  - apiGroups: [ "" ]
+  - apiGroups: [""]
-    resources: [ "namespaces" ]
+    resources: ["namespaces"]
-    verbs: [ "get", "list" ]
+    verbs: ["get", "list"]
 
 # -- ClusterRoleBinding for the registrar ServiceAccount
 - apiVersion: rbac.authorization.k8s.io/v1
@@ -241,7 +158,7 @@ extraDeploy:
             containers:
             - name: registrar
               image: alpine:3.20
-              command: [ "/bin/sh", "-c" ]
+              command: ["/bin/sh", "-c"]
               args:
               - |
                 set -e

infra/values/base/opencost-values.yaml

@@ -10,8 +10,6 @@ opencost:
         serviceName: prometheus-server
         namespaceName: monitoring
         port: 80
-    # Cloud-specific pricing is in per-cluster value overrides
-    # (e.g. infra/values/upc-dev/opencost-values.yaml)
   ui:
     enabled: false
 service:

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

infra/values/upc-dev/argocd-values.yaml

@@ -1,5 +1,5 @@
 global:
-  domain: argocd.forteapps.net
+  domain: argocd.127.0.0.1.nip.io
 notifications:
   context:
     clusterName: "dev-fd-eu-no-svg1"