icon

README.md

@@ -57,11 +57,11 @@ This repository contains the complete GitOps configuration for our Kubernetes cl
 
 ### What's Inside
 
-- **Infrastructure Applications**: Traefik, Cert-Manager, Kyverno, Prometheus, Grafana, Loki, Tempo, Vault, Vault Secrets Operator, Homepage (platform dashboard)
+- **Infrastructure Applications**: Traefik, Cert-Manager, Kyverno, Prometheus, Grafana, Loki, Tempo, Sealed Secrets, Homepage (platform dashboard)
 - **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
-- **Secrets**: Vault Secrets Operator (VSO) syncs secrets from HashiCorp Vault to K8s
+- **Secrets**: Sealed Secrets for secure Git storage
 
 ### Key Features
 
@@ -187,7 +187,7 @@ Developer commits code → CI/CD builds image → Updates helm-prod-values → A
 **Quick version**:
 1. Create `apps/myapp.yaml` (ArgoCD Application manifest)
 2. Create `helm-prod-values/myapp/values.yaml` (configuration)
-3. Write secrets to Vault and create VaultStaticSecret CRD if needed
+3. Create sealed secrets if needed
 4. Commit and push - ArgoCD auto-syncs!
 
 ### Update an Existing Application
@@ -200,18 +200,22 @@ Developer commits code → CI/CD builds image → Updates helm-prod-values → A
 
 ### Manage Secrets
 
-**See detailed guide**: [Vault Secrets Operator Reference](docs/vault-secrets-operator.md)
+**See detailed guide**: [Developer Guide - Working with Secrets](docs/DEVELOPER-GUIDE.md#working-with-secrets)
 
 ```bash
-# 1. Write secret to Vault
+# Create plain secret
-vault kv put kv/myapp/myapp-creds KEY=value
+kubectl create secret generic myapp-creds \
+  --from-literal=KEY=value \
+  --dry-run=client -o yaml > private/myapp-creds.yaml
 
-# 2. Create VaultStaticSecret CRD (one-time, commit to git)
+# Seal it
-# See docs/vault-secrets-operator.md for CRD template
+kubeseal --format=yaml --cert=pub-cert.pem \
+  < private/myapp-creds.yaml > secrets/myapp-creds-sealed.yaml
 
-# 3. Rotate secrets — no git commit needed!
+# Commit sealed version
-vault kv put kv/myapp/myapp-creds KEY=new-value
+git add secrets/myapp-creds-sealed.yaml
-# VSO picks up changes within 30 seconds
+git commit -m "Add myapp credentials"
+git push
 ```
 
 ### Enable Authentication
@@ -324,7 +328,7 @@ kubectl patch application myapp -n argocd \
 ## 🔐 Security
 
 ### Secret Management
-- ✅ Vault Secrets Operator (VSO) for secret management
+- ✅ Sealed Secrets for Git storage
 - ✅ Kyverno auto-clones secrets to namespaces
 - ❌ Never commit plain secrets
 
@@ -351,8 +355,7 @@ kubectl patch application myapp -n argocd \
 | **Traefik** | Ingress controller | `traefik` | 2 |
 | **Cert-Manager** | TLS certificates | `cert-manager` | 1 |
 | **Kyverno** | Policy engine | `kyverno` | 1 |
-| **Vault** | Secret storage | `vault` | 1 |
+| **Sealed Secrets** | Secret encryption | `kube-system` | 1 |
-| **Vault Secrets Operator** | Secret sync (Vault → K8s) | `vault-secrets-operator-system` | 1 |
 | **Prometheus** | Metrics | `monitoring` | 1 |
 | **Grafana** | Dashboards | `monitoring` | 1 |
 | **Loki** | Logs | `monitoring` | 1 |
@@ -452,7 +455,7 @@ Applications deploy in order using `argocd.argoproj.io/sync-wave`:
 1. Read [Developer Guide - Deploying Your First Application](docs/DEVELOPER-GUIDE.md#deploying-your-first-application)
 2. Create ArgoCD Application manifest in `apps/`
 3. Create Helm values in `helm-prod-values/`
-4. Write secrets to Vault and create VaultStaticSecret CRD if needed
+4. Create sealed secrets if needed
 5. Commit and push - ArgoCD handles the rest!
 
 ### Modifying Infrastructure
@@ -496,8 +499,7 @@ Documentation lives in `docs/`. To update:
 - [Traefik Documentation](https://doc.traefik.io/traefik/)
 - [Cert-Manager Documentation](https://cert-manager.io/docs/)
 - [Grafana Tempo Documentation](https://grafana.com/docs/tempo/)
-- [Vault Secrets Operator](https://developer.hashicorp.com/vault/docs/platform/k8s/vso)
+- [Sealed Secrets](https://github.com/bitnami-labs/sealed-secrets)
-- [HashiCorp Vault](https://developer.hashicorp.com/vault/docs)
 
 ### Related Repositories
 - [forte-helm](https://git.forteapps.net/Forte/forte-helm) - Helm chart templates

apps/base/argo-mcp/argocd-mcp-credentials-vault.yaml

@@ -1,14 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: argocd-mcp-credentials
-  namespace: argocd-mcp
-spec:
-  type: kv-v2
-  mount: kv
-  path: argocd-mcp/argocd-mcp-credentials
-  destination:
-    name: argocd-mcp-credentials
-    create: true
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

apps/base/argo-mcp/auth-oidc-vault.yaml

@@ -1,14 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: auth-oidc
-  namespace: argocd-mcp
-spec:
-  type: kv-v2
-  mount: kv
-  path: argocd-mcp/auth-oidc
-  destination:
-    name: auth-oidc
-    create: true
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

apps/base/argo-mcp/kustomization.yaml

@@ -2,7 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - argo-mcp.yaml
-- vault-auth.yaml
+- argocdmcp-auth-oidc-sealed.yaml
-- auth-oidc-vault.yaml
+- argocd-mcp-credentials.yaml
-- argocd-mcp-credentials-vault.yaml
-# Removed: argocdmcp-auth-oidc-sealed.yaml, argocd-mcp-credentials.yaml (migrated to VSO)

apps/base/argo-mcp/vault-auth.yaml

@@ -1,20 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vault-auth-argocd-mcp
-  namespace: argocd-mcp
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultAuth
-metadata:
-  name: vault-auth
-  namespace: argocd-mcp
-spec:
-  method: kubernetes
-  mount: kubernetes
-  kubernetes:
-    role: ns-argocd-mcp
-    serviceAccount: vault-auth-argocd-mcp
-    audiences:
-    - vault

apps/base/dot-ai-stack/dot-ai-secrets-vault.yaml

@@ -1,14 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: dot-ai-secrets
-  namespace: dot-ai
-spec:
-  type: kv-v2
-  mount: kv
-  path: dot-ai/dot-ai-secrets
-  destination:
-    name: dot-ai-secrets
-    create: true
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

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

@@ -2,6 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - dot-ai-stack.yaml
-- vault-auth.yaml
+- dot-ai-secrets.yaml
-- dot-ai-secrets-vault.yaml
-# Removed: dot-ai-secrets.yaml (migrated to VSO)

apps/base/dot-ai-stack/vault-auth.yaml

@@ -1,20 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vault-auth-dot-ai
-  namespace: dot-ai
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultAuth
-metadata:
-  name: vault-auth
-  namespace: dot-ai
-spec:
-  method: kubernetes
-  mount: kubernetes
-  kubernetes:
-    role: ns-dot-ai
-    serviceAccount: vault-auth-dot-ai
-    audiences:
-    - vault

apps/base/mcp10x/app-credentials-vault.yaml

@@ -1,15 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: app-credentials
-  namespace: mcp10x
-spec:
-  type: kv-v2
-  mount: kv
-  path: mcp10x/app-credentials
-  destination:
-    name: app-credentials
-    create: true
-    type: Opaque
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

apps/base/mcp10x/kustomization.yaml

@@ -2,6 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - mcp10x.yaml
-- vault-auth.yaml
+- forte10x-app-credentials-sealed.yaml
-- app-credentials-vault.yaml
-# Removed: forte10x-app-credentials-sealed.yaml (migrated to VSO)

apps/base/mcp10x/vault-auth.yaml

@@ -1,20 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vault-auth-mcp10x
-  namespace: mcp10x
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultAuth
-metadata:
-  name: vault-auth
-  namespace: mcp10x
-spec:
-  method: kubernetes
-  mount: kubernetes
-  kubernetes:
-    role: ns-mcp10x
-    serviceAccount: vault-auth-mcp10x
-    audiences:
-    - vault

apps/base/musicman/kustomization.yaml

@@ -2,6 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - musicman.yaml
-- vault-auth.yaml
+- musicman-credentials.yaml
-- musicman-credentials-vault.yaml
-# Removed: musicman-credentials.yaml (migrated to VSO)

apps/base/musicman/musicman-credentials-vault.yaml

@@ -1,15 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: musicman-credentials
-  namespace: music-man
-spec:
-  type: kv-v2
-  mount: kv
-  path: music-man/musicman-credentials
-  destination:
-    name: musicman-credentials
-    create: true
-    type: Opaque
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

apps/base/musicman/vault-auth.yaml

@@ -1,20 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vault-auth-music-man
-  namespace: music-man
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultAuth
-metadata:
-  name: vault-auth
-  namespace: music-man
-spec:
-  method: kubernetes
-  mount: kubernetes
-  kubernetes:
-    role: ns-music-man
-    serviceAccount: vault-auth-music-man
-    audiences:
-    - vault

apps/base/ts-mcp/kustomization.yaml

@@ -2,6 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ts-mcp.yaml
-- vault-auth.yaml
+- ts-mcp-secrets-sealed.yaml
-- ts-mcp-secrets-vault.yaml
-# Removed: ts-mcp-secrets-sealed.yaml (migrated to VSO)

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

@@ -1,14 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: ts-mcp-secrets
-  namespace: ts-mcp
-spec:
-  type: kv-v2
-  mount: kv
-  path: ts-mcp/ts-mcp-secrets
-  destination:
-    name: ts-mcp-secrets
-    create: true
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

apps/base/ts-mcp/vault-auth.yaml

@@ -1,20 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vault-auth-ts-mcp
-  namespace: ts-mcp
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultAuth
-metadata:
-  name: vault-auth
-  namespace: ts-mcp
-spec:
-  method: kubernetes
-  mount: kubernetes
-  kubernetes:
-    role: ns-ts-mcp
-    serviceAccount: vault-auth-ts-mcp
-    audiences:
-    - vault

apps/overlays/upc-dev/dbunk-demo/dbunk-demo.yaml

@@ -1,47 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: dbunk-demo
-  namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "12"
-  labels:
-    app.kubernetes.io/name: dbunk-demo
-    app.kubernetes.io/part-of: apps
-    app.kubernetes.io/managed-by: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-
-  sources:
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/forte-helm.git
-    path: forteapp
-    targetRevision: HEAD
-    helm:
-      valueFiles:
-      - $values/dbunk-demo/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: dbunk-demo
-
-  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

apps/overlays/upc-dev/dbunk-demo/kustomization.yaml

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

apps/overlays/upc-dev/feedback/feedback.yaml

@@ -1,53 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: feedback
-  namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "12"
-  labels:
-    app.kubernetes.io/name: feedback
-    app.kubernetes.io/part-of: apps
-    app.kubernetes.io/managed-by: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-
-  sources:
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/forte-helm.git
-    path: forteapp
-    targetRevision: HEAD
-    helm:
-      valueFiles:
-      - $values/feedback/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: feedback
-
-  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: apps
-    kind: StatefulSet
-    jsonPointers:
-    - /spec/volumeClaimTemplates

apps/overlays/upc-dev/feedback/kustomization.yaml

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

apps/overlays/upc-dev/kustomization.yaml

@@ -2,8 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ../../base
-- dbunk-demo
-- feedback
 
 # No patches needed — base already has "upc-dev" paths
 # upc-dev is the default/base cluster

cluster-resources/argocd-notifications-secret-vault.yaml

@@ -1,15 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: argocd-notifications-secret
-  namespace: argocd
-spec:
-  type: kv-v2
-  mount: kv
-  path: argocd/argocd-notifications-secret
-  destination:
-    name: argocd-notifications-secret
-    create: true
-    type: Opaque
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

cluster-resources/forte-helm-repo-vault.yaml

@@ -1,16 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: forte-helm-repo
-  namespace: argocd
-spec:
-  type: kv-v2
-  mount: kv
-  path: argocd/forte-helm-repo
-  destination:
-    name: forte-helm-repo
-    create: true
-    labels:
-      argocd.argoproj.io/secret-type: repository
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

cluster-resources/forte10x-repo-credentials-vault.yaml

@@ -1,17 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: forte10x-repo-creds
-  namespace: argocd
-spec:
-  type: kv-v2
-  mount: kv
-  path: argocd/forte10x-repo-creds
-  destination:
-    name: forte10x-repo-creds
-    create: true
-    type: Opaque
-    labels:
-      argocd.argoproj.io/secret-type: repository
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

cluster-resources/mcp10x-repo-credentials-vault.yaml

@@ -1,17 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: mcp10x-repo-creds
-  namespace: argocd
-spec:
-  type: kv-v2
-  mount: kv
-  path: argocd/mcp10x-repo-creds
-  destination:
-    name: mcp10x-repo-creds
-    create: true
-    type: Opaque
-    labels:
-      argocd.argoproj.io/secret-type: repository
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

cluster-resources/policies/auth-sidecar-injector.yaml

@@ -245,12 +245,6 @@ spec:
                 secretKeyRef:
                   name: "{{ request.object.metadata.annotations.\"policies.forteapps.io/auth-oidc-credentials-secret\" || 'auth-oidc' }}"
                   key: "{{ request.object.metadata.annotations.\"policies.forteapps.io/auth-oidc-credentials-secret-key\" || 'client-secret' }}"
-            - name: AUTH_OIDC_IDP_HINT
-              value: "{{ request.object.metadata.annotations.\"policies.forteapps.io/auth-oidc-idp-hint\" || '' }}"
-            - name: AUTH_OIDC_BROKER_ALIAS
-              value: "{{ request.object.metadata.annotations.\"policies.forteapps.io/auth-oidc-broker-alias\" || '' }}"
-            - name: AUTH_OIDC_BROKER_TOKEN_HEADER
-              value: "{{ request.object.metadata.annotations.\"policies.forteapps.io/auth-oidc-broker-token-header\" || '' }}"
             resources:
               limits:
                 cpu: 50m
@@ -330,8 +324,6 @@ spec:
               value: "{{ request.object.metadata.annotations.\"policies.forteapps.io/auth-public-paths\" || '/healthz' }}"
             - name: AUTH_MCP_SCOPES_SUPPORTED
               value: "{{ request.object.metadata.annotations.\"policies.forteapps.io/auth-mcp-scopes\" || 'profile'  }}"
-            - name: AUTH_MCP_IDP_HINT
-              value: "{{ request.object.metadata.annotations.\"policies.forteapps.io/auth-mcp-idp-hint\" || '' }}"
             resources:
               limits:
                 cpu: 50m

cluster-resources/vault-auth-argocd.yaml

@@ -1,20 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vault-auth-argocd
-  namespace: argocd
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultAuth
-metadata:
-  name: vault-auth
-  namespace: argocd
-spec:
-  method: kubernetes
-  mount: kubernetes
-  kubernetes:
-    role: ns-argocd
-    serviceAccount: vault-auth-argocd
-    audiences:
-    - vault

docs/DEVELOPER-GUIDE.md

@@ -60,16 +60,18 @@ If you do need cluster access, install:
    curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
    ```
 
-2. **vault** CLI - For managing secrets in HashiCorp Vault
+2. **kubeseal** - For sealing secrets
    ```bash
    # macOS
-   brew install hashicorp/tap/vault
+   brew install kubeseal
 
    # Windows
-   choco install vault
+   choco install kubeseal
 
    # Linux
-   # See https://developer.hashicorp.com/vault/install
+   wget https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.24.0/kubeseal-0.24.0-linux-amd64.tar.gz
+   tar -xvzf kubeseal-0.24.0-linux-amd64.tar.gz
+   sudo mv kubeseal /usr/local/bin/
    ```
 
 3. **Git** - Version control
@@ -632,100 +634,115 @@ git push
 
 ### Understanding Secret Management
 
-Secrets are managed via **HashiCorp Vault** and synced to Kubernetes by the **Vault Secrets Operator (VSO)**. See [Vault Secrets Operator Reference](vault-secrets-operator.md) for full details.
+**NEVER commit plain secrets to Git.** We use **Sealed Secrets** to encrypt secrets before committing.
-
-**NEVER commit plain secret values to Git.** Only VaultStaticSecret CRD manifests are committed.
 
 ### Creating a New Secret
 
-#### Step 1: Write Secret to Vault
+#### Step 1: Create Plain Secret Locally
 
 ```bash
-vault kv put kv/myapp/myapp-credentials \
+cd ~/dev/k8s/launchpad
-  API_KEY=your-secret-key-here \
+
-  DB_PASSWORD=super-secret-password
+# Create secret in private/ folder (Git-ignored)
+kubectl create secret generic myapp-credentials \
+  --from-literal=API_KEY=your-secret-key-here \
+  --from-literal=DB_PASSWORD=super-secret-password \
+  --dry-run=client -o yaml > private/myapp-credentials.yaml
 ```
 
-#### Step 2: Create VaultStaticSecret CRD
+**DO NOT commit this file!** It's in `private/` which is Git-ignored.
 
-Create a YAML file (e.g., `apps/base/myapp/myapp-credentials-vault.yaml`):
+#### Step 2: Seal the Secret
 
-```yaml
+Seal your secret:
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: myapp-credentials
-  namespace: myapp
-spec:
-  type: kv-v2
-  mount: kv
-  path: myapp/myapp-credentials
-  destination:
-    name: myapp-credentials
-    create: true
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth
-```
-
-#### Step 3: Add VaultAuth (if new namespace)
-
-If this is a new namespace, also create a `vault-auth.yaml` with a ServiceAccount and VaultAuth CRD. See [VSO Reference](vault-secrets-operator.md#vaultauth) for template.
-
-#### Step 4: Commit and Push
 
 ```bash
-git add apps/base/myapp/myapp-credentials-vault.yaml
+kubeseal --format=yaml \
-git commit -m "Add myapp credentials (VSO)"
+  --namespace=myapp \
+  < private/myapp-credentials.yaml \
+  > secrets/myapp-credentials-sealed.yaml
+```
+
+#### Step 3: Commit Sealed Secret
+
+```bash
+git add secrets/myapp-credentials-sealed.yaml
+git commit -m "Add myapp credentials (sealed)"
 git push
 ```
 
-ArgoCD syncs the CRD, VSO creates the K8s Secret.
+#### Step 4: Reference Secret in Application
-
-#### Step 5: Reference Secret in Application
 
 Update your `helm-prod-values/myapp/values.yaml`:
 
 ```yaml
 app:
-  envSecretName: "myapp-credentials"  # VSO creates this K8s Secret
+  envSecretName: "myapp-credentials"  # References the SealedSecret
 ```
 
-### Updating / Rotating a Secret
+Commit and push:
-
-**No git commit needed** — just update in Vault:
-
 ```bash
-vault kv put kv/myapp/myapp-credentials \
+cd ~/dev/k8s/helm-prod-values
-  API_KEY=new-key-here \
+git add myapp/values.yaml
-  DB_PASSWORD=new-password
+git commit -m "Reference myapp credentials"
+git push
 ```
 
-VSO picks up changes within 30 seconds. Restart pods if they don't watch for secret updates:
+### Updating a Secret
+
+To update an existing secret:
 
 ```bash
+# 1. Create new version of secret
+kubectl create secret generic myapp-credentials \
+  --from-literal=API_KEY=new-key-here \
+  --from-literal=DB_PASSWORD=new-password \
+  --dry-run=client -o yaml > private/myapp-credentials.yaml
+
+# 2. Seal it
+kubeseal --format=yaml \
+  --namespace=myapp \
+  < private/myapp-credentials.yaml \
+  > secrets/myapp-credentials-sealed.yaml
+
+# 3. Commit sealed version
+git add secrets/myapp-credentials-sealed.yaml
+git commit -m "Update myapp credentials"
+git push
+
+# 4. Restart pods to pick up new secret
 kubectl rollout restart deployment myapp -n myapp
 ```
 
 ### Secret Best Practices
 
-- Write secrets to Vault via UI or CLI — never commit values to Git
+✅ **DO**:
-- Use meaningful secret names matching the KV path convention: `kv/{namespace}/{secret-name}`
+- Store secrets in `private/` folder locally
+- Always seal secrets before committing
+- Delete plain secrets after sealing
+- Use meaningful secret names
 - Document what each secret contains
-- Use Vault's versioning for audit trail
+
+❌ **DON'T**:
+- Commit plain secrets to Git
+- Share secrets via Slack/email
+- Hard-code secrets in code
+- Use the same secret across multiple environments
+- Store secrets in Docker images
 
 ### Where Secrets Are Stored
 
 ```
-┌──────────────────────────────────────────────────────────────────┐
+┌─────────────────────────────────────────────────────────────┐
-│  Location                  │  Content                │  In Git? │
+│  Location                │  Content           │  Committed?│
-├────────────────────────────┼─────────────────────────┼──────────┤
+├──────────────────────────┼────────────────────┼────────────┤
-│  Vault KV (kv/{ns}/{name}) │  Secret values          │  ❌ NO   │
+│  private/                │  Plain secrets     │  ❌ NO      │
-│  VaultStaticSecret CRD     │  Sync config (no values)│  ✅ YES  │
+│  secrets/                │  Sealed secrets    │  ✅ YES     │
-│  Kubernetes cluster        │  K8s Secret (synced)    │  N/A     │
+│  Kubernetes cluster      │  Unsealed secrets  │  N/A       │
-└──────────────────────────────────────────────────────────────────┘
+└─────────────────────────────────────────────────────────────┘
 ```
 
-**Vault Secrets Operator** syncs secrets from Vault to K8s automatically (30s refresh).
+**Sealed Secrets Controller** in the cluster decrypts sealed secrets automatically.
 
 ---
 
@@ -859,13 +876,28 @@ In your identity provider (e.g., Keycloak):
 #### Step 2: Create OIDC Secret
 
 ```bash
-# Write OIDC secret to Vault
+# Create plain secret
-vault kv put kv/myapp/auth-oidc \
+kubectl create secret generic auth-oidc \
-  client-secret=your-oidc-client-secret \
+  --from-literal=client-secret=your-oidc-client-secret \
-  cookie-secret=$(openssl rand -hex 32)
+  --from-literal=cookie-secret=$(openssl rand -hex 32) \
+  --namespace=myapp \
+  --dry-run=client -o yaml > private/myapp-auth-oidc.yaml
 
-# Create VaultStaticSecret CRD (see docs/vault-secrets-operator.md for template)
+# Seal it
-# Add to apps/base/myapp/auth-oidc-vault.yaml and commit
+kubeseal --format=yaml \
+  --cert=pub-cert.pem \
+  --namespace=myapp \
+  < private/myapp-auth-oidc.yaml \
+  > secrets/myapp-auth-oidc-sealed.yaml
+
+# Commit sealed secret
+cd ~/dev/k8s/launchpad
+git add secrets/myapp-auth-oidc-sealed.yaml
+git commit -m "Add OIDC secrets for myapp"
+git push
+
+# Clean up
+rm private/myapp-auth-oidc.yaml
 ```
 
 #### Step 3: Configure Helm Values
@@ -1095,13 +1127,16 @@ ingress:
   host: web-app.forteapps.net
 ```
 
-**With Vault OIDC secret**:
+**With sealed OIDC secret**:
 ```bash
-# Write OIDC secret to Vault
+# Create and seal secret
-vault kv put kv/web-app/auth-oidc \
+kubectl create secret generic auth-oidc \
-  client-secret=super-secret-value \
+  --from-literal=client-secret=super-secret-value \
-  cookie-secret=$(openssl rand -hex 32)
+  --from-literal=cookie-secret=$(openssl rand -hex 32) \
-# Then create VaultStaticSecret CRD — see docs/vault-secrets-operator.md
+  --namespace=web-app \
+  --dry-run=client -o yaml | \
+  kubeseal --format=yaml --cert=pub-cert.pem --namespace=web-app \
+  > secrets/web-app-auth-oidc-sealed.yaml
 ```
 
 #### Example 3: MCP Server with OAuth 2.0
@@ -1229,7 +1264,7 @@ kubectl logs -n myapp <pod-name> -c authn
 - Use token auth for service-to-service communication
 - Rotate tokens and secrets regularly
 - Use strong random tokens (32+ bytes)
-- Store client secrets in Vault
+- Store client secrets in SealedSecrets
 - Test authentication before deploying to production
 - Document which tokens/users have access
 
@@ -1533,22 +1568,22 @@ curl http://localhost:8080
 
 #### Problem: Secret not found
 
-**Check VSO sync status:**
+**Check if SealedSecret exists:**
 ```bash
-kubectl get vaultstaticsecret -n myapp
+kubectl get sealedsecret -n myapp
 kubectl get secret -n myapp
 ```
 
 **Solutions:**
 ```bash
-# Check VaultAuth is authenticated
+# Check if secret is in Git
-kubectl get vaultauth -n myapp
+ls -l secrets/myapp-credentials-sealed.yaml
 
-# Check VaultStaticSecret events
+# Re-apply sealed secret
-kubectl describe vaultstaticsecret myapp-credentials -n myapp
+kubectl apply -f secrets/myapp-credentials-sealed.yaml
 
-# Verify secret exists in Vault
+# Check sealed-secrets-controller logs
-vault kv get kv/myapp/myapp-credentials
+kubectl logs -n kube-system deployment/sealed-secrets-controller
 ```
 
 #### Problem: Secret exists but pods can't access it
@@ -1659,7 +1694,7 @@ If you're stuck:
 ### Secret Management
 
 ✅ **DO**:
-- Use Vault for all secrets (see docs/vault-secrets-operator.md)
+- Use kubeseal for all secrets
 - Store plain secrets in password manager
 - Rotate secrets regularly
 - Use different secrets per environment
@@ -1711,9 +1746,16 @@ kubectl rollout restart deployment myapp -n myapp
 # Port-forward to service
 kubectl port-forward -n myapp service/myapp 8080:3000
 
-# Write secret to Vault
+# Create secret
-vault kv put kv/myapp/myapp-credentials KEY=value
+kubectl create secret generic myapp-credentials \
-# Create VaultStaticSecret CRD — see docs/vault-secrets-operator.md
+  --from-literal=KEY=value \
+  --dry-run=client -o yaml > private/myapp-credentials.yaml
+
+# Seal secret
+kubeseal --format=yaml \
+  --cert=pub-cert.pem \
+  < private/myapp-credentials.yaml \
+  > secrets/myapp-credentials-sealed.yaml
 ```
 
 ### Repository Locations

docs/OPERATIONS-RUNBOOK.md

@@ -188,15 +188,13 @@ Save the following file in private/ (gitignored) folder as secret.yaml
       <paste your private key here>
     project: default
 ```
-Write the secret to Vault:
+Seal the secret using `kubeseal` command 
 ```bash
-vault kv put kv/argocd/forte-helm-repo \
+kubeseal --format=yaml \
-  type=git \
+  --namespace=argocd \
-  url=ssh://git@git.forteapps.net:2222/Forte/forte-helm.git \
+  < private/secret.yaml \
-  sshPrivateKey="$(cat private/ssh-key)" \
+  > secrets/forte-helm-repo-secret-sealed.yaml
-  project=default
 ```
-Then create a VaultStaticSecret CRD with `argocd.argoproj.io/secret-type: repository` label.
 
 **Step 4: Register Repository in ArgoCD**
 
@@ -501,7 +499,7 @@ See [Developer Guide](DEVELOPER-GUIDE.md#deploying-your-first-application) for d
 **Quick checklist:**
 - [ ] Create `helm-prod-values/myapp/values.yaml`
 - [ ] Create `apps/myapp.yaml` in config repo
-- [ ] Write secrets to Vault and create VaultStaticSecret CRD if needed
+- [ ] Create SealedSecret if needed
 - [ ] Commit and push changes
 - [ ] Verify sync in Slack/ArgoCD
 - [ ] Configure DNS for domain
@@ -672,61 +670,92 @@ db:
 
 ## Secret Management
 
-Secrets are managed via **HashiCorp Vault** and synced to Kubernetes by the **Vault Secrets Operator (VSO)**. See [Vault Secrets Operator Reference](vault-secrets-operator.md) for full details.
-
 ### Creating Secrets
 
-#### Step 1: Write to Vault
+#### Step 1: Get Public Certificate
 
 ```bash
-# From literal values
+# Fetch sealed-secrets public cert (one-time)
-vault kv put kv/myapp/myapp-credentials \
+kubeseal --fetch-cert \
-  API_KEY=secret123 \
+  --controller-name=sealed-secrets-controller \
-  DB_PASSWORD=pass456
+  --controller-namespace=kube-system \
+  > pub-cert.pem
+
+# Save this certificate for future use
 ```
 
-#### Step 2: Create VaultStaticSecret CRD
+#### Step 2: Create Plain Secret
-
-```yaml
-# apps/base/myapp/myapp-credentials-vault.yaml
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: myapp-credentials
-  namespace: myapp
-spec:
-  type: kv-v2
-  mount: kv
-  path: myapp/myapp-credentials
-  destination:
-    name: myapp-credentials
-    create: true
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth
-```
-
-#### Step 3: Commit CRD
 
 ```bash
-git add apps/base/myapp/myapp-credentials-vault.yaml
+# Method 1: From literal values
-git commit -m "Add myapp credentials (VSO)"
+kubectl create secret generic myapp-credentials \
+  --from-literal=API_KEY=secret123 \
+  --from-literal=DB_PASSWORD=pass456 \
+  --namespace=myapp \
+  --dry-run=client -o yaml > private/myapp-credentials.yaml
+
+# Method 2: From file
+kubectl create secret generic myapp-credentials \
+  --from-file=.env \
+  --namespace=myapp \
+  --dry-run=client -o yaml > private/myapp-credentials.yaml
+
+# Method 3: From multiple files
+kubectl create secret generic myapp-credentials \
+  --from-file=api-key.txt \
+  --from-file=db-password.txt \
+  --namespace=myapp \
+  --dry-run=client -o yaml > private/myapp-credentials.yaml
+```
+
+#### Step 3: Seal Secret
+
+```bash
+kubeseal --format=yaml \
+  --cert=pub-cert.pem \
+  --namespace=myapp \
+  < private/myapp-credentials.yaml \
+  > secrets/myapp-credentials-sealed.yaml
+```
+
+#### Step 4: Commit Sealed Secret
+
+```bash
+git add secrets/myapp-credentials-sealed.yaml
+git commit -m "Add myapp credentials"
 git push
+
+# Delete plain secret
+rm private/myapp-credentials.yaml
 ```
 
-ArgoCD syncs the CRD, VSO creates the K8s Secret automatically.
+### Updating Secrets
-
-### Updating / Rotating Secrets
-
-**No git commit needed** — just update in Vault:
 
 ```bash
-vault kv put kv/myapp/myapp-credentials \
+# 1. Create new version
-  API_KEY=new-secret-key \
+kubectl create secret generic myapp-credentials \
-  DB_PASSWORD=new-password
+  --from-literal=API_KEY=new-secret-key \
+  --from-literal=DB_PASSWORD=new-password \
+  --namespace=myapp \
+  --dry-run=client -o yaml > private/myapp-credentials.yaml
 
-# VSO picks up changes within 30 seconds
+# 2. Seal it
-# Restart pods if needed
+kubeseal --format=yaml \
+  --cert=pub-cert.pem \
+  --namespace=myapp \
+  < private/myapp-credentials.yaml \
+  > secrets/myapp-credentials-sealed.yaml
+
+# 3. Commit
+git add secrets/myapp-credentials-sealed.yaml
+git commit -m "Update myapp credentials"
+git push
+
+# 4. Restart pods to pick up new secret
 kubectl rollout restart deployment myapp -n myapp
+
+# 5. Delete plain secret
+rm private/myapp-credentials.yaml
 ```
 
 ### Viewing Secrets (Unsealed)
@@ -803,13 +832,30 @@ OIDC auth requires an `auth-oidc` Secret with two keys:
 CLIENT_SECRET="your-oidc-client-secret-from-provider"
 COOKIE_SECRET=$(openssl rand -hex 32)
 
-# Write to Vault
+# Create plain secret
-vault kv put kv/myapp/auth-oidc \
+kubectl create secret generic auth-oidc \
-  client-secret=$CLIENT_SECRET \
+  --from-literal=client-secret=$CLIENT_SECRET \
-  cookie-secret=$COOKIE_SECRET
+  --from-literal=cookie-secret=$COOKIE_SECRET \
+  --namespace=myapp \
+  --dry-run=client -o yaml > private/myapp-auth-oidc.yaml
 
-# Create VaultStaticSecret CRD (one-time) and commit
+# Seal it
-# See docs/vault-secrets-operator.md for CRD template
+kubeseal --format=yaml \
+  --cert=pub-cert.pem \
+  --namespace=myapp \
+  < private/myapp-auth-oidc.yaml \
+  > secrets/myapp-auth-oidc-sealed.yaml
+
+# Apply sealed secret
+kubectl apply -f secrets/myapp-auth-oidc-sealed.yaml
+
+# Commit to Git
+git add secrets/myapp-auth-oidc-sealed.yaml
+git commit -m "Add OIDC secrets for myapp"
+git push
+
+# Clean up
+rm private/myapp-auth-oidc.yaml
 ```
 
 #### Rotating Authentication Secrets
@@ -836,12 +882,16 @@ kubectl rollout restart deployment myapp -n myapp
 # Rotate cookie secret (safe - invalidates existing sessions)
 NEW_COOKIE_SECRET=$(openssl rand -hex 32)
 
-# Update in Vault — no git commit needed
+# Recreate secret
-vault kv put kv/myapp/auth-oidc \
+kubectl create secret generic auth-oidc \
-  client-secret=$CLIENT_SECRET \
+  --from-literal=client-secret=$CLIENT_SECRET \
-  cookie-secret=$NEW_COOKIE_SECRET
+  --from-literal=cookie-secret=$NEW_COOKIE_SECRET \
+  --namespace=myapp \
+  --dry-run=client -o yaml | \
+  kubeseal --format=yaml --cert=pub-cert.pem --namespace=myapp | \
+  kubectl apply -f -
 
-# VSO picks up within 30s. Restart pods to use new secret:
+# Restart to pick up new secret
 kubectl rollout restart deployment myapp -n myapp
 ```
 
@@ -1292,11 +1342,13 @@ kubectl get applications -n argocd -w
                - pg_dump -U $DB_USER -d $DB_NAME > /backup/dump-$(date +%Y%m%d).sql
    ```
 
-3. **Vault backup**
+3. **Sealed Secrets private key backup**
    ```bash
-   # Vault data is stored on PVC — ensure PVC snapshots are configured
+   # Backup sealed-secrets controller private key
-   # For disaster recovery, maintain Vault unseal keys in a secure location
+   kubectl get secret -n kube-system sealed-secrets-key \
-   # All secrets can be re-seeded from source if needed
+     -o yaml > sealed-secrets-key-backup.yaml
+
+   # Store in secure location (password manager, vault)
    ```
 
 ---
@@ -1616,7 +1668,7 @@ echo "Remember to delete: $SECRET_FILE"
 - [ ] Gitea Actions workflow configured
 - [ ] Helm values created in `helm-prod-values/`
 - [ ] ArgoCD application manifest created in `apps/`
-- [ ] Secrets written to Vault and VaultStaticSecret CRD created
+- [ ] Secrets created and sealed
 - [ ] DNS record added for domain
 - [ ] Application synced successfully
 - [ ] Health check passed

docs/REFERENCE.md

@@ -1384,46 +1384,6 @@ spec:
 - Adds source tracking annotations (`keycloak.forteapps.net/source-namespace`, `keycloak.forteapps.net/source-name`)
 - `synchronize: true` — changes to the source Secret are reflected in the clone
 
-### Keycloak Microsoft/Entra Identity Provider
-
-**File**: `infra/values/upc-dev/keycloak-values.yaml`
-**Namespace**: `keycloak`
-
-**Purpose**: Configures Microsoft Entra (Azure AD) as an external identity provider for the Forte realm, enabling SSO via Microsoft accounts with token storage for downstream API access (e.g., Microsoft Graph).
-
-**Configuration via keycloakConfigCli**:
-- IdP alias: `forte-entra`, provider: `microsoft`
-- Client secret injected from `microsoft-idp-credentials` Secret via `$(env:MS_IDP_CLIENT_SECRET)` syntax
-- `extraEnvVarsSecret: microsoft-idp-credentials` makes the Secret available as env vars to config-cli
-
-**Key Configuration Notes**:
-
-| Field | Location | Notes |
-|-------|----------|-------|
-| `tenant` | `config.tenant` | **Must be `tenant`, NOT `tenantId`** — wrong key silently falls back to `common` (multi-tenant) |
-| `storeToken` | Top-level IdP field | **NOT inside `config`** — enables broker token storage for KC broker API |
-| `defaultScope` | `config.defaultScope` | Space-separated: `openid email profile User.Read Mail.Send` |
-| `syncMode` | `config.syncMode` | `IMPORT` — imports user on first login |
-
-**Token Storage & Broker Access**:
-- `storeToken: true` persists the Entra access token in Keycloak
-- Realm role `default-roles-forte` includes composite `broker.read-token` — grants all realm users access to broker token API
-- Broker token retrievable via: `GET /realms/forte/broker/forte-entra/token`
-
-**Identity Provider Mappers**:
-- `forte-entra-email`: Hardcodes `emailVerified=true` for Entra-authenticated users (Entra guarantees email verification)
-
-**Required Secret** (`microsoft-idp-credentials`):
-```yaml
-apiVersion: v1
-kind: Secret
-metadata:
-  name: microsoft-idp-credentials
-  namespace: keycloak
-stringData:
-  MS_IDP_CLIENT_SECRET: "<entra-app-client-secret>"
-```
-
 ### Default Namespace Blocker
 
 **File**: `cluster-resources/policies/default-ns-blocker.yaml`

docs/vault-secrets-operator.md

@@ -1,206 +0,0 @@
-# Vault Secrets Operator (VSO) Reference
-
-## Overview
-
-The platform uses HashiCorp Vault Secrets Operator (VSO) to sync secrets from Vault KV v2 to native Kubernetes Secrets. This replaces the previous SealedSecrets workflow.
-
-**Key benefit**: Secret values can be rotated via Vault UI/CLI without a git commit. Only new VaultStaticSecret CRDs need to be committed.
-
-## Architecture
-
-```
-Vault (KV v2)                VSO                        K8s Secret
-kv/{namespace}/{name}  -->  VaultStaticSecret CRD  -->  Secret in namespace
-                            (polls every 30s)
-```
-
-- **Vault**: Standalone instance in `vault` namespace, KV v2 at `kv/`
-- **VSO**: Deployed in `vault-secrets-operator-system` namespace via ArgoCD
-- **Auth**: Kubernetes auth method — each namespace has its own ServiceAccount + VaultAuth CRD
-
-## KV Path Convention
-
-```
-kv/{namespace}/{secret-name}
-```
-
-Examples:
-- `kv/homepage/homepage-widget-credentials`
-- `kv/argocd/forte-helm-repo`
-- `kv/gitea/gitea-smtp-secret`
-- `kv/keycloak/keycloak-credentials`
-
-## Vault Policy Structure
-
-Each namespace gets a read-only policy:
-
-```hcl
-# Policy: ns-{namespace}
-path "kv/data/{namespace}/*" {
-  capabilities = ["read"]
-}
-path "kv/metadata/{namespace}/*" {
-  capabilities = ["read", "list"]
-}
-```
-
-## Kubernetes Auth Roles
-
-Each namespace has a bound ServiceAccount:
-
-```
-Role: ns-{namespace}
-  bound_service_account_names: vault-auth-{namespace}
-  bound_service_account_namespaces: {namespace}
-  policies: ns-{namespace}
-  audience: vault
-  ttl: 1h
-```
-
-## CRD Reference
-
-### VaultAuth
-
-Per-namespace auth binding. One per namespace.
-
-```yaml
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultAuth
-metadata:
-  name: vault-auth
-  namespace: {namespace}
-spec:
-  method: kubernetes
-  mount: kubernetes
-  kubernetes:
-    role: ns-{namespace}
-    serviceAccount: vault-auth-{namespace}
-    audiences:
-    - vault
-```
-
-Each VaultAuth requires a corresponding ServiceAccount:
-
-```yaml
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vault-auth-{namespace}
-  namespace: {namespace}
-```
-
-### VaultStaticSecret
-
-One per secret. Syncs a Vault KV path to a K8s Secret.
-
-```yaml
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: {secret-name}
-  namespace: {namespace}
-spec:
-  type: kv-v2
-  mount: kv
-  path: {namespace}/{secret-name}
-  destination:
-    name: {secret-name}        # K8s Secret name (must match what apps expect)
-    create: true
-    type: Opaque               # Optional, defaults to Opaque
-    labels:                    # Optional, for secrets that need labels
-      some-label: "value"
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth
-```
-
-## Special Labels
-
-Some secrets require specific labels for correct operation:
-
-| Secret | Label | Purpose |
-|--------|-------|---------|
-| `renovate-env` | `allowedToBeCloned: "true"` | Kyverno secret-cloner policy |
-| `gitea-smtp-secret` | `allowedToBeCloned: "true"` | Kyverno secret-cloner policy |
-| `forte-helm-repo` | `argocd.argoproj.io/secret-type: repository` | ArgoCD repository recognition |
-| `forte10x-repo-creds` | `argocd.argoproj.io/secret-type: repository` | ArgoCD repository recognition |
-| `mcp10x-repo-creds` | `argocd.argoproj.io/secret-type: repository` | ArgoCD repository recognition |
-
-These are set in `destination.labels` of the VaultStaticSecret CRD.
-
-## Namespaces & Secrets Map
-
-| Namespace | Secrets |
-|-----------|---------|
-| `homepage` | homepage-widget-credentials |
-| `renovate` | renovate-env |
-| `gitea` | gitea-credentials, gitea-backup-s3, gitea-smtp-secret, gitea-runner-token |
-| `keycloak` | keycloak-credentials, microsoft-idp-credentials (overlay) |
-| `argocd` | forte-helm-repo, forte10x-repo-creds, mcp10x-repo-creds, argocd-notifications-secret |
-| `mcp10x` | app-credentials |
-| `ts-mcp` | ts-mcp-secrets |
-| `argocd-mcp` | auth-oidc, argocd-mcp-credentials |
-| `dot-ai` | dot-ai-secrets |
-| `music-man` | musicman-credentials |
-
-## Common Operations
-
-### Add a new secret
-
-1. Write to Vault:
-   ```bash
-   vault kv put kv/{namespace}/{secret-name} key1=val1 key2=val2
-   ```
-
-2. Create VaultStaticSecret YAML (see template above)
-
-3. Add to kustomization.yaml in the appropriate directory
-
-4. Commit and push — ArgoCD syncs the CRD, VSO creates the K8s Secret
-
-### Rotate a secret value
-
-No git commit needed:
-```bash
-vault kv put kv/{namespace}/{secret-name} key1=new-val1 key2=new-val2
-```
-VSO picks up changes within 30 seconds.
-
-### Check sync status
-
-```bash
-# VaultAuth status
-kubectl get vaultauth -n {namespace}
-
-# VaultStaticSecret status
-kubectl get vaultstaticsecret -n {namespace}
-
-# Verify K8s Secret exists with correct keys
-kubectl get secret {name} -n {namespace} -o jsonpath='{.data}' | jq
-```
-
-### Troubleshooting
-
-1. **VaultAuth not authenticating**: Check ServiceAccount exists, Vault role matches SA name/namespace
-2. **VaultStaticSecret not syncing**: Check `kubectl describe vaultstaticsecret {name} -n {ns}` for events
-3. **Secret missing keys**: Verify Vault KV path has all expected keys: `vault kv get kv/{ns}/{name}`
-4. **Permission denied**: Verify Vault policy allows read on `kv/data/{ns}/*`
-
-## File Locations
-
-| Type | Location |
-|------|----------|
-| VSO ArgoCD Application | `infra/base/vault-secrets-operator/` |
-| VSO Helm values | `infra/values/base/vault-secrets-operator-values.yaml` |
-| Vault policies script | `scripts/vault-setup-policies.sh` |
-| Seed script | `scripts/seed-vault-from-cluster.sh` |
-| VaultAuth + VaultStaticSecret | Alongside ArgoCD Application in each component directory |
-
-## Setup Scripts
-
-```bash
-# Create all Vault policies and auth roles
-./scripts/vault-setup-policies.sh
-
-# Seed Vault KV from existing K8s Secrets
-./scripts/seed-vault-from-cluster.sh
-```

infra/base/gitea/gitea-backup-s3-vault.yaml

@@ -1,15 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: gitea-backup-s3
-  namespace: gitea
-spec:
-  type: kv-v2
-  mount: kv
-  path: gitea/gitea-backup-s3
-  destination:
-    name: gitea-backup-s3
-    create: true
-    type: Opaque
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

infra/base/gitea/gitea-credentials-vault.yaml

@@ -1,14 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: gitea-credentials
-  namespace: gitea
-spec:
-  type: kv-v2
-  mount: kv
-  path: gitea/gitea-credentials
-  destination:
-    name: gitea-credentials
-    create: true
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

infra/base/gitea/gitea-runner-token-vault.yaml

@@ -1,14 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: gitea-runner-token
-  namespace: gitea
-spec:
-  type: kv-v2
-  mount: kv
-  path: gitea/gitea-runner-token
-  destination:
-    name: gitea-runner-token
-    create: true
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

infra/base/gitea/gitea-smtp-secret-vault.yaml

@@ -1,17 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: gitea-smtp-secret
-  namespace: gitea
-spec:
-  type: kv-v2
-  mount: kv
-  path: gitea/gitea-smtp-secret
-  destination:
-    name: gitea-smtp-secret
-    create: true
-    type: Opaque
-    labels:
-      allowedToBeCloned: "true"
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

infra/base/gitea/kustomization.yaml

@@ -2,9 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - gitea.yaml
-- vault-auth.yaml
+- gitea-backup-s3-sealed.yaml
-- gitea-credentials-vault.yaml
+- gitea-credentials-sealed.yaml
-- gitea-backup-s3-vault.yaml
+- gitea-runner-token-sealed.yaml
-- gitea-smtp-secret-vault.yaml
+- gitea-smtp-secret-sealed.yaml
-- gitea-runner-token-vault.yaml
-# Removed: gitea-*-sealed.yaml (migrated to VSO)

infra/base/gitea/vault-auth.yaml

@@ -1,20 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vault-auth-gitea
-  namespace: gitea
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultAuth
-metadata:
-  name: vault-auth
-  namespace: gitea
-spec:
-  method: kubernetes
-  mount: kubernetes
-  kubernetes:
-    role: ns-gitea
-    serviceAccount: vault-auth-gitea
-    audiences:
-    - vault

infra/base/homepage/homepage-widget-credentials-vault.yaml

@@ -1,14 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: homepage-widget-credentials
-  namespace: homepage
-spec:
-  type: kv-v2
-  mount: kv
-  path: homepage/homepage-widget-credentials
-  destination:
-    name: homepage-widget-credentials
-    create: true
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

infra/base/homepage/kustomization.yaml

@@ -2,7 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - homepage.yaml
-- vault-auth.yaml
+- homepage-widget-credentials-sealed.yaml
-- homepage-widget-credentials-vault.yaml
 - homepage-extra-rbac.yaml
-# Removed: homepage-widget-credentials-sealed.yaml (migrated to VSO)

infra/base/homepage/vault-auth.yaml

@@ -1,20 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vault-auth-homepage
-  namespace: homepage
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultAuth
-metadata:
-  name: vault-auth
-  namespace: homepage
-spec:
-  method: kubernetes
-  mount: kubernetes
-  kubernetes:
-    role: ns-homepage
-    serviceAccount: vault-auth-homepage
-    audiences:
-    - vault

infra/base/keycloak/keycloak-credentials-vault.yaml

@@ -1,14 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: keycloak-credentials
-  namespace: keycloak
-spec:
-  type: kv-v2
-  mount: kv
-  path: keycloak/keycloak-credentials
-  destination:
-    name: keycloak-credentials
-    create: true
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

infra/base/keycloak/kustomization.yaml

@@ -2,6 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - keycloak.yaml
-- vault-auth.yaml
+- keycloak-credentials-sealed.yaml
-- keycloak-credentials-vault.yaml
-# Removed: keycloak-credentials-sealed.yaml (migrated to VSO)

infra/base/keycloak/vault-auth.yaml

@@ -1,20 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vault-auth-keycloak
-  namespace: keycloak
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultAuth
-metadata:
-  name: vault-auth
-  namespace: keycloak
-spec:
-  method: kubernetes
-  mount: kubernetes
-  kubernetes:
-    role: ns-keycloak
-    serviceAccount: vault-auth-keycloak
-    audiences:
-    - vault

infra/base/kustomization.yaml

@@ -22,5 +22,3 @@ resources:
 - karpor
 - databunker
 - homepage
-- vault
-- vault-secrets-operator

infra/base/kyverno-policies/kyverno-policies.yaml

@@ -27,6 +27,7 @@ spec:
     automated:
       prune: true
       selfHeal: true
+      allowEmpty: false
     syncOptions:
     - CreateNamespace=true
     - Validate=true

infra/base/renovate/kustomization.yaml

@@ -2,6 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - renovate.yaml
-- vault-auth.yaml
+- renovate-env-sealed.yaml
-- renovate-env-vault.yaml
-# Removed: renovate-env-sealed.yaml (migrated to VSO)

infra/base/renovate/renovate-env-vault.yaml

@@ -1,17 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: renovate-env
-  namespace: renovate
-spec:
-  type: kv-v2
-  mount: kv
-  path: renovate/renovate-env
-  destination:
-    name: renovate-env
-    create: true
-    type: Opaque
-    labels:
-      allowedToBeCloned: "true"
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

infra/base/renovate/vault-auth.yaml

@@ -1,20 +0,0 @@
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vault-auth-renovate
-  namespace: renovate
----
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultAuth
-metadata:
-  name: vault-auth
-  namespace: renovate
-spec:
-  method: kubernetes
-  mount: kubernetes
-  kubernetes:
-    role: ns-renovate
-    serviceAccount: vault-auth-renovate
-    audiences:
-    - vault

infra/base/sealedsecrets/kustomization.yaml

@@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - sealedsecrets.yaml
-# Removed: argocd-forte-helm-secret-sealed.yaml (migrated to VSO — now in cluster-resources/)
+- argocd-forte-helm-secret-sealed.yaml

infra/base/vault-secrets-operator/kustomization.yaml

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

infra/base/vault-secrets-operator/vault-secrets-operator.yaml

@@ -1,42 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: vault-secrets-operator
-  namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "2"
-  labels:
-    app.kubernetes.io/name: vault-secrets-operator
-    app.kubernetes.io/part-of: security
-    app.kubernetes.io/managed-by: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-
-  sources:
-  - repoURL: https://helm.releases.hashicorp.com
-    chart: vault-secrets-operator
-    targetRevision: "0.10.0"
-    helm:
-      releaseName: vault-secrets-operator
-      valueFiles:
-      - $values/infra/values/base/vault-secrets-operator-values.yaml
-
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    ref: values
-
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: vault-secrets-operator-system
-
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-      allowEmpty: false
-    syncOptions:
-    - CreateNamespace=true
-    - Validate=true
-    - ServerSideApply=true

infra/base/vault/kustomization.yaml

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

infra/base/vault/vault.yaml

@@ -1,49 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: vault
-  namespace: argocd
-  annotations:
-    argocd.argoproj.io/sync-wave: "1"
-  labels:
-    app.kubernetes.io/name: vault
-    app.kubernetes.io/part-of: security
-    app.kubernetes.io/managed-by: argocd
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-
-  sources:
-  - repoURL: https://helm.releases.hashicorp.com
-    chart: vault
-    targetRevision: "0.32.0"
-    helm:
-      releaseName: vault
-      valueFiles:
-      - $values/infra/values/base/vault-values.yaml
-      - $values/infra/values/upc-dev/vault-values.yaml
-
-  - repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
-    targetRevision: HEAD
-    ref: values
-
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: vault
-
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-      allowEmpty: false
-    syncOptions:
-    - CreateNamespace=true
-    - Validate=true
-    - ServerSideApply=true
-
-  ignoreDifferences:
-  - group: apps
-    kind: StatefulSet
-    jsonPointers:
-    - /spec/volumeClaimTemplates

infra/overlays/upc-dev/entra-upc-dev-credentials-sealed.yaml

@@ -1,15 +0,0 @@
----
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: microsoft-idp-credentials
-  namespace: keycloak
-spec:
-  encryptedData:
-    MS_IDP_CLIENT_SECRET: AgBGeloOR8LVop8yluydjc7qj4JUkb85z7B3h07i3xLPup1ojgSqtx08huv+8gvSaFoPdxOY8g23iuKeAr2b2A70paHv0ILSVRsIpxzjuao4aDRWxMHD/SFzvitvqaXD1eQUcBNRDk/1NOG0o5b9o4ddMWkNmyCYuZcmOyx18DC1kFrcWGUgJkLTr+YRZcLJ2T80obZ+y4zztYc+vNQlu11KSIALz++c9XzK2XYSdOMdFHmzadWxoCjvkJqG4W5C6AQBlYa7NSydyU6K3TnwS4VHF8w1DRNneM/IuHLMNbcL8WZjHlSS8xgXFUMhG4rkejwM6joQLx57OosTQe1/xdCOPBXq4NO8Q76RXXkoI0EYMbzfK33vr4NVh8zmBUYxhaeQySh2jYdYp7t/79UzvP7jtGYUgqIZNEBqbDKkzvXsJ4dHJnss8U8lWVgLev31ZhaTjIr3A8VKDPbJKIRZPO71/4DiCF0WKLYNKfbYJ5tsyTxivFWDY5NPNkKkgXk4QoScZ3r4bYNZjDp1rC5zCRPGf0Lt1C5Zovx1HTUjpGpAFVi7DyNmEc0uXn2sTwPARAuAj8str+RnlRNzBkpPWKdlOoDVPTSA41dSTfUVZMlQlluu4fdDgGj5sEnhEN0iIxZNRwU/2DD2AVSqG+KtdIkfH6/j0jzdFn4D3Ha6vwAsBIURK4Ird/pLuNGGCDB+LrrNGXDTTKAPFydCuRtpyoM9kFOtSZb7T7q6Vfkqa7LfgP8mdG9JGXJx
-  template:
-    metadata:
-      creationTimestamp: null
-      name: microsoft-idp-credentials
-      namespace: keycloak

infra/overlays/upc-dev/kustomization.yaml

@@ -2,8 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ../../base
-- microsoft-idp-credentials-vault.yaml
-# Removed: entra-upc-dev-credentials-sealed.yaml (migrated to VSO)
 
 # No patches needed — base already has "upc-dev" paths
 # upc-dev is the default/base cluster

infra/overlays/upc-dev/microsoft-idp-credentials-vault.yaml

@@ -1,14 +0,0 @@
-apiVersion: secrets.hashicorp.com/v1beta1
-kind: VaultStaticSecret
-metadata:
-  name: microsoft-idp-credentials
-  namespace: keycloak
-spec:
-  type: kv-v2
-  mount: kv
-  path: keycloak/microsoft-idp-credentials
-  destination:
-    name: microsoft-idp-credentials
-    create: true
-  refreshAfter: 30s
-  vaultAuthRef: vault-auth

infra/values/base/homepage-values.yaml

@@ -17,25 +17,21 @@ config:
     traefik: true
 
   settings:
-    title: "Platform"
+    title: "Forte Platform"
     headerStyle: clean
     layout:
       Apps:
         style: row
-        columns: 3
+        columns: 4
-      Security:
+      Identity:
         style: row
-        columns: 3
+        columns: 4
-      Tools:
-        style: row
-        header: false
-        columns: 2
       DevOps:
-          style: column
+        style: row
-          rows: 2
+        columns: 4
       Monitoring:
-          style: column
+        style: row
-          rows: 1
+        columns: 4
 
   # Top-of-page cluster overview widget
   widgets:
@@ -54,7 +50,12 @@ config:
   # In-cluster entries come from K8s service annotations.
   # External (out-of-cluster) services are listed here statically.
   bookmarks: []
-  services: []
+  services:
+  - Apps:
+    - Forte Feedback:
+        href: https://feedback.forteapps.net
+        description: Fortes internal feedback app
+        icon: forte
 
 resources:
   requests:

infra/values/base/keycloak-values.yaml

@@ -21,9 +21,9 @@ ingress:
     gethomepage.dev/enabled: "true"
     gethomepage.dev/name: "Keycloak"
     gethomepage.dev/description: "Identity & access management"
-    gethomepage.dev/group: "Security"
+    gethomepage.dev/group: "Identity"
     gethomepage.dev/icon: "keycloak"
-    gethomepage.dev/href: "https://id.forteapps.net/admin/forte-test/console/"
+    gethomepage.dev/href: "https://id.forteapps.net"
 
 metrics:
   enabled: true
@@ -259,7 +259,7 @@ extraDeploy:
                 ADMIN_PASS=$(cat /secrets/admin-password)
 
                 echo "Authenticating to Keycloak..."
-                TOKEN=$(curl -s -X POST "${KEYCLOAK_URL}/realms/master/protocol/openid-connect/token" \
+                TOKEN=$(curl -sf -X POST "${KEYCLOAK_URL}/realms/master/protocol/openid-connect/token" \
                   -d "client_id=admin-cli" \
                   -d "username=${ADMIN_USER}" \
                   -d "password=${ADMIN_PASS}" \
@@ -276,7 +276,7 @@ extraDeploy:
                 upsert_secret() {
                   local ns="$1" name="$2" manifest="$3"
                   local code
-                  code=$(curl -s -o /dev/null -w "%{http_code}" \
+                  code=$(curl -sf -o /dev/null -w "%{http_code}" \
                     --cacert "$CA_CERT" \
                     -H "Authorization: Bearer ${SA_TOKEN}" \
                     -H "Content-Type: application/json" \
@@ -285,7 +285,7 @@ extraDeploy:
                   if [ "$code" = "200" ]; then
                     echo "  Updated secret '${ns}/${name}'"
                   elif [ "$code" = "404" ]; then
-                    code=$(curl -s -o /dev/null -w "%{http_code}" \
+                    code=$(curl -sf -o /dev/null -w "%{http_code}" \
                       --cacert "$CA_CERT" \
                       -H "Authorization: Bearer ${SA_TOKEN}" \
                       -H "Content-Type: application/json" \
@@ -332,7 +332,7 @@ extraDeploy:
 
                   # Get the client secret from Keycloak
                   local secret_value
-                  secret_value=$(curl -s -H "Authorization: Bearer ${TOKEN}" \
+                  secret_value=$(curl -sf -H "Authorization: Bearer ${TOKEN}" \
                     "${KEYCLOAK_URL}/admin/realms/${REALM}/clients/${client_uuid}/client-secret" \
                     | jq -r '.value')
 
@@ -347,7 +347,7 @@ extraDeploy:
 
                   # Write to target namespace (if it exists)
                   local ns_status
-                  ns_status=$(curl -s -o /dev/null -w "%{http_code}" \
+                  ns_status=$(curl -sf -o /dev/null -w "%{http_code}" \
                     --cacert "$CA_CERT" \
                     -H "Authorization: Bearer ${SA_TOKEN}" \
                     "${K8S_API}/api/v1/namespaces/${target_ns}")
@@ -371,12 +371,12 @@ extraDeploy:
                   local ns="$1" name="$2" key="$3" value="$4"
                   local patch
                   patch=$(printf '{"metadata":{"annotations":{"%s":"%s"}}}' "$key" "$value")
-                  curl -s -o /dev/null \
+                  curl -sf -o /dev/null \
                     --cacert "$CA_CERT" \
                     -H "Authorization: Bearer ${SA_TOKEN}" \
                     -H "Content-Type: application/strategic-merge-patch+json" \
                     -X PATCH -d "$patch" \
-                    "${K8S_API}/api/v1/namespaces/${ns}/secrets/${name}" || true
+                    "${K8S_API}/api/v1/namespaces/${ns}/secrets/${name}"
                 }
 
                 # =============================================
@@ -384,7 +384,7 @@ extraDeploy:
                 # =============================================
                 echo "=== Legacy sync: clients with k8s.secret.sync=true ==="
 
-                CLIENTS=$(curl -s -H "Authorization: Bearer ${TOKEN}" \
+                CLIENTS=$(curl -sf -H "Authorization: Bearer ${TOKEN}" \
                   "${KEYCLOAK_URL}/admin/realms/${REALM}/clients")
 
                 SYNC_CLIENTS=$(echo "$CLIENTS" | jq -c '[.[] | select(.attributes["k8s.secret.sync"] == "true")]')
@@ -409,7 +409,7 @@ extraDeploy:
                 echo ""
                 echo "=== Self-service: config Secrets with label keycloak.forteapps.net/client-config=true ==="
 
-                CONFIG_SECRETS=$(curl -s \
+                CONFIG_SECRETS=$(curl -sf \
                   --cacert "$CA_CERT" \
                   -H "Authorization: Bearer ${SA_TOKEN}" \
                   "${K8S_API}/api/v1/namespaces/keycloak/secrets?labelSelector=keycloak.forteapps.net/client-config=true")
@@ -430,10 +430,6 @@ extraDeploy:
                   CLIENT_JSON=$(printf '%s' "$CLIENT_JSON_B64" | base64 -d)
 
                   CLIENT_ID=$(echo "$CLIENT_JSON" | jq -r '.clientId')
-                  if [ -z "$CLIENT_ID" ] || [ "$CLIENT_ID" = "null" ]; then
-                    echo "ERROR: Could not extract clientId from config '${CONFIG_NAME}', skipping"
-                    continue
-                  fi
                   echo "Processing self-service client '${CLIENT_ID}' from config '${CONFIG_NAME}'"
 
                   # Compute config hash for change detection
@@ -447,7 +443,7 @@ extraDeploy:
                   CRED_SECRET_KEY=$(echo "$CLIENT_JSON" | jq -r '.secret.keys.clientSecret // "client-secret"')
 
                   # Check if credential Secret already exists in target namespace
-                  CRED_EXISTS=$(curl -s -o /dev/null -w "%{http_code}" \
+                  CRED_EXISTS=$(curl -sf -o /dev/null -w "%{http_code}" \
                     --cacert "$CA_CERT" \
                     -H "Authorization: Bearer ${SA_TOKEN}" \
                     "${K8S_API}/api/v1/namespaces/${CRED_NS}/secrets/${CRED_NAME}")
@@ -470,17 +466,18 @@ extraDeploy:
                     publicClient: false,
                     redirectUris: .redirectUris,
                     webOrigins: .webOrigins,
+                    defaultClientScopes: .defaultClientScopes,
                     protocolMappers: (.protocolMappers // [])
-                  } + if .defaultClientScopes then {defaultClientScopes: .defaultClientScopes} else {} end')
+                  }')
 
                   # Check if client already exists
-                  EXISTING=$(curl -s -H "Authorization: Bearer ${TOKEN}" \
+                  EXISTING=$(curl -sf -H "Authorization: Bearer ${TOKEN}" \
                     "${KEYCLOAK_URL}/admin/realms/${REALM}/clients?clientId=${CLIENT_ID}" \
                     | jq -r '.[0].id // empty')
 
                   if [ -n "$EXISTING" ]; then
                     echo "  Updating existing Keycloak client (uuid: ${EXISTING})"
-                    HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" \
+                    HTTP_CODE=$(curl -sf -o /dev/null -w "%{http_code}" \
                       -H "Authorization: Bearer ${TOKEN}" \
                       -H "Content-Type: application/json" \
                       -X PUT -d "$KC_CLIENT" \
@@ -493,7 +490,7 @@ extraDeploy:
                     CLIENT_UUID="$EXISTING"
                   else
                     echo "  Creating new Keycloak client '${CLIENT_ID}'"
-                    HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" \
+                    HTTP_CODE=$(curl -sf -o /dev/null -w "%{http_code}" \
                       -H "Authorization: Bearer ${TOKEN}" \
                       -H "Content-Type: application/json" \
                       -X POST -d "$KC_CLIENT" \
@@ -504,37 +501,11 @@ extraDeploy:
                       continue
                     fi
                     # Fetch the newly created client's UUID
-                    CLIENT_UUID=$(curl -s -H "Authorization: Bearer ${TOKEN}" \
+                    CLIENT_UUID=$(curl -sf -H "Authorization: Bearer ${TOKEN}" \
                       "${KEYCLOAK_URL}/admin/realms/${REALM}/clients?clientId=${CLIENT_ID}" \
                       | jq -r '.[0].id')
                   fi
 
-                  # Assign default client scopes (KC REST API ignores defaultClientScopes in POST/PUT body)
-                  REQUESTED_SCOPES=$(echo "$CLIENT_JSON" | jq -r '.defaultClientScopes // [] | .[]' 2>/dev/null)
-                  if [ -n "$REQUESTED_SCOPES" ]; then
-                    # Fetch all realm client scopes once
-                    ALL_SCOPES=$(curl -s -H "Authorization: Bearer ${TOKEN}" \
-                      "${KEYCLOAK_URL}/admin/realms/${REALM}/client-scopes")
-
-                    echo "$REQUESTED_SCOPES" | while read -r SCOPE_NAME; do
-                      [ -z "$SCOPE_NAME" ] && continue
-                      SCOPE_ID=$(echo "$ALL_SCOPES" | jq -r --arg name "$SCOPE_NAME" '.[] | select(.name == $name) | .id // empty')
-                      if [ -z "$SCOPE_ID" ]; then
-                        echo "  WARNING: Scope '${SCOPE_NAME}' not found in realm, skipping"
-                        continue
-                      fi
-                      SC_CODE=$(curl -s -o /dev/null -w "%{http_code}" \
-                        -H "Authorization: Bearer ${TOKEN}" \
-                        -X PUT \
-                        "${KEYCLOAK_URL}/admin/realms/${REALM}/clients/${CLIENT_UUID}/default-client-scopes/${SCOPE_ID}")
-                      if [ "$SC_CODE" = "204" ] || [ "$SC_CODE" = "200" ]; then
-                        echo "  Assigned scope '${SCOPE_NAME}'"
-                      else
-                        echo "  WARNING: Failed to assign scope '${SCOPE_NAME}' (HTTP ${SC_CODE})"
-                      fi
-                    done
-                  fi
-
                   # Sync credentials to target namespace
                   sync_credentials "$CLIENT_ID" "$CLIENT_UUID" "$CRED_NS" "$CRED_NAME" "$CRED_ID_KEY" "$CRED_SECRET_KEY"
 

infra/values/base/vault-secrets-operator-values.yaml

@@ -1,19 +0,0 @@
-# Vault Secrets Operator Helm values
-# Docs: https://developer.hashicorp.com/vault/docs/platform/k8s/vso
-
-# Default Vault connection — used by VaultAuth CRDs that don't specify one
-defaultVaultConnection:
-  enabled: true
-  address: http://vault.vault.svc.cluster.local:8200
-
-# Default auth method — Kubernetes auth
-defaultAuthMethod:
-  enabled: true
-  namespace: ""
-  method: kubernetes
-  mount: kubernetes
-  kubernetes:
-    role: vso-operator
-    serviceAccount: default
-    audiences:
-    - vault

infra/values/base/vault-values.yaml

@@ -1,36 +0,0 @@
-# HashiCorp Vault Helm Chart Values
-# Chart: hashicorp/vault v0.32.0
-
-server:
-  standalone:
-    enabled: true
-
-  dataStorage:
-    enabled: true
-    size: 5Gi
-
-  resources:
-    requests:
-      cpu: 100m
-      memory: 128Mi
-    limits:
-      cpu: 250m
-      memory: 256Mi
-
-  ingress:
-    enabled: true
-    ingressClassName: traefik
-    pathType: Prefix
-    activeService: true
-    annotations:
-      cert-manager.io/cluster-issuer: letsencrypt-prod
-      gethomepage.dev/enabled: "true"
-      gethomepage.dev/name: "Vault"
-      gethomepage.dev/description: "Secrets management"
-      gethomepage.dev/group: "Security"
-      gethomepage.dev/icon: "vault"
-      gethomepage.dev/href: "https://vault.forteapps.net"
-
-ui:
-  enabled: true
-  serviceType: ClusterIP

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

@@ -1,10 +1,3 @@
 ingress:
   enabled: true
   host: databunker.forteapps.net
-  annotations:
-    gethomepage.dev/enabled: "true"
-    gethomepage.dev/name: "Databunker"
-    gethomepage.dev/description: "Secure Database for PII and PCI Records"
-    gethomepage.dev/group: "Security"
-    gethomepage.dev/icon: "double-take"
-    gethomepage.dev/href: "https://databunker.forteapps.net"

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

@@ -13,53 +13,3 @@ ingress:
     - secretName: homepage-tls
       hosts:
       - start.forteapps.net
-
-config:
-  settings:
-    title: "Forte Platform"
-    headerStyle: clean
-    layout:
-      Apps:
-        style: row
-        columns: 2
-      Security:
-        style: row
-        columns: 3
-      Tools:
-        style: row
-        header: false
-        columns: 2
-        DevOps:
-          style: column
-          rows: 2
-        Monitoring:
-          style: column
-          rows: 1
-
-  # Top-of-page cluster overview widget
-  widgets:
-  - kubernetes:
-      cluster:
-        show: true
-        cpu: true
-        memory: true
-        showLabel: true
-        label: "Cluster"
-      nodes:
-        show: true
-        cpu: true
-        memory: true
-        showLabel: true
-  # In-cluster entries come from K8s service annotations.
-  # External (out-of-cluster) services are listed here statically.
-  bookmarks: []
-  services:
-  - Apps:
-    - Forte Benken:
-        href: https://benken.hackathon.forteapps.net
-        description: Teknisk kompetanse fra offentlige anbud
-        icon: forte
-    - Forte Feedback:
-        href: https://feedback.forteapps.net
-        description: Fortes internal feedback app
-        icon: forte

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

@@ -1,108 +1,2 @@
 ingress:
   hostname: id.forteapps.net
-
-keycloakConfigCli:
-  enabled: true
-  extraEnvVars:
-    - name: IMPORT_VAR_SUBSTITUTION_ENABLED
-      value: "true"
-    - name: MS_IDP_CLIENT_SECRET
-      valueFrom:
-        secretKeyRef:
-          name: microsoft-idp-credentials
-          key: MS_IDP_CLIENT_SECRET
-  configuration:
-    microsoft-idp.json: |
-      {
-        "realm": "forte",
-        "authenticationFlows": [
-          {
-            "alias": "auto-link-first-broker-login",
-            "description": "Auto-link IdP accounts to existing users by email",
-            "providerId": "basic-flow",
-            "topLevel": true,
-            "builtIn": false,
-            "authenticationExecutions": [
-              {
-                "authenticator": "idp-create-user-if-unique",
-                "authenticatorFlow": false,
-                "requirement": "ALTERNATIVE",
-                "priority": 10
-              },
-              {
-                "authenticator": "idp-auto-link",
-                "authenticatorFlow": false,
-                "requirement": "ALTERNATIVE",
-                "priority": 20
-              }
-            ]
-          }
-        ],
-        "identityProviders": [
-          {
-            "alias": "forte-entra",
-            "displayName": "Forte Entra",
-            "providerId": "microsoft",
-            "enabled": true,
-            "trustEmail": true,
-            "firstBrokerLoginFlowAlias": "auto-link-first-broker-login",
-            "config": {
-              "clientId": "7995d2b5-b798-4caf-8da6-b00b78bb34d7",
-              "clientSecret": "$(env:MS_IDP_CLIENT_SECRET)",
-              "defaultScope": "openid email profile",
-              "tenantId": "063afd9e-5fcb-48d2-a769-ca31b0f5b443",
-              "syncMode": "IMPORT"
-            }
-          },
-          {
-            "alias": "forte-entra-graph",
-            "displayName": "Forte Entra (Graph)",
-            "providerId": "microsoft",
-            "enabled": true,
-            "storeToken": true,
-            "trustEmail": true,
-            "firstBrokerLoginFlowAlias": "auto-link-first-broker-login",
-            "config": {
-              "clientId": "7995d2b5-b798-4caf-8da6-b00b78bb34d7",
-              "clientSecret": "$(env:MS_IDP_CLIENT_SECRET)",
-              "defaultScope": "openid email profile User.Read Mail.Send",
-              "tenantId": "063afd9e-5fcb-48d2-a769-ca31b0f5b443",
-              "syncMode": "IMPORT"
-            }
-          }
-        ],
-        "identityProviderMappers": [
-          {
-            "name": "forte-entra-email",
-            "identityProviderAlias": "forte-entra",
-            "identityProviderMapper": "hardcoded-attribute-idp-mapper",
-            "config": {
-              "syncMode": "INHERIT",
-              "attribute": "emailVerified",
-              "attribute.value": "true"
-            }
-          },
-          {
-            "name": "forte-entra-graph-email",
-            "identityProviderAlias": "forte-entra-graph",
-            "identityProviderMapper": "hardcoded-attribute-idp-mapper",
-            "config": {
-              "syncMode": "INHERIT",
-              "attribute": "emailVerified",
-              "attribute.value": "true"
-            }
-          }
-        ],
-        "roles": {
-          "realm": [
-            {
-              "name": "default-roles-forte",
-              "composites": {
-                "client": {
-                  "broker": ["read-token"]
-                }
-              }
-            }
-          ]
-        }
-      }

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

@@ -1,9 +0,0 @@
-server:
-  ingress:
-    hosts:
-    - host: vault.forteapps.net
-      paths: []
-    tls:
-    - secretName: vault-tls
-      hosts:
-      - vault.forteapps.net

scripts/seed-vault-from-cluster.sh

@@ -1,85 +0,0 @@
-#!/usr/bin/env bash
-# seed-vault-from-cluster.sh — Read existing K8s Secrets and write to Vault KV
-#
-# Prerequisites:
-#   - vault CLI authenticated (VAULT_ADDR + VAULT_TOKEN set)
-#   - kubectl access to the cluster
-#   - KV v2 engine at kv/
-#
-# Usage: ./scripts/seed-vault-from-cluster.sh
-#
-# This reads plaintext values from existing K8s Secrets and writes them
-# to Vault KV v2 at kv/{namespace}/{secret-name}.
-
-set -euo pipefail
-
-echo "=== Seeding Vault KV from existing K8s Secrets ==="
-echo ""
-
-# Helper: read a K8s secret and write all keys to Vault KV
-seed_secret() {
-  local ns="$1"
-  local secret_name="$2"
-  local vault_path="kv/${ns}/${secret_name}"
-
-  echo "--- ${ns}/${secret_name} → ${vault_path} ---"
-
-  # Get all keys from the secret
-  local keys
-  keys=$(kubectl get secret "${secret_name}" -n "${ns}" -o json 2>/dev/null | \
-    jq -r '.data // {} | keys[]' 2>/dev/null) || {
-    echo "  SKIP: secret not found in cluster"
-    echo ""
-    return
-  }
-
-  if [ -z "${keys}" ]; then
-    echo "  SKIP: no data keys"
-    echo ""
-    return
-  fi
-
-  # Build vault kv put arguments
-  local args=()
-  for key in ${keys}; do
-    local value
-    value=$(kubectl get secret "${secret_name}" -n "${ns}" -o jsonpath="{.data.${key}}" | base64 -d)
-    args+=("${key}=${value}")
-  done
-
-  vault kv put "${vault_path}" "${args[@]}"
-  echo "  OK: $(echo "${keys}" | wc -w | tr -d ' ') keys written"
-  echo ""
-}
-
-# --- Homepage ---
-seed_secret homepage homepage-widget-credentials
-
-# --- Renovate ---
-seed_secret renovate renovate-env
-
-# --- Gitea ---
-seed_secret gitea gitea-credentials
-seed_secret gitea gitea-backup-s3
-seed_secret gitea gitea-smtp-secret
-seed_secret gitea gitea-runner-token
-
-# --- Keycloak ---
-seed_secret keycloak keycloak-credentials
-seed_secret keycloak microsoft-idp-credentials
-
-# --- ArgoCD ---
-seed_secret argocd forte-helm-repo
-seed_secret argocd forte10x-repo-creds
-seed_secret argocd mcp10x-repo-creds
-seed_secret argocd argocd-notifications-secret
-
-# --- Application secrets ---
-seed_secret mcp10x app-credentials
-seed_secret ts-mcp ts-mcp-secrets
-seed_secret argocd-mcp auth-oidc
-seed_secret argocd-mcp argocd-mcp-credentials
-seed_secret dot-ai dot-ai-secrets
-seed_secret music-man musicman-credentials
-
-echo "=== Done. Verify with: vault kv list kv/{namespace} ==="

scripts/vault-setup-policies.sh

@@ -1,81 +0,0 @@
-#!/usr/bin/env bash
-# vault-setup-policies.sh — Create Vault policies + Kubernetes auth roles for VSO
-#
-# Prerequisites:
-#   - vault CLI authenticated (VAULT_ADDR + VAULT_TOKEN set)
-#   - Kubernetes auth method enabled at auth/kubernetes/
-#   - KV v2 secrets engine at kv/
-#
-# Usage: ./scripts/vault-setup-policies.sh
-
-set -euo pipefail
-
-echo "=== Vault Secrets Operator — Policy & Auth Role Setup ==="
-echo ""
-
-# All namespaces that have secrets to migrate
-NAMESPACES=(
-  argocd
-  gitea
-  keycloak
-  renovate
-  homepage
-  argocd-mcp
-  mcp10x
-  ts-mcp
-  dot-ai
-  music-man
-  vault-secrets-operator-system
-)
-
-# --- Per-namespace policies and auth roles ---
-
-for NS in "${NAMESPACES[@]}"; do
-  echo "--- Namespace: ${NS} ---"
-
-  # Create read-only policy for this namespace's secrets
-  echo "  Creating policy: ns-${NS}"
-  vault policy write "ns-${NS}" - <<EOF
-path "kv/data/${NS}/*" {
-  capabilities = ["read"]
-}
-path "kv/metadata/${NS}/*" {
-  capabilities = ["read", "list"]
-}
-EOF
-
-  # Create Kubernetes auth role bound to namespace-specific ServiceAccount
-  echo "  Creating auth role: ns-${NS}"
-  vault write "auth/kubernetes/role/ns-${NS}" \
-    bound_service_account_names="vault-auth-${NS}" \
-    bound_service_account_namespaces="${NS}" \
-    policies="ns-${NS}" \
-    audience="vault" \
-    ttl="1h"
-
-  echo ""
-done
-
-# --- VSO operator role (broad read for default auth method) ---
-
-echo "--- VSO Operator Role ---"
-echo "  Creating policy: vso-operator"
-vault policy write vso-operator - <<EOF
-path "kv/data/*" {
-  capabilities = ["read"]
-}
-path "kv/metadata/*" {
-  capabilities = ["read", "list"]
-}
-EOF
-
-echo "  Creating auth role: vso-operator"
-vault write auth/kubernetes/role/vso-operator \
-  bound_service_account_names="vault-secrets-operator" \
-  bound_service_account_namespaces="vault-secrets-operator-system" \
-  policies="vso-operator" \
-  audience="vault" \
-  ttl="1h"
-
-echo ""
-echo "=== Done. All ${#NAMESPACES[@]} namespace policies + auth roles created. ==="