vw fixes

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/kustomization.yaml

@@ -3,7 +3,6 @@ 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/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

docs/REFERENCE.md

@@ -1063,6 +1063,46 @@ dind:
 - Gitea admin panel (`/admin/runners`) — runners show as Online
 - Create test workflow in `.gitea/workflows/test.yml` — job executes
 
+### Vaultwarden
+
+**Chart**: `guerzon/vaultwarden`
+**Version**: 0.36.4 (app v1.36.0-alpine)
+**Namespace**: `vaultwarden`
+
+**Purpose**: Self-hosted Bitwarden-compatible password manager.
+
+**Configuration**:
+```yaml
+# infra/overlays/upc-dev/vaultwarden/ + infra/values/
+domain: "https://vaultwarden.forteapps.net"
+
+ingress:
+  enabled: true
+  class: "traefik"
+  tls: true
+  tlsSecret: vaultwarden-tls
+  hostname: bitwarden.forteapps.net
+  additionalAnnotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+
+database:
+  type: postgresql
+  existingSecret: prod-db-creds
+
+storage:
+  data: 5Gi (ReadWriteOnce)
+  attachments: 5Gi (ReadWriteOnce)
+```
+
+**TLS**: cert-manager auto-provisions Let's Encrypt certificate via `letsencrypt-prod` ClusterIssuer (same pattern as Gitea, Grafana, etc).
+
+**Endpoints**:
+- Web UI: `https://bitwarden.forteapps.net`
+
+**Secrets**:
+- `prod-db-creds` — PostgreSQL credentials + SMTP credentials
+- `vaultwarden-tls` — auto-managed by cert-manager
+
 ### AI Code Review (ai-review)
 
 **Type**: Gitea Actions workflow (`.gitea/workflows/ai-review.yaml`)
@@ -1141,6 +1181,30 @@ ignore:
 - Check Gitea Actions tab for workflow run status and logs
 - Monitor Anthropic usage dashboard for token consumption
 
+### Keycloak Browser Flow (IdP Auto-Redirect)
+
+**File**: `infra/values/base/keycloak-values.yaml` (inside `forte-realm.json`)
+
+The realm uses a custom browser authentication flow (`browser-auto-idp`) that skips the Keycloak login page and redirects directly to the Entra ID identity provider.
+
+**Flow executions**:
+
+| Priority | Authenticator | Requirement | Purpose |
+|----------|--------------|-------------|---------|
+| 10 | `auth-cookie` | ALTERNATIVE | Reuse existing session (no redirect) |
+| 20 | `identity-provider-redirector` | ALTERNATIVE | Auto-redirect to `forte-entra` IdP |
+
+**Key fields in realm JSON**:
+- `"browserFlow": "browser-auto-idp"` — overrides the default `browser` flow at realm level
+- `"authenticationFlows"` — defines the custom flow with its executions
+- `"authenticatorConfig"` — sets `defaultProvider: "forte-entra"` on the redirector
+
+**Why custom flow**: The default KC browser flow shows a username/password form with an IdP button. Since all authentication is via Entra ID, the custom flow eliminates this step. The `auth-cookie` execution preserves session reuse so returning users aren't redirected again.
+
+**Important**: The `forte-entra` identity provider must exist in Keycloak (currently configured manually in the KC admin console). If the IdP alias changes, update the `defaultProvider` value in the realm JSON.
+
+---
+
 ### Keycloak Client Registrar
 
 **Type**: CronJob (deployed via Keycloak Helm chart `extraDeploy`)
@@ -1384,46 +1448,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`

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,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ../../base
-- entra-upc-dev-credentials-sealed.yaml
+- vaultwarden
 
 # No patches needed — base already has "upc-dev" paths
 # upc-dev is the default/base cluster

infra/overlays/upc-dev/vaultwarden/kustomization.yaml

@@ -1,4 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- feedback.yaml
+- vaultwarden.yaml
+- vaultwarden-db-secret-sealed.yaml

infra/overlays/upc-dev/vaultwarden/vaultwarden-db-secret-sealed.yaml

@@ -0,0 +1,18 @@
+---
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  creationTimestamp: null
+  name: prod-db-creds
+  namespace: vaultwarden
+spec:
+  encryptedData:
+    SMTP_PASSWORD: AgARC3vcVD2SC8GUry5SYylyiS39eKQUFAjqT4dpXQsoJX7QSLfd7Ta68BURg8Q5e2zWdzIl+nrUyBy/4TMXeHjSUhcfsH0RY2logMuTn96kV/V7YKm1Zw394hrJ3uroB7iFkf/TwiXuwFS1QvppxlpXNWVClHs+r0aW3vD2s7ViFxFqcPYGfNKlGvW2aLU6XER/TUXCffoSmHgl0wut5UaZEo+321AAaqcmk90Te/Pv4oU0SfFGn/+14zDR3VT4s6u8rgYQcSB23p2f3X3+8tCLgSLclyzSXAVfclMBYCuCtOzFjgXOQLoYfW3WW48KqsFKsoZsI/dop8L/y2P78xGJ5gYNiVcH6vEMfOr6wOTISyXqQIi3a/KZcNSY4ZZ7kH13aqru3Fpb4XAGjcmEEfWfOQ9IcPBj6Yh9pNOhxlQHPqXR9zrwx//iXdH2bsbEJ2vNHQhU9uc4t3dO1VnLO/icvMr3CFEuaB4mFDThVrPGOEi5s1YKPTHb1j8B92WSy6aNmNro0977cbbJs/linNox3rNa20kzQPfU2pdlC31vIcpMCM7vtUnx16QHyjUNe/whFqIbSG3mE19jbjIvGo0d7jhBWZYQin+m1MRv/Tv8VjzYe6FciIFX33pNTWkwkvFq+s8eQcyruWCe5hLlF361FklqXcSh1tMyqcfOScNRPxUPlWumkGPDmonULJPkmAs7eJmxKlvinrAPs8eiP7c/1SPW6FdMmxT7sq/27TII
+    SMTP_USERNAME: AgC1Zsv5l5Wbrq7VZC2U55+0/LQvZEbsmlxq2O5Z+Xp/admdqptEBGlLKEdIn7CmyBzvmrmWasmN4NJPJHoeLWn7SgsoULTu1UQ3W9kgcrXUJ52dwOrYLMJUxJuh+OD9HEJejfOMksc2rSM69I4NUc+NXaDSZOo+gzldWzBN7nCa778NcnMgJxVcT4gqjTIRB9EOrCo4f3ldFJzVJW7qNnxurN0UZQ51y+nj+4z2R+LvfOJ1BT5YQC+nmx80HVBMdQWK5WO4QdxCtenXfiFDNcGK3MK/Exd+kubOWse85CMt2dR0GWuIfIOp+t4XQXfb1pxhTibh/fGae9dD0RpSX1c8hobkpXaDJIYeb7ZQF5J6Zf68fgCn0YircY1hB4yF7uX5CQL1yv76M4tM9yuOn5FTJaIG6byWn/RsHZ7KPIUSd1mOce9ZqfTkKzvC/wfX45UMhPEsdXF9o67mAtOpdmBGrmeDD+7GwPwKXz3JgDovlGtzvLvMZ27+x1dpC8LrcAjcKXXGKczbs3L2Pc+tymd9dis36RvlFLEgQG32ffQu5vQXqGcoSEnlZ0l39qoU9EItkA5kp0isGiJI46hJtAdTTNr0roymvrfDyLXpAvXTQYaVMC7/8KVb2r3kIPKtnsDuU2A57ceiqtdWQgUarPn4F0O3SaCnprmTm2thgCgQOkW7BGlN3CCsVboZUIOlFr7CwTswB9ZI6tzOj2WsUOhriTfIuXv3kyrFCspo
+    pgpassword: AgB7F1Nvm2sjBOneDFux2mc/qni32jaq+KccTWkS7UZWWgA37owrE/XvDSOXZ0ZkrpBfhvCnsrh7/mbVnZYNWCd/GgxI2txnkp9MxW5JLpJiaZZmzznI229BgG9I08vg6ciuUS+bvRw9XJFD7SAmgeA3NaDKAHRNIhu3CFEKQJANity+pKHY1zK6gX6ubmllFtjEJg2pijM3EeSNuXdAFXZlsYIJMqFzlvQrb4MV7qeqsvW2qMeJBElMnas60l3JgeUYtsIwh6720m6FFKGXYQLm4cKbByC0M1C0/Nfwnd9j+xgIgyXharQFmgyp1qQBM+MAHxnHoHCE3V9cJqy1nCy33M16YYsZGOuAkHB9ks9I7NxGAKKjAIm5DccW7zbYINzTQKAUYIF/VhVosHv0thAHjfuH7fGzSmo9BHrLTQE3tO5RF40X2GgKFxP/R5lA+dCtR2QBNot0DaL2TEJoPc0czSYPY5y92FDOQ1j9jvcet18tkJN+bzCKwiG+BxtD0eH+tv1EAZTwvyl43xlU3E3RwWgSmOWcusMrn92fhsHwNFs9mMeeM8qeAVq4xUkatbKoijHm6q03tMgp2T6iT3EoVNLzWz+754mLQxt6serkBS8U7Mkxwpfitf64ANLaQyMF8t9Rao0c8Q/ZkIl9TEczbCPX3DvlnsoSPKDMWGB9gTzKbvvH0+Gcxxs+LZFigE7SQ20kYMlQpD8uo15ufWpMSGmFJxvto55fYgA0+wJmqe18ERy1QjxCqQYG7A==
+    pgusername: AgAvYmIjfz5UbstZli9gpc77rc+oAft7NYIHFrSClyV0Ugt6UU+icMMlLbU92roy7J9XUHuWoXoK5vh0y/XeF95ce1VJC0/zvMK2OXmpfERbyNvyCpwzCFtzYJ4LO7yOi8PAPstzuziqnvLt+GLCwk1enU+IWHI7G2A/qIeWEww5+Y5a4WevVrchp0Wh87PdJ88IT5EiF7qBT2ipbcSoB+Gon962nbw8+pnFedmRcUQcdOf0tQBBZOl5TUVJ6mn4WIY8u6/yOwACMlUXQ553rxXYwGKyTRjI0KbTWwpgeCJiqokyrw/RcShD6qJvZGePdq6rNmmkELOHCPo9z/WvXQIDHbuPldvcglyHuN2w4tsBcGukbmjitwS6wxYD0vp3er3FI9+0tRnD9zlkLiUpcaLi9Rrm7NPS/JP1dbGcHz7fJNXgbMZRGRx3DjV73Qnz6YHvOHT4g6BI2+9JytriRKSOJk/FlDCINgrO+6zMrbxKzBTW3+FK1cc41sJ9zClbV603wsMgtkmB1sZL4xcLmq5wOuk19uO9TsK0Xnf+ajuFUkQm42DVxtTZ9HObLnP8eygn1WiMDv3ks6W7HIpJTpc2YJVU/Pg/kTeQgBKS0JRTkzpJFPHV2UrkLTr0U6ToPYOb2SWBnPI+Lp3cTOeUsbKOylBzx4uUJGoZUL5pAorjd5tDHJhMyMm589m5J3mGMXuhXO1cWg80
+  template:
+    metadata:
+      creationTimestamp: null
+      name: prod-db-creds
+      namespace: vaultwarden

infra/overlays/upc-dev/vaultwarden/vaultwarden.yaml

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

infra/values/base/gitea-values.yaml

@@ -41,6 +41,7 @@ gitea:
     oauth2:
       ENABLED: true
       ENABLE_AUTO_REGISTRATION: true
+      ACCOUNT_LINKING: auto
       USERNAME: email
 
     session:

infra/values/base/keycloak-values.yaml

@@ -58,6 +58,9 @@ keycloakConfigCli:
   enabled: true
   image:
     repository: bitnamilegacy/keycloak-config-cli
+  extraEnvVars:
+  - name: IMPORT_MANAGED_PROTOCOL_MAPPER
+    value: "no-delete"
   configuration:
     forte-realm.json: |
       {
@@ -101,6 +104,18 @@ keycloakConfigCli:
                   "access.token.claim": "true",
                   "userinfo.token.claim": "true"
                 }
+              },
+              {
+                "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"
+                }
               }
             ]
           },
@@ -173,7 +188,54 @@ keycloakConfigCli:
             ]
           }
         ],
+        "browserFlow": "browser-auto-idp",
+        "authenticationFlows": [
+          {
+            "alias": "browser-auto-idp",
+            "description": "Browser flow with auto-redirect to Forte Entra IdP",
+            "providerId": "basic-flow",
+            "topLevel": true,
+            "builtIn": false,
+            "authenticationExecutions": [
+              {
+                "authenticator": "auth-cookie",
+                "authenticatorFlow": false,
+                "requirement": "ALTERNATIVE",
+                "priority": 10
+              },
+              {
+                "authenticator": "identity-provider-redirector",
+                "authenticatorFlow": false,
+                "requirement": "ALTERNATIVE",
+                "priority": 20,
+                "authenticatorConfig": "forte-entra-redirector"
+              }
+            ]
+          }
+        ],
+        "authenticatorConfig": [
+          {
+            "alias": "forte-entra-redirector",
+            "config": {
+              "defaultProvider": "forte-entra"
+            }
+          }
+        ],
         "groups": [
+          {
+            "name": "k8s",
+            "path": "/k8s",
+            "clientRoles": {
+              "grafana": ["Editor"]
+            }
+          },
+          {
+            "name": "dev",
+            "path": "/dev",
+            "clientRoles": {
+              "grafana": ["Viewer"]
+            }
+          },
           {
             "name": "ArgoCD Admins",
             "path": "/ArgoCD Admins"
@@ -259,7 +321,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 +338,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 +347,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 +394,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 +409,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 +433,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 +446,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 +471,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 +492,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 +505,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 +528,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 +552,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 +563,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/vaultwarden-values.yaml

@@ -0,0 +1,3 @@
+image:
+  tag: "1.36.0-alpine"
+domain: "https://vaultwarden.forteapps.net"

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

@@ -1,112 +1,2 @@
 ingress:
   hostname: id.forteapps.net
-
-extraEnvVars:
-  - name: KC_FEATURES
-    value: "token-exchange:v1,admin-fine-grained-authz:v1"
-
-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/vaultwarden-values.yaml

@@ -0,0 +1,49 @@
+database:
+  type: postgresql
+  existingSecret: prod-db-creds
+  existingSecretUserKey: pgusername
+  existingSecretPasswordKey: pgpassword
+ingress:
+  enabled: true
+  class: "traefik"
+  tls: true
+  tlsSecret: vaultwarden-tls
+  hostname: bitwarden.forteapps.net
+  additionalAnnotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+
+replicas: 1
+# Multi-Attach error for volume "pvc-102ec9a4-dccd-4cba-bb4b-650f7d934c81" Volume is already used by pod(s) vaultwarden-7f568875c7-m9cgs
+
+service:
+  sessionAffinity: ClientIP
+  sessionAffinityConfig:
+    clientIP:
+      timeoutSeconds: 10800
+
+smtp:
+  host: smtp.office365.com
+  from: no-reply@forteapps.net
+  fromName: "Forte Bitwarden Administrator"
+  existingSecret: prod-db-creds
+  username:
+    existingSecretKey: SMTP_USERNAME
+  password:
+    existingSecretKey: SMTP_PASSWORD
+
+storage:
+  data:
+    name: "vaultwarden-data"
+    size: "5Gi"
+    class: ""
+    path: "/data"
+    keepPvc: true
+    accessMode: "ReadWriteOnce"
+
+  attachments:
+    name: "vaultwarden-files"
+    size: "5Gi"
+    class: ""
+    path: /files
+    keepPvc: true
+    accessMode: "ReadWriteOnce"