KC deploy 3

Co-authored-by: Copilot <copilot@github.com>

.gitignore

@@ -15,12 +15,4 @@ CLAUDE.md
 devbox.d/
 devbox.lock
 .devbox/
-bash.exe.stackdump
+bash.exe.stackdump
-
-# OpenTofu
-.tofu/configs/*.env
-.tofu/scripts/*.config
-.tofu/platforms/**/.terraform/
-.tofu/platforms/**/terraform.tfstate*
-.tofu/platforms/**/tfplan
-.tofu/platforms/**/.terraform.lock.hcl

.tofu/configs/aks.env.example

@@ -1,9 +0,0 @@
-# Azure AKS credentials — copy to aks.env and fill in values
-# NEVER commit aks.env to git!
-
-# Required
-AZURE_TENANT_ID=your-azure-tenant-id
-AZURE_SUBSCRIPTION_ID=your-azure-subscription-id
-
-# Optional — defaults to cluster name if not set
-ARM_RESOURCE_GROUP=

.tofu/configs/eks.env.example

@@ -1,10 +0,0 @@
-# AWS EKS credentials — copy to eks.env and fill in values
-# NEVER commit eks.env to git!
-
-# Required — AWS CLI profile or access key
-AWS_PROFILE=default
-AWS_REGION=eu-west-1
-
-# Optional — override with explicit keys instead of profile
-# AWS_ACCESS_KEY_ID=
-# AWS_SECRET_ACCESS_KEY=

.tofu/configs/gke.env.example

@@ -1,9 +0,0 @@
-# GCP GKE credentials — copy to gke.env and fill in values
-# NEVER commit gke.env to git!
-
-# Required
-GCP_PROJECT_ID=your-gcp-project-id
-GCP_REGION=europe-west4
-
-# Optional — path to service account JSON key (if not using gcloud auth)
-# GOOGLE_APPLICATION_CREDENTIALS=/path/to/sa-key.json

.tofu/configs/upc.env.example

@@ -1,8 +0,0 @@
-# UpCloud credentials — copy to upc.env and fill in values
-# NEVER commit upc.env to git!
-
-# Required
-UPCLOUD_TOKEN=your-upcloud-api-token
-
-# Optional — set after cluster creation for kubeconfig retrieval
-UPCLOUD_CLUSTER_ID=

.tofu/platforms/aks/dev/main.tf

@@ -1,18 +0,0 @@
-module "cluster" {
-  source = "../modules/cluster"
-
-  prefix              = "clst-dev"
-  location            = "norwayeast"
-  resource_group_name = "clst-dev-rg"
-
-  # AKS — small dev nodes
-  aks_node_vm_size = "Standard_B2s"
-  aks_node_count   = 2
-
-  enable_delete_lock = false
-
-  tags = {
-    Environment = "dev"
-    ManagedBy   = "tofu"
-  }
-}

.tofu/platforms/aks/dev/outputs.tf

@@ -1,26 +0,0 @@
-# ─── Cluster ─────────────────────────────────────────────────────────
-
-output "cluster_name" {
-  value = module.cluster.cluster_name
-}
-
-output "resource_group_name" {
-  value = module.cluster.resource_group_name
-}
-
-output "kubernetes_version" {
-  value = module.cluster.kubernetes_version
-}
-
-output "location" {
-  value = module.cluster.location
-}
-
-output "oidc_issuer_url" {
-  value = module.cluster.oidc_issuer_url
-}
-
-output "kubeconfig" {
-  value     = module.cluster.kubeconfig
-  sensitive = true
-}

.tofu/platforms/aks/dev/providers.tf

@@ -1,17 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    azurerm = {
-      source  = "hashicorp/azurerm"
-      version = "~> 4.0"
-    }
-  }
-}
-
-provider "azurerm" {
-  features {}
-  # Credentials via environment variables:
-  #   ARM_SUBSCRIPTION_ID, ARM_TENANT_ID, ARM_CLIENT_ID, ARM_CLIENT_SECRET
-  # Or: az login (uses your Azure CLI session)
-}

.tofu/platforms/aks/modules/cluster/main.tf

@@ -1,72 +0,0 @@
-# Current Azure/Entra ID context — provides tenant_id used in outputs
-data "azurerm_client_config" "current" {}
-
-# ─── Resource Group ───────────────────────────────────────────────────
-
-resource "azurerm_resource_group" "main" {
-  name     = var.resource_group_name
-  location = var.location
-  tags     = var.tags
-}
-
-resource "azurerm_management_lock" "main" {
-  count      = var.enable_delete_lock ? 1 : 0
-  name       = "${var.prefix}-delete-lock"
-  scope      = azurerm_resource_group.main.id
-  lock_level = "CanNotDelete"
-  notes      = "Prevents accidental deletion of production resources"
-}
-
-# ─── Networking ───────────────────────────────────────────────────────
-
-resource "azurerm_virtual_network" "main" {
-  name                = "${var.prefix}-vnet"
-  resource_group_name = azurerm_resource_group.main.name
-  location            = azurerm_resource_group.main.location
-  address_space       = [var.vnet_address_space]
-  tags                = var.tags
-}
-
-# AKS nodes subnet
-resource "azurerm_subnet" "aks" {
-  name                 = "${var.prefix}-aks-subnet"
-  resource_group_name  = azurerm_resource_group.main.name
-  virtual_network_name = azurerm_virtual_network.main.name
-  address_prefixes     = [var.aks_subnet_cidr]
-}
-
-# ─── AKS Cluster ──────────────────────────────────────────────────────
-
-resource "azurerm_kubernetes_cluster" "main" {
-  name                = "${var.prefix}-aks"
-  resource_group_name = azurerm_resource_group.main.name
-  location            = azurerm_resource_group.main.location
-  dns_prefix          = replace(var.prefix, "-", "")
-  kubernetes_version  = var.aks_kubernetes_version
-  tags                = var.tags
-
-  default_node_pool {
-    name           = "system"
-    node_count     = var.aks_node_count
-    vm_size        = var.aks_node_vm_size
-    vnet_subnet_id = azurerm_subnet.aks.id
-    node_labels = {
-      prefix = var.prefix
-      role   = "worker"
-      env    = lookup(var.tags, "Environment", "dev")
-    }
-  }
-
-  identity {
-    type = "SystemAssigned"
-  }
-
-  network_profile {
-    network_plugin = "azure"
-    network_policy = "azure"
-  }
-
-  # Enable Workload Identity for keyless Azure service access (MSI)
-  oidc_issuer_enabled       = true
-  workload_identity_enabled = true
-}

.tofu/platforms/aks/modules/cluster/outputs.tf

@@ -1,32 +0,0 @@
-# ─── Cluster ─────────────────────────────────────────────────────────
-
-output "cluster_name" {
-  description = "AKS cluster name"
-  value       = azurerm_kubernetes_cluster.main.name
-}
-
-output "resource_group_name" {
-  description = "Resource group name"
-  value       = azurerm_resource_group.main.name
-}
-
-output "kubernetes_version" {
-  description = "Kubernetes version"
-  value       = azurerm_kubernetes_cluster.main.kubernetes_version
-}
-
-output "location" {
-  description = "Azure region"
-  value       = azurerm_resource_group.main.location
-}
-
-output "oidc_issuer_url" {
-  description = "AKS OIDC issuer URL (for workload identity federation)"
-  value       = azurerm_kubernetes_cluster.main.oidc_issuer_url
-}
-
-output "kubeconfig" {
-  description = "Kubeconfig for the AKS cluster"
-  value       = azurerm_kubernetes_cluster.main.kube_config_raw
-  sensitive   = true
-}

.tofu/platforms/aks/modules/cluster/providers.tf

@@ -1,18 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    azurerm = {
-      source  = "hashicorp/azurerm"
-      version = "~> 4.0"
-    }
-    azuread = {
-      source  = "hashicorp/azuread"
-      version = "~> 3.0"
-    }
-    random = {
-      source  = "hashicorp/random"
-      version = "~> 3.0"
-    }
-  }
-}

.tofu/platforms/aks/modules/cluster/variables.tf

@@ -1,56 +0,0 @@
-# ─── Cluster ─────────────────────────────────────────────────────────
-
-variable "prefix" {
-  description = "Prefix for resource names"
-  type        = string
-}
-
-variable "location" {
-  description = "Azure region (e.g., norwayeast, westeurope, northeurope)"
-  type        = string
-}
-
-variable "resource_group_name" {
-  description = "Name of the Azure Resource Group to create"
-  type        = string
-}
-
-variable "vnet_address_space" {
-  description = "Address space for the virtual network"
-  type        = string
-  default     = "10.100.0.0/16"
-}
-
-variable "aks_subnet_cidr" {
-  description = "CIDR block for the AKS node subnet"
-  type        = string
-  default     = "10.100.0.0/22"
-}
-
-variable "aks_node_vm_size" {
-  description = "VM size for AKS worker nodes (e.g., Standard_B2s, Standard_D4s_v3)"
-  type        = string
-}
-
-variable "aks_node_count" {
-  description = "Number of AKS worker nodes"
-  type        = number
-}
-
-variable "aks_kubernetes_version" {
-  description = "Kubernetes version for AKS (null = latest stable)"
-  type        = string
-  default     = null
-}
-
-variable "enable_delete_lock" {
-  description = "Protect the resource group from accidental deletion"
-  type        = bool
-  default     = false
-}
-
-variable "tags" {
-  description = "Tags applied to all resources"
-  type        = map(string)
-  default     = {}
-}

.tofu/platforms/aks/prod/main.tf

@@ -1,18 +0,0 @@
-module "cluster" {
-  source = "../modules/cluster"
-
-  prefix              = "clst"
-  location            = "westeurope"
-  resource_group_name = "clst-prod-rg"
-
-  # AKS — general-purpose nodes for production
-  aks_node_vm_size = "Standard_D4s_v3"
-  aks_node_count   = 3
-
-  enable_delete_lock = true
-
-  tags = {
-    Environment = "prod"
-    ManagedBy   = "tofu"
-  }
-}

.tofu/platforms/aks/prod/outputs.tf

@@ -1,26 +0,0 @@
-# ─── Cluster ─────────────────────────────────────────────────────────
-
-output "cluster_name" {
-  value = module.cluster.cluster_name
-}
-
-output "resource_group_name" {
-  value = module.cluster.resource_group_name
-}
-
-output "kubernetes_version" {
-  value = module.cluster.kubernetes_version
-}
-
-output "location" {
-  value = module.cluster.location
-}
-
-output "oidc_issuer_url" {
-  value = module.cluster.oidc_issuer_url
-}
-
-output "kubeconfig" {
-  value     = module.cluster.kubeconfig
-  sensitive = true
-}

.tofu/platforms/aks/prod/providers.tf

@@ -1,17 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    azurerm = {
-      source  = "hashicorp/azurerm"
-      version = "~> 4.0"
-    }
-  }
-}
-
-provider "azurerm" {
-  features {}
-  # Credentials via environment variables:
-  #   ARM_SUBSCRIPTION_ID, ARM_TENANT_ID, ARM_CLIENT_ID, ARM_CLIENT_SECRET
-  # Or: az login (uses your Azure CLI session)
-}

.tofu/platforms/aks/workload/main.tf

@@ -1,173 +0,0 @@
-# =============================================================================
-# Azure Workload Cluster
-# =============================================================================
-# A lean AKS cluster for running application workloads. No managed data
-# services — those live on the platform cluster. ArgoCD (on the platform
-# cluster) deploys apps to this cluster via the app-of-apps pattern.
-#
-# Platform components deployed by deploy-workload.sh:
-#   nginx-ingress, cert-manager, external-dns, external-secrets, alloy
-#
-# Usage:
-#   tofu init && tofu plan && tofu apply
-#   ./sync-tofu-outputs.sh --env azure-workload
-#   ./deploy-workload.sh --env azure-workload
-# =============================================================================
-
-variable "prefix" {
-  description = "Prefix for resource names (e.g., clst-workload)"
-  type        = string
-  default     = "clst-workload"
-}
-
-variable "location" {
-  description = "Azure region"
-  type        = string
-  default     = "norwayeast"
-}
-
-variable "resource_group_name" {
-  description = "Name of the Azure Resource Group to create"
-  type        = string
-  default     = "clst-workload-rg"
-}
-
-variable "vnet_address_space" {
-  description = "Address space for the virtual network"
-  type        = string
-  default     = "10.110.0.0/16"
-}
-
-variable "aks_subnet_cidr" {
-  description = "CIDR block for the AKS node subnet"
-  type        = string
-  default     = "10.110.0.0/22"
-}
-
-variable "aks_node_vm_size" {
-  description = "VM size for AKS worker nodes"
-  type        = string
-  default     = "Standard_B2s"
-}
-
-variable "aks_node_count" {
-  description = "Number of AKS worker nodes"
-  type        = number
-  default     = 2
-}
-
-variable "aks_kubernetes_version" {
-  description = "Kubernetes version for AKS (null = latest stable)"
-  type        = string
-  default     = null
-}
-
-variable "domain" {
-  description = "Public domain name — must have an existing Azure DNS zone"
-  type        = string
-}
-
-variable "dns_zone_resource_group" {
-  description = "Resource group containing the Azure DNS zone (defaults to cluster RG)"
-  type        = string
-  default     = ""
-}
-
-variable "tags" {
-  description = "Tags applied to all resources"
-  type        = map(string)
-  default = {
-    Environment = "workload"
-    ManagedBy   = "tofu"
-  }
-}
-
-# ─── Resource Group ───────────────────────────────────────────────────
-
-resource "azurerm_resource_group" "main" {
-  name     = var.resource_group_name
-  location = var.location
-  tags     = var.tags
-}
-
-# ─── Networking ───────────────────────────────────────────────────────
-
-resource "azurerm_virtual_network" "main" {
-  name                = "${var.prefix}-vnet"
-  resource_group_name = azurerm_resource_group.main.name
-  location            = azurerm_resource_group.main.location
-  address_space       = [var.vnet_address_space]
-  tags                = var.tags
-}
-
-resource "azurerm_subnet" "aks" {
-  name                 = "${var.prefix}-aks-subnet"
-  resource_group_name  = azurerm_resource_group.main.name
-  virtual_network_name = azurerm_virtual_network.main.name
-  address_prefixes     = [var.aks_subnet_cidr]
-}
-
-# ─── AKS Cluster ──────────────────────────────────────────────────────
-
-resource "azurerm_kubernetes_cluster" "main" {
-  name                = "${var.prefix}-aks"
-  resource_group_name = azurerm_resource_group.main.name
-  location            = azurerm_resource_group.main.location
-  dns_prefix          = replace(var.prefix, "-", "")
-  kubernetes_version  = var.aks_kubernetes_version
-  tags                = var.tags
-
-  default_node_pool {
-    name           = "system"
-    node_count     = var.aks_node_count
-    vm_size        = var.aks_node_vm_size
-    vnet_subnet_id = azurerm_subnet.aks.id
-    node_labels = {
-      prefix = var.prefix
-      role   = "worker"
-      env    = lookup(var.tags, "Environment", "workload")
-    }
-  }
-
-  identity {
-    type = "SystemAssigned"
-  }
-
-  network_profile {
-    network_plugin = "azure"
-    network_policy = "azure"
-  }
-
-  oidc_issuer_enabled       = true
-  workload_identity_enabled = true
-}
-
-# ─── External-DNS Workload Identity ──────────────────────────────────
-# Allows external-dns to manage Azure DNS records for app ingresses.
-
-data "azurerm_dns_zone" "main" {
-  name                = var.domain
-  resource_group_name = var.dns_zone_resource_group != "" ? var.dns_zone_resource_group : azurerm_resource_group.main.name
-}
-
-resource "azurerm_user_assigned_identity" "external_dns" {
-  name                = "${var.prefix}-external-dns-identity"
-  resource_group_name = azurerm_resource_group.main.name
-  location            = azurerm_resource_group.main.location
-  tags                = var.tags
-}
-
-resource "azurerm_role_assignment" "external_dns_dns_contributor" {
-  scope                = data.azurerm_dns_zone.main.id
-  role_definition_name = "DNS Zone Contributor"
-  principal_id         = azurerm_user_assigned_identity.external_dns.principal_id
-}
-
-resource "azurerm_federated_identity_credential" "external_dns" {
-  name                = "${var.prefix}-external-dns-fedcred"
-  resource_group_name = azurerm_resource_group.main.name
-  parent_id           = azurerm_user_assigned_identity.external_dns.id
-  audience            = ["api://AzureADTokenExchange"]
-  issuer              = azurerm_kubernetes_cluster.main.oidc_issuer_url
-  subject             = "system:serviceaccount:external-dns:external-dns"
-}

.tofu/platforms/aks/workload/outputs.tf

@@ -1,4 +0,0 @@
-output "cluster_name"                    { value = azurerm_kubernetes_cluster.main.name }
-output "resource_group_name"             { value = azurerm_resource_group.main.name }
-output "location"                        { value = azurerm_resource_group.main.location }
-output "external_dns_identity_client_id" { value = azurerm_user_assigned_identity.external_dns.client_id }

.tofu/platforms/aks/workload/providers.tf

@@ -1,21 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    azurerm = {
-      source  = "hashicorp/azurerm"
-      version = "~> 4.0"
-    }
-    random = {
-      source  = "hashicorp/random"
-      version = "~> 3.0"
-    }
-  }
-}
-
-provider "azurerm" {
-  features {}
-  # Credentials via environment variables:
-  #   ARM_SUBSCRIPTION_ID, ARM_TENANT_ID, ARM_CLIENT_ID, ARM_CLIENT_SECRET
-  # Or: az login (uses your Azure CLI session)
-}

.tofu/platforms/eks/dev/main.tf

@@ -1,21 +0,0 @@
-module "cluster" {
-  source = "../modules/cluster"
-
-  region = var.region
-  prefix = "clst-dev"
-
-  # VPC
-  availability_zones = ["${var.region}a", "${var.region}b"]
-
-  # EKS — small dev nodes
-  node_instance_type = "t3.medium"
-  node_count         = 2
-  node_min_count     = 1
-  node_max_count     = 4
-  kubernetes_version = "1.30"
-
-  tags = {
-    Environment = "dev"
-    ManagedBy   = "tofu"
-  }
-}

.tofu/platforms/eks/dev/outputs.tf

@@ -1,5 +0,0 @@
-output "cluster_name"    { value = module.cluster.cluster_name }
-output "aws_region"      { value = module.cluster.aws_region }
-output "oidc_issuer_url" { value = module.cluster.oidc_issuer_url }
-output "oidc_provider_arn" { value = module.cluster.oidc_provider_arn }
-output "vpc_id"          { value = module.cluster.vpc_id }

.tofu/platforms/eks/dev/providers.tf

@@ -1,24 +0,0 @@
-terraform {
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = "~> 5.0"
-    }
-    tls = {
-      source  = "hashicorp/tls"
-      version = "~> 4.0"
-    }
-  }
-}
-
-# Authentication: set AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN
-# or configure an AWS profile: export AWS_PROFILE=clst
-provider "aws" {
-  region = var.region
-}
-
-variable "region" {
-  description = "AWS region for dev environment"
-  type        = string
-  default     = "eu-west-1"
-}

.tofu/platforms/eks/modules/cluster/main.tf

@@ -1,207 +0,0 @@
-# ─── VPC ──────────────────────────────────────────────────────────────
-
-resource "aws_vpc" "main" {
-  cidr_block           = var.vpc_cidr
-  enable_dns_hostnames = true
-  enable_dns_support   = true
-
-  tags = merge(var.tags, { Name = "${var.prefix}-vpc" })
-}
-
-resource "aws_internet_gateway" "main" {
-  vpc_id = aws_vpc.main.id
-  tags   = merge(var.tags, { Name = "${var.prefix}-igw" })
-}
-
-# Public subnets (one per AZ) — for NAT gateways and load balancers
-resource "aws_subnet" "public" {
-  count             = length(var.availability_zones)
-  vpc_id            = aws_vpc.main.id
-  cidr_block        = cidrsubnet(var.vpc_cidr, 4, count.index)
-  availability_zone = var.availability_zones[count.index]
-
-  map_public_ip_on_launch = true
-
-  tags = merge(var.tags, {
-    Name                                        = "${var.prefix}-public-${count.index + 1}"
-    "kubernetes.io/cluster/${var.prefix}-eks"   = "shared"
-    "kubernetes.io/role/elb"                    = "1"
-  })
-}
-
-# Private subnets (one per AZ) — for EKS nodes
-resource "aws_subnet" "private" {
-  count             = length(var.availability_zones)
-  vpc_id            = aws_vpc.main.id
-  cidr_block        = cidrsubnet(var.vpc_cidr, 4, count.index + length(var.availability_zones))
-  availability_zone = var.availability_zones[count.index]
-
-  tags = merge(var.tags, {
-    Name                                        = "${var.prefix}-private-${count.index + 1}"
-    "kubernetes.io/cluster/${var.prefix}-eks"   = "shared"
-    "kubernetes.io/role/internal-elb"           = "1"
-  })
-}
-
-# NAT Gateway (single, in first public subnet — use one per AZ for prod HA)
-resource "aws_eip" "nat" {
-  domain = "vpc"
-  tags   = merge(var.tags, { Name = "${var.prefix}-nat-eip" })
-}
-
-resource "aws_nat_gateway" "main" {
-  allocation_id = aws_eip.nat.id
-  subnet_id     = aws_subnet.public[0].id
-  tags          = merge(var.tags, { Name = "${var.prefix}-nat" })
-
-  depends_on = [aws_internet_gateway.main]
-}
-
-resource "aws_route_table" "public" {
-  vpc_id = aws_vpc.main.id
-
-  route {
-    cidr_block = "0.0.0.0/0"
-    gateway_id = aws_internet_gateway.main.id
-  }
-
-  tags = merge(var.tags, { Name = "${var.prefix}-public-rt" })
-}
-
-resource "aws_route_table_association" "public" {
-  count          = length(var.availability_zones)
-  subnet_id      = aws_subnet.public[count.index].id
-  route_table_id = aws_route_table.public.id
-}
-
-resource "aws_route_table" "private" {
-  vpc_id = aws_vpc.main.id
-
-  route {
-    cidr_block     = "0.0.0.0/0"
-    nat_gateway_id = aws_nat_gateway.main.id
-  }
-
-  tags = merge(var.tags, { Name = "${var.prefix}-private-rt" })
-}
-
-resource "aws_route_table_association" "private" {
-  count          = length(var.availability_zones)
-  subnet_id      = aws_subnet.private[count.index].id
-  route_table_id = aws_route_table.private.id
-}
-
-# ─── EKS Cluster ──────────────────────────────────────────────────────
-
-resource "aws_iam_role" "eks_cluster" {
-  name_prefix = "${var.prefix}-eks-cluster-"
-
-  assume_role_policy = jsonencode({
-    Version = "2012-10-17"
-    Statement = [{
-      Action    = "sts:AssumeRole"
-      Effect    = "Allow"
-      Principal = { Service = "eks.amazonaws.com" }
-    }]
-  })
-
-  tags = var.tags
-}
-
-resource "aws_iam_role_policy_attachment" "eks_cluster_policy" {
-  policy_arn = "arn:aws:iam::aws:policy/AmazonEKSClusterPolicy"
-  role       = aws_iam_role.eks_cluster.name
-}
-
-resource "aws_eks_cluster" "main" {
-  name     = "${var.prefix}-eks"
-  role_arn = aws_iam_role.eks_cluster.arn
-  version  = var.kubernetes_version
-
-  vpc_config {
-    subnet_ids              = concat(aws_subnet.private[*].id, aws_subnet.public[*].id)
-    endpoint_private_access = true
-    endpoint_public_access  = true
-  }
-
-  # Enable OIDC issuer for IRSA (IAM Roles for Service Accounts)
-  access_config {
-    authentication_mode = "API_AND_CONFIG_MAP"
-  }
-
-  tags = var.tags
-
-  depends_on = [aws_iam_role_policy_attachment.eks_cluster_policy]
-}
-
-# OIDC provider — required for IRSA (IAM Roles for Service Accounts)
-data "tls_certificate" "eks" {
-  url = aws_eks_cluster.main.identity[0].oidc[0].issuer
-}
-
-resource "aws_iam_openid_connect_provider" "eks" {
-  client_id_list  = ["sts.amazonaws.com"]
-  thumbprint_list = [data.tls_certificate.eks.certificates[0].sha1_fingerprint]
-  url             = aws_eks_cluster.main.identity[0].oidc[0].issuer
-
-  tags = var.tags
-}
-
-# EKS Node Group
-
-resource "aws_iam_role" "eks_nodes" {
-  name_prefix = "${var.prefix}-eks-nodes-"
-
-  assume_role_policy = jsonencode({
-    Version = "2012-10-17"
-    Statement = [{
-      Action    = "sts:AssumeRole"
-      Effect    = "Allow"
-      Principal = { Service = "ec2.amazonaws.com" }
-    }]
-  })
-
-  tags = var.tags
-}
-
-resource "aws_iam_role_policy_attachment" "eks_worker_node_policy" {
-  policy_arn = "arn:aws:iam::aws:policy/AmazonEKSWorkerNodePolicy"
-  role       = aws_iam_role.eks_nodes.name
-}
-
-resource "aws_iam_role_policy_attachment" "eks_cni_policy" {
-  policy_arn = "arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy"
-  role       = aws_iam_role.eks_nodes.name
-}
-
-resource "aws_iam_role_policy_attachment" "eks_ecr_readonly" {
-  policy_arn = "arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
-  role       = aws_iam_role.eks_nodes.name
-}
-
-resource "aws_eks_node_group" "main" {
-  cluster_name    = aws_eks_cluster.main.name
-  node_group_name = "${var.prefix}-nodes"
-  node_role_arn   = aws_iam_role.eks_nodes.arn
-  subnet_ids      = aws_subnet.private[*].id
-
-  instance_types = [var.node_instance_type]
-
-  scaling_config {
-    desired_size = var.node_count
-    max_size     = var.node_max_count
-    min_size     = var.node_min_count
-  }
-
-  update_config {
-    max_unavailable = 1
-  }
-
-  tags = var.tags
-
-  depends_on = [
-    aws_iam_role_policy_attachment.eks_worker_node_policy,
-    aws_iam_role_policy_attachment.eks_cni_policy,
-    aws_iam_role_policy_attachment.eks_ecr_readonly,
-  ]
-}

.tofu/platforms/eks/modules/cluster/outputs.tf

@@ -1,26 +0,0 @@
-# ─── Cluster ─────────────────────────────────────────────────────────
-
-output "cluster_name" {
-  description = "EKS cluster name"
-  value       = aws_eks_cluster.main.name
-}
-
-output "aws_region" {
-  description = "AWS region"
-  value       = var.region
-}
-
-output "oidc_issuer_url" {
-  description = "EKS OIDC issuer URL (for IRSA)"
-  value       = aws_eks_cluster.main.identity[0].oidc[0].issuer
-}
-
-output "oidc_provider_arn" {
-  description = "IAM OIDC provider ARN (for IRSA trust policies)"
-  value       = aws_iam_openid_connect_provider.eks.arn
-}
-
-output "vpc_id" {
-  description = "VPC ID"
-  value       = aws_vpc.main.id
-}

.tofu/platforms/eks/modules/cluster/providers.tf

@@ -1,12 +0,0 @@
-terraform {
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = "~> 5.0"
-    }
-    tls = {
-      source  = "hashicorp/tls"
-      version = "~> 4.0"
-    }
-  }
-}

.tofu/platforms/eks/modules/cluster/variables.tf

@@ -1,61 +0,0 @@
-# ─── Region ──────────────────────────────────────────────────────────
-
-variable "region" {
-  description = "AWS region (e.g., eu-west-1, us-east-1)"
-  type        = string
-}
-
-variable "prefix" {
-  description = "Prefix for resource names (e.g., clst-dev)"
-  type        = string
-}
-
-# ─── Networking ───────────────────────────────────────────────────────
-
-variable "vpc_cidr" {
-  description = "VPC CIDR block"
-  type        = string
-  default     = "10.100.0.0/16"
-}
-
-variable "availability_zones" {
-  description = "List of AZs for subnets (2–3 recommended)"
-  type        = list(string)
-}
-
-# ─── EKS Cluster ─────────────────────────────────────────────────────
-
-variable "node_instance_type" {
-  description = "EKS node instance type (e.g., t3.medium, m5.xlarge)"
-  type        = string
-}
-
-variable "node_count" {
-  description = "Desired number of EKS worker nodes"
-  type        = number
-}
-
-variable "node_min_count" {
-  description = "Minimum number of EKS worker nodes"
-  type        = number
-  default     = 1
-}
-
-variable "node_max_count" {
-  description = "Maximum number of EKS worker nodes"
-  type        = number
-}
-
-variable "kubernetes_version" {
-  description = "Kubernetes version for EKS (e.g., \"1.30\")"
-  type        = string
-  default     = "1.30"
-}
-
-# ─── Tags ─────────────────────────────────────────────────────────────
-
-variable "tags" {
-  description = "Tags applied to all resources"
-  type        = map(string)
-  default     = {}
-}

.tofu/platforms/eks/prod/main.tf

@@ -1,21 +0,0 @@
-module "cluster" {
-  source = "../modules/cluster"
-
-  region = var.region
-  prefix = "clst"
-
-  # VPC
-  availability_zones = ["${var.region}a", "${var.region}b", "${var.region}c"]
-
-  # EKS — general-purpose nodes for production
-  node_instance_type = "m5.xlarge"
-  node_count         = 3
-  node_min_count     = 3
-  node_max_count     = 6
-  kubernetes_version = "1.30"
-
-  tags = {
-    Environment = "prod"
-    ManagedBy   = "tofu"
-  }
-}

.tofu/platforms/eks/prod/outputs.tf

@@ -1,5 +0,0 @@
-output "cluster_name"    { value = module.cluster.cluster_name }
-output "aws_region"      { value = module.cluster.aws_region }
-output "oidc_issuer_url" { value = module.cluster.oidc_issuer_url }
-output "oidc_provider_arn" { value = module.cluster.oidc_provider_arn }
-output "vpc_id"          { value = module.cluster.vpc_id }

.tofu/platforms/eks/prod/providers.tf

@@ -1,22 +0,0 @@
-terraform {
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = "~> 5.0"
-    }
-    tls = {
-      source  = "hashicorp/tls"
-      version = "~> 4.0"
-    }
-  }
-}
-
-provider "aws" {
-  region = var.region
-}
-
-variable "region" {
-  description = "AWS region for prod environment"
-  type        = string
-  default     = "eu-west-1"
-}

.tofu/platforms/eks/workload/main.tf

@@ -1,339 +0,0 @@
-# =============================================================================
-# AWS Workload Cluster
-# =============================================================================
-# A lean EKS cluster for running application workloads. No managed data
-# services — those live on the platform cluster. ArgoCD (on the platform
-# cluster) deploys apps to this cluster via the app-of-apps pattern.
-#
-# Platform components deployed by deploy-workload.sh:
-#   nginx-ingress, cert-manager, external-dns, external-secrets, alloy
-#
-# Usage:
-#   tofu init && tofu plan && tofu apply
-#   ./sync-tofu-outputs.sh --env aws-workload
-#   ./deploy-workload.sh --env aws-workload
-# =============================================================================
-
-variable "prefix" {
-  description = "Prefix for resource names (e.g., clst-workload)"
-  type        = string
-  default     = "clst-workload"
-}
-
-variable "availability_zones" {
-  description = "List of AZs for subnets"
-  type        = list(string)
-  default     = ["eu-west-1a", "eu-west-1b"]
-}
-
-variable "vpc_cidr" {
-  description = "VPC CIDR block"
-  type        = string
-  default     = "10.110.0.0/16"
-}
-
-variable "node_instance_type" {
-  description = "EKS node instance type"
-  type        = string
-  default     = "t3.medium"
-}
-
-variable "node_count" {
-  description = "Desired number of EKS worker nodes"
-  type        = number
-  default     = 2
-}
-
-variable "node_min_count" {
-  description = "Minimum number of EKS worker nodes"
-  type        = number
-  default     = 1
-}
-
-variable "node_max_count" {
-  description = "Maximum number of EKS worker nodes"
-  type        = number
-  default     = 4
-}
-
-variable "kubernetes_version" {
-  description = "Kubernetes version for EKS"
-  type        = string
-  default     = "1.30"
-}
-
-variable "domain" {
-  description = "Public domain name — must have an existing Route53 hosted zone"
-  type        = string
-}
-
-variable "tags" {
-  description = "Tags applied to all resources"
-  type        = map(string)
-  default = {
-    Environment = "workload"
-    ManagedBy   = "tofu"
-  }
-}
-
-# ─── VPC ──────────────────────────────────────────────────────────────
-
-resource "aws_vpc" "main" {
-  cidr_block           = var.vpc_cidr
-  enable_dns_hostnames = true
-  enable_dns_support   = true
-
-  tags = merge(var.tags, { Name = "${var.prefix}-vpc" })
-}
-
-resource "aws_internet_gateway" "main" {
-  vpc_id = aws_vpc.main.id
-  tags   = merge(var.tags, { Name = "${var.prefix}-igw" })
-}
-
-resource "aws_subnet" "public" {
-  count             = length(var.availability_zones)
-  vpc_id            = aws_vpc.main.id
-  cidr_block        = cidrsubnet(var.vpc_cidr, 4, count.index)
-  availability_zone = var.availability_zones[count.index]
-
-  map_public_ip_on_launch = true
-
-  tags = merge(var.tags, {
-    Name                                        = "${var.prefix}-public-${count.index + 1}"
-    "kubernetes.io/cluster/${var.prefix}-eks"   = "shared"
-    "kubernetes.io/role/elb"                    = "1"
-  })
-}
-
-resource "aws_subnet" "private" {
-  count             = length(var.availability_zones)
-  vpc_id            = aws_vpc.main.id
-  cidr_block        = cidrsubnet(var.vpc_cidr, 4, count.index + length(var.availability_zones))
-  availability_zone = var.availability_zones[count.index]
-
-  tags = merge(var.tags, {
-    Name                                        = "${var.prefix}-private-${count.index + 1}"
-    "kubernetes.io/cluster/${var.prefix}-eks"   = "shared"
-    "kubernetes.io/role/internal-elb"           = "1"
-  })
-}
-
-resource "aws_eip" "nat" {
-  domain = "vpc"
-  tags   = merge(var.tags, { Name = "${var.prefix}-nat-eip" })
-}
-
-resource "aws_nat_gateway" "main" {
-  allocation_id = aws_eip.nat.id
-  subnet_id     = aws_subnet.public[0].id
-  tags          = merge(var.tags, { Name = "${var.prefix}-nat" })
-
-  depends_on = [aws_internet_gateway.main]
-}
-
-resource "aws_route_table" "public" {
-  vpc_id = aws_vpc.main.id
-
-  route {
-    cidr_block = "0.0.0.0/0"
-    gateway_id = aws_internet_gateway.main.id
-  }
-
-  tags = merge(var.tags, { Name = "${var.prefix}-public-rt" })
-}
-
-resource "aws_route_table_association" "public" {
-  count          = length(var.availability_zones)
-  subnet_id      = aws_subnet.public[count.index].id
-  route_table_id = aws_route_table.public.id
-}
-
-resource "aws_route_table" "private" {
-  vpc_id = aws_vpc.main.id
-
-  route {
-    cidr_block     = "0.0.0.0/0"
-    nat_gateway_id = aws_nat_gateway.main.id
-  }
-
-  tags = merge(var.tags, { Name = "${var.prefix}-private-rt" })
-}
-
-resource "aws_route_table_association" "private" {
-  count          = length(var.availability_zones)
-  subnet_id      = aws_subnet.private[count.index].id
-  route_table_id = aws_route_table.private.id
-}
-
-# ─── EKS Cluster ──────────────────────────────────────────────────────
-
-resource "aws_iam_role" "eks_cluster" {
-  name_prefix = "${var.prefix}-eks-cluster-"
-
-  assume_role_policy = jsonencode({
-    Version = "2012-10-17"
-    Statement = [{
-      Action    = "sts:AssumeRole"
-      Effect    = "Allow"
-      Principal = { Service = "eks.amazonaws.com" }
-    }]
-  })
-
-  tags = var.tags
-}
-
-resource "aws_iam_role_policy_attachment" "eks_cluster_policy" {
-  policy_arn = "arn:aws:iam::aws:policy/AmazonEKSClusterPolicy"
-  role       = aws_iam_role.eks_cluster.name
-}
-
-resource "aws_eks_cluster" "main" {
-  name     = "${var.prefix}-eks"
-  role_arn = aws_iam_role.eks_cluster.arn
-  version  = var.kubernetes_version
-
-  vpc_config {
-    subnet_ids              = concat(aws_subnet.private[*].id, aws_subnet.public[*].id)
-    endpoint_private_access = true
-    endpoint_public_access  = true
-  }
-
-  access_config {
-    authentication_mode = "API_AND_CONFIG_MAP"
-  }
-
-  tags = var.tags
-
-  depends_on = [aws_iam_role_policy_attachment.eks_cluster_policy]
-}
-
-# OIDC provider — required for IRSA
-data "tls_certificate" "eks" {
-  url = aws_eks_cluster.main.identity[0].oidc[0].issuer
-}
-
-resource "aws_iam_openid_connect_provider" "eks" {
-  client_id_list  = ["sts.amazonaws.com"]
-  thumbprint_list = [data.tls_certificate.eks.certificates[0].sha1_fingerprint]
-  url             = aws_eks_cluster.main.identity[0].oidc[0].issuer
-
-  tags = var.tags
-}
-
-resource "aws_iam_role" "eks_nodes" {
-  name_prefix = "${var.prefix}-eks-nodes-"
-
-  assume_role_policy = jsonencode({
-    Version = "2012-10-17"
-    Statement = [{
-      Action    = "sts:AssumeRole"
-      Effect    = "Allow"
-      Principal = { Service = "ec2.amazonaws.com" }
-    }]
-  })
-
-  tags = var.tags
-}
-
-resource "aws_iam_role_policy_attachment" "eks_worker_node_policy" {
-  policy_arn = "arn:aws:iam::aws:policy/AmazonEKSWorkerNodePolicy"
-  role       = aws_iam_role.eks_nodes.name
-}
-
-resource "aws_iam_role_policy_attachment" "eks_cni_policy" {
-  policy_arn = "arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy"
-  role       = aws_iam_role.eks_nodes.name
-}
-
-resource "aws_iam_role_policy_attachment" "eks_ecr_readonly" {
-  policy_arn = "arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly"
-  role       = aws_iam_role.eks_nodes.name
-}
-
-resource "aws_eks_node_group" "main" {
-  cluster_name    = aws_eks_cluster.main.name
-  node_group_name = "${var.prefix}-nodes"
-  node_role_arn   = aws_iam_role.eks_nodes.arn
-  subnet_ids      = aws_subnet.private[*].id
-
-  instance_types = [var.node_instance_type]
-
-  scaling_config {
-    desired_size = var.node_count
-    max_size     = var.node_max_count
-    min_size     = var.node_min_count
-  }
-
-  update_config {
-    max_unavailable = 1
-  }
-
-  tags = var.tags
-
-  depends_on = [
-    aws_iam_role_policy_attachment.eks_worker_node_policy,
-    aws_iam_role_policy_attachment.eks_cni_policy,
-    aws_iam_role_policy_attachment.eks_ecr_readonly,
-  ]
-}
-
-# ─── External-DNS IRSA ───────────────────────────────────────────────
-# Allows external-dns to manage Route53 records for app ingresses.
-
-data "aws_route53_zone" "main" {
-  name         = var.domain
-  private_zone = false
-}
-
-data "aws_iam_policy_document" "external_dns_assume_role" {
-  statement {
-    effect = "Allow"
-
-    principals {
-      type        = "Federated"
-      identifiers = [aws_iam_openid_connect_provider.eks.arn]
-    }
-
-    actions = ["sts:AssumeRoleWithWebIdentity"]
-
-    condition {
-      test     = "StringEquals"
-      variable = "${replace(aws_iam_openid_connect_provider.eks.url, "https://", "")}:sub"
-      values   = ["system:serviceaccount:external-dns:external-dns"]
-    }
-
-    condition {
-      test     = "StringEquals"
-      variable = "${replace(aws_iam_openid_connect_provider.eks.url, "https://", "")}:aud"
-      values   = ["sts.amazonaws.com"]
-    }
-  }
-}
-
-resource "aws_iam_role" "external_dns_irsa" {
-  name_prefix        = "${var.prefix}-external-dns-irsa-"
-  assume_role_policy = data.aws_iam_policy_document.external_dns_assume_role.json
-
-  tags = var.tags
-}
-
-data "aws_iam_policy_document" "external_dns_route53" {
-  statement {
-    effect    = "Allow"
-    actions   = ["route53:ChangeResourceRecordSets"]
-    resources = ["arn:aws:route53:::hostedzone/${data.aws_route53_zone.main.zone_id}"]
-  }
-
-  statement {
-    effect  = "Allow"
-    actions = ["route53:ListHostedZones", "route53:ListResourceRecordSets", "route53:ListTagsForResource"]
-    resources = ["*"]
-  }
-}
-
-resource "aws_iam_role_policy" "external_dns_route53" {
-  name_prefix = "${var.prefix}-external-dns-route53-"
-  role        = aws_iam_role.external_dns_irsa.id
-  policy      = data.aws_iam_policy_document.external_dns_route53.json
-}

.tofu/platforms/eks/workload/outputs.tf

@@ -1,3 +0,0 @@
-output "cluster_name"              { value = aws_eks_cluster.main.name }
-output "aws_region"                { value = var.region }
-output "external_dns_irsa_role_arn" { value = aws_iam_role.external_dns_irsa.arn }

.tofu/platforms/eks/workload/providers.tf

@@ -1,24 +0,0 @@
-terraform {
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = "~> 5.0"
-    }
-    tls = {
-      source  = "hashicorp/tls"
-      version = "~> 4.0"
-    }
-  }
-}
-
-# Authentication: set AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN
-# or configure an AWS profile: export AWS_PROFILE=clst
-provider "aws" {
-  region = var.region
-}
-
-variable "region" {
-  description = "AWS region for the workload environment"
-  type        = string
-  default     = "eu-west-1"
-}

.tofu/platforms/gke/dev/main.tf

@@ -1,17 +0,0 @@
-module "cluster" {
-  source = "../modules/cluster"
-
-  project_id = var.project_id
-  region     = var.region
-  prefix     = "clst-dev"
-
-  # GKE — small dev nodes
-  node_machine_type   = "e2-standard-2"
-  node_count          = 2
-  deletion_protection = false
-
-  labels = {
-    environment = "dev"
-    managed-by  = "tofu"
-  }
-}

.tofu/platforms/gke/dev/outputs.tf

@@ -1,3 +0,0 @@
-output "cluster_name" { value = module.cluster.cluster_name }
-output "project_id"   { value = module.cluster.project_id }
-output "region"       { value = module.cluster.region }

.tofu/platforms/gke/dev/providers.tf

@@ -1,26 +0,0 @@
-terraform {
-  required_providers {
-    google = {
-      source  = "hashicorp/google"
-      version = "~> 6.0"
-    }
-  }
-}
-
-# Authentication: use Application Default Credentials (gcloud auth application-default login)
-# or set GOOGLE_APPLICATION_CREDENTIALS to a service account key file.
-provider "google" {
-  project = var.project_id
-  region  = var.region
-}
-
-variable "project_id" {
-  description = "GCP project ID for the dev environment"
-  type        = string
-}
-
-variable "region" {
-  description = "GCP region"
-  type        = string
-  default     = "europe-west4"
-}

.tofu/platforms/gke/modules/cluster/main.tf

@@ -1,115 +0,0 @@
-# ─── Required APIs ────────────────────────────────────────────────────
-
-resource "google_project_service" "compute" {
-  project            = var.project_id
-  service            = "compute.googleapis.com"
-  disable_on_destroy = false
-}
-
-resource "google_project_service" "container" {
-  project            = var.project_id
-  service            = "container.googleapis.com"
-  disable_on_destroy = false
-}
-
-# ─── Networking ───────────────────────────────────────────────────────
-
-resource "google_compute_network" "main" {
-  project                 = var.project_id
-  name                    = "${var.prefix}-vpc"
-  auto_create_subnetworks = false
-
-  depends_on = [google_project_service.compute]
-}
-
-resource "google_compute_subnetwork" "main" {
-  project       = var.project_id
-  name          = "${var.prefix}-subnet"
-  ip_cidr_range = "10.100.0.0/22"
-  region        = var.region
-  network       = google_compute_network.main.id
-
-  # Secondary ranges required for GKE VPC-native cluster
-  secondary_ip_range {
-    range_name    = "pods"
-    ip_cidr_range = "10.200.0.0/14" # /14 = ~262k pod IPs
-  }
-
-  secondary_ip_range {
-    range_name    = "services"
-    ip_cidr_range = "10.204.0.0/20" # /20 = ~4k service IPs
-  }
-}
-
-# ─── GKE Cluster ──────────────────────────────────────────────────────
-#
-# Regional cluster (3 control-plane replicas) for HA.
-# Workload Identity enabled — allows K8s service accounts to impersonate
-# Google Service Accounts for keyless access to GCP services.
-
-resource "google_container_cluster" "main" {
-  project  = var.project_id
-  name     = "${var.prefix}-gke"
-  location = var.region # regional cluster
-
-  network    = google_compute_network.main.id
-  subnetwork = google_compute_subnetwork.main.id
-
-  # VPC-native cluster with alias IP ranges
-  ip_allocation_policy {
-    cluster_secondary_range_name  = "pods"
-    services_secondary_range_name = "services"
-  }
-
-  # Workload Identity pool — enables OIDC token projection for pods
-  workload_identity_config {
-    workload_pool = "${var.project_id}.svc.id.goog"
-  }
-
-  # Remove default node pool — we manage our own below
-  remove_default_node_pool = true
-  initial_node_count       = 1
-
-  deletion_protection = var.deletion_protection
-
-  dynamic "release_channel" {
-    for_each = var.kubernetes_version == null ? [1] : []
-    content {
-      channel = "STABLE"
-    }
-  }
-
-  resource_labels = var.labels
-
-  depends_on = [google_project_service.container]
-}
-
-resource "google_container_node_pool" "main" {
-  project    = var.project_id
-  name       = "${var.prefix}-nodes"
-  location   = var.region
-  cluster    = google_container_cluster.main.name
-  node_count = var.node_count
-
-  node_config {
-    machine_type = var.node_machine_type
-
-    # GKE_METADATA mode is required for Workload Identity
-    workload_metadata_config {
-      mode = "GKE_METADATA"
-    }
-
-    oauth_scopes = [
-      "https://www.googleapis.com/auth/cloud-platform",
-    ]
-
-    labels = merge(var.labels, {
-      role = "worker"
-    })
-  }
-
-  management {
-    auto_repair  = true
-    auto_upgrade = true
-  }
-}

.tofu/platforms/gke/modules/cluster/outputs.tf

@@ -1,16 +0,0 @@
-# ─── Cluster ─────────────────────────────────────────────────────────
-
-output "cluster_name" {
-  description = "GKE cluster name"
-  value       = google_container_cluster.main.name
-}
-
-output "project_id" {
-  description = "GCP project ID"
-  value       = var.project_id
-}
-
-output "region" {
-  description = "GCP region"
-  value       = var.region
-}

.tofu/platforms/gke/modules/cluster/providers.tf

@@ -1,8 +0,0 @@
-terraform {
-  required_providers {
-    google = {
-      source  = "hashicorp/google"
-      version = "~> 6.0"
-    }
-  }
-}

.tofu/platforms/gke/modules/cluster/variables.tf

@@ -1,48 +0,0 @@
-# ─── Project / Region ────────────────────────────────────────────────
-
-variable "project_id" {
-  description = "GCP project ID"
-  type        = string
-}
-
-variable "region" {
-  description = "GCP region (e.g., europe-west4, europe-west1)"
-  type        = string
-}
-
-variable "prefix" {
-  description = "Prefix for resource names (e.g., clst-dev)"
-  type        = string
-}
-
-# ─── GKE Cluster ─────────────────────────────────────────────────────
-
-variable "node_machine_type" {
-  description = "GKE node machine type (e.g., e2-standard-2, e2-standard-4)"
-  type        = string
-}
-
-variable "node_count" {
-  description = "Number of nodes per zone (regional cluster spawns nodes in each zone)"
-  type        = number
-}
-
-variable "kubernetes_version" {
-  description = "GKE Kubernetes version channel (null = STABLE release channel)"
-  type        = string
-  default     = null
-}
-
-variable "deletion_protection" {
-  description = "Prevent cluster deletion (set true for production)"
-  type        = bool
-  default     = false
-}
-
-# ─── Labels ──────────────────────────────────────────────────────────
-
-variable "labels" {
-  description = "Labels applied to all resources"
-  type        = map(string)
-  default     = {}
-}

.tofu/platforms/gke/prod/main.tf

@@ -1,17 +0,0 @@
-module "cluster" {
-  source = "../modules/cluster"
-
-  project_id = var.project_id
-  region     = var.region
-  prefix     = "clst"
-
-  # GKE — general-purpose nodes for production
-  node_machine_type   = "e2-standard-4"
-  node_count          = 3
-  deletion_protection = true
-
-  labels = {
-    environment = "prod"
-    managed-by  = "tofu"
-  }
-}

.tofu/platforms/gke/prod/outputs.tf

@@ -1,3 +0,0 @@
-output "cluster_name" { value = module.cluster.cluster_name }
-output "project_id"   { value = module.cluster.project_id }
-output "region"       { value = module.cluster.region }

.tofu/platforms/gke/prod/providers.tf

@@ -1,24 +0,0 @@
-terraform {
-  required_providers {
-    google = {
-      source  = "hashicorp/google"
-      version = "~> 6.0"
-    }
-  }
-}
-
-provider "google" {
-  project = var.project_id
-  region  = var.region
-}
-
-variable "project_id" {
-  description = "GCP project ID for the prod environment"
-  type        = string
-}
-
-variable "region" {
-  description = "GCP region"
-  type        = string
-  default     = "europe-west1"
-}

.tofu/platforms/gke/workload/main.tf

@@ -1,194 +0,0 @@
-# =============================================================================
-# GCP Workload Cluster
-# =============================================================================
-# A lean GKE cluster for running application workloads. No managed data
-# services — those live on the platform cluster. ArgoCD (on the platform
-# cluster) deploys apps to this cluster via the app-of-apps pattern.
-#
-# Platform components deployed by deploy-workload.sh:
-#   nginx-ingress, cert-manager, external-dns, external-secrets, alloy
-#
-# Usage:
-#   tofu init && tofu plan && tofu apply
-#   ./sync-tofu-outputs.sh --env gcp-workload
-#   ./deploy-workload.sh --env gcp-workload
-# =============================================================================
-
-variable "prefix" {
-  description = "Prefix for resource names (e.g., clst-workload)"
-  type        = string
-  default     = "clst-workload"
-}
-
-variable "node_machine_type" {
-  description = "GKE node machine type"
-  type        = string
-  default     = "e2-standard-2"
-}
-
-variable "node_count" {
-  description = "Number of nodes per zone"
-  type        = number
-  default     = 1
-}
-
-variable "kubernetes_version" {
-  description = "GKE Kubernetes version (null = STABLE release channel)"
-  type        = string
-  default     = null
-}
-
-variable "deletion_protection" {
-  description = "Prevent cluster deletion"
-  type        = bool
-  default     = false
-}
-
-variable "labels" {
-  description = "Labels applied to all resources"
-  type        = map(string)
-  default = {
-    environment = "workload"
-    managed-by  = "tofu"
-  }
-}
-
-# ─── Required APIs ────────────────────────────────────────────────────
-
-resource "google_project_service" "compute" {
-  project            = var.project_id
-  service            = "compute.googleapis.com"
-  disable_on_destroy = false
-}
-
-resource "google_project_service" "container" {
-  project            = var.project_id
-  service            = "container.googleapis.com"
-  disable_on_destroy = false
-}
-
-resource "google_project_service" "iam" {
-  project            = var.project_id
-  service            = "iam.googleapis.com"
-  disable_on_destroy = false
-}
-
-resource "google_project_service" "dns" {
-  project            = var.project_id
-  service            = "dns.googleapis.com"
-  disable_on_destroy = false
-}
-
-# ─── Networking ───────────────────────────────────────────────────────
-
-resource "google_compute_network" "main" {
-  project                 = var.project_id
-  name                    = "${var.prefix}-vpc"
-  auto_create_subnetworks = false
-
-  depends_on = [google_project_service.compute]
-}
-
-resource "google_compute_subnetwork" "main" {
-  project       = var.project_id
-  name          = "${var.prefix}-subnet"
-  ip_cidr_range = "10.110.0.0/22"
-  region        = var.region
-  network       = google_compute_network.main.id
-
-  secondary_ip_range {
-    range_name    = "pods"
-    ip_cidr_range = "10.210.0.0/14"
-  }
-
-  secondary_ip_range {
-    range_name    = "services"
-    ip_cidr_range = "10.214.0.0/20"
-  }
-}
-
-# ─── GKE Cluster ──────────────────────────────────────────────────────
-
-resource "google_container_cluster" "main" {
-  project  = var.project_id
-  name     = "${var.prefix}-gke"
-  location = var.region
-
-  network    = google_compute_network.main.id
-  subnetwork = google_compute_subnetwork.main.id
-
-  ip_allocation_policy {
-    cluster_secondary_range_name  = "pods"
-    services_secondary_range_name = "services"
-  }
-
-  workload_identity_config {
-    workload_pool = "${var.project_id}.svc.id.goog"
-  }
-
-  remove_default_node_pool = true
-  initial_node_count       = 1
-
-  deletion_protection = var.deletion_protection
-
-  dynamic "release_channel" {
-    for_each = var.kubernetes_version == null ? [1] : []
-    content {
-      channel = "STABLE"
-    }
-  }
-
-  resource_labels = var.labels
-
-  depends_on = [google_project_service.container]
-}
-
-resource "google_container_node_pool" "main" {
-  project    = var.project_id
-  name       = "${var.prefix}-nodes"
-  location   = var.region
-  cluster    = google_container_cluster.main.name
-  node_count = var.node_count
-
-  node_config {
-    machine_type = var.node_machine_type
-
-    workload_metadata_config {
-      mode = "GKE_METADATA"
-    }
-
-    oauth_scopes = [
-      "https://www.googleapis.com/auth/cloud-platform",
-    ]
-
-    labels = merge(var.labels, { role = "worker" })
-  }
-
-  management {
-    auto_repair  = true
-    auto_upgrade = true
-  }
-}
-
-# ─── External-DNS Workload Identity ──────────────────────────────────
-# Allows external-dns to manage Cloud DNS records for app ingresses.
-
-resource "google_service_account" "external_dns" {
-  project      = var.project_id
-  account_id   = "${var.prefix}-external-dns"
-  display_name = "External-DNS Service Account (Workload Identity)"
-
-  depends_on = [google_project_service.iam]
-}
-
-resource "google_project_iam_member" "external_dns_dns_admin" {
-  project = var.project_id
-  role    = "roles/dns.admin"
-  member  = "serviceAccount:${google_service_account.external_dns.email}"
-}
-
-resource "google_service_account_iam_member" "external_dns_workload_identity" {
-  service_account_id = google_service_account.external_dns.name
-  role               = "roles/iam.workloadIdentityUser"
-  member             = "serviceAccount:${var.project_id}.svc.id.goog[external-dns/external-dns]"
-}

.tofu/platforms/gke/workload/outputs.tf

@@ -1,4 +0,0 @@
-output "cluster_name"           { value = google_container_cluster.main.name }
-output "project_id"             { value = var.project_id }
-output "region"                 { value = var.region }
-output "external_dns_gsa_email" { value = google_service_account.external_dns.email }

.tofu/platforms/gke/workload/providers.tf

@@ -1,26 +0,0 @@
-terraform {
-  required_providers {
-    google = {
-      source  = "hashicorp/google"
-      version = "~> 6.0"
-    }
-  }
-}
-
-# Authentication: use Application Default Credentials (gcloud auth application-default login)
-# or set GOOGLE_APPLICATION_CREDENTIALS to a service account key file.
-provider "google" {
-  project = var.project_id
-  region  = var.region
-}
-
-variable "project_id" {
-  description = "GCP project ID for the workload environment"
-  type        = string
-}
-
-variable "region" {
-  description = "GCP region"
-  type        = string
-  default     = "europe-west4"
-}

.tofu/platforms/upc/dev/main.tf

@@ -1,14 +0,0 @@
-module "cluster" {
-  source = "../modules/cluster"
-
-  prefix       = "clst-dev"
-  zone         = "no-svg1"
-  node_plan    = "DEV-1xCPU-2GB"
-  node_count   = 2
-  network_cidr = "10.100.0.0/24"
-
-  tags = {
-    Environment = "dev"
-    ManagedBy   = "tofu"
-  }
-}

.tofu/platforms/upc/dev/outputs.tf

@@ -1,13 +0,0 @@
-# ─── Cluster ─────────────────────────────────────────────────────────
-
-output "cluster_id" {
-  value = module.cluster.cluster_id
-}
-
-output "cluster_name" {
-  value = module.cluster.cluster_name
-}
-
-output "zone" {
-  value = module.cluster.zone
-}

.tofu/platforms/upc/dev/providers.tf

@@ -1,14 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    upcloud = {
-      source  = "UpCloudLtd/upcloud"
-      version = "~> 5.0"
-    }
-  }
-}
-
-provider "upcloud" {
-  # Set via environment variables: UPCLOUD_USERNAME, UPCLOUD_PASSWORD
-}

.tofu/platforms/upc/modules/cluster/main.tf

@@ -1,56 +0,0 @@
-# Router for the private network
-resource "upcloud_router" "kubernetes" {
-  name = "${var.prefix}-${var.cluster_name}-router"
-}
-
-# Gateway for internet connectivity
-resource "upcloud_gateway" "kubernetes" {
-  name     = "${var.prefix}-${var.cluster_name}-gateway"
-  zone     = var.zone
-  features = ["nat"]
-  router {
-    id = upcloud_router.kubernetes.id
-  }
-}
-
-# Private network for the Kubernetes cluster
-resource "upcloud_network" "kubernetes" {
-  name   = "${var.prefix}-${var.cluster_name}-network"
-  zone   = var.zone
-  router = upcloud_router.kubernetes.id
-
-  ip_network {
-    address            = var.network_cidr
-    dhcp               = true
-    dhcp_default_route = true
-    family             = "IPv4"
-    gateway            = cidrhost(var.network_cidr, 1)
-  }
-
-  depends_on = [upcloud_gateway.kubernetes]
-}
-
-# Kubernetes cluster
-resource "upcloud_kubernetes_cluster" "main" {
-  name                    = "${var.prefix}-${var.cluster_name}"
-  zone                    = var.zone
-  network                 = upcloud_network.kubernetes.id
-  control_plane_ip_filter = var.control_plane_ip_filter
-
-  private_node_groups = true
-}
-
-# Node group for worker nodes
-resource "upcloud_kubernetes_node_group" "workers" {
-  cluster       = upcloud_kubernetes_cluster.main.id
-  name          = "${var.prefix}-${var.cluster_name}-workers"
-  node_count    = var.node_count
-  plan          = var.node_plan
-  anti_affinity = var.node_count > 1
-  labels = {
-    prefix  = var.prefix
-    cluster = var.cluster_name
-    role    = "worker"
-    env     = lookup(var.tags, "Environment", "dev")
-  }
-}

.tofu/platforms/upc/modules/cluster/outputs.tf

@@ -1,31 +0,0 @@
-# ─── Cluster ─────────────────────────────────────────────────────────
-
-output "cluster_id" {
-  description = "The ID of the Kubernetes cluster"
-  value       = upcloud_kubernetes_cluster.main.id
-}
-
-output "cluster_name" {
-  description = "The name of the Kubernetes cluster"
-  value       = upcloud_kubernetes_cluster.main.name
-}
-
-output "network_id" {
-  description = "The ID of the private network"
-  value       = upcloud_network.kubernetes.id
-}
-
-output "network_cidr" {
-  description = "The CIDR block of the private network"
-  value       = var.network_cidr
-}
-
-output "kubernetes_version" {
-  description = "The Kubernetes version of the cluster"
-  value       = upcloud_kubernetes_cluster.main.version
-}
-
-output "zone" {
-  description = "The zone where the cluster is deployed"
-  value       = var.zone
-}

.tofu/platforms/upc/modules/cluster/providers.tf

@@ -1,8 +0,0 @@
-terraform {
-  required_providers {
-    upcloud = {
-      source  = "UpCloudLtd/upcloud"
-      version = "~> 5.0"
-    }
-  }
-}

.tofu/platforms/upc/modules/cluster/variables.tf

@@ -1,44 +0,0 @@
-# ─── Cluster ─────────────────────────────────────────────────────────
-
-variable "prefix" {
-  description = "Prefix for resource names"
-  type        = string
-}
-
-variable "cluster_name" {
-  description = "Name of the Kubernetes cluster"
-  type        = string
-  default     = "main"
-}
-
-variable "zone" {
-  description = "UpCloud zone"
-  type        = string
-}
-
-variable "node_plan" {
-  description = "UpCloud server plan for worker nodes"
-  type        = string
-}
-
-variable "node_count" {
-  description = "Number of worker nodes"
-  type        = number
-}
-
-variable "network_cidr" {
-  description = "CIDR block for the private network"
-  type        = string
-  default     = "10.100.0.0/24"
-}
-
-variable "control_plane_ip_filter" {
-  description = "CIDRs allowed to access the K8s API"
-  type        = list(string)
-  default     = ["0.0.0.0/0"]
-}
-
-variable "tags" {
-  description = "Labels to apply to resources"
-  type        = map(string)
-}

.tofu/platforms/upc/prod/main.tf

@@ -1,16 +0,0 @@
-module "cluster" {
-  source = "../modules/cluster"
-
-  prefix       = "clst"
-  zone         = "de-fra1"
-  node_plan    = "4xCPU-8GB"
-  node_count   = 3
-  network_cidr = "10.100.0.0/24"
-
-  control_plane_ip_filter = ["0.0.0.0/0"] # TODO: restrict to known CIDRs
-
-  tags = {
-    Environment = "prod"
-    ManagedBy   = "tofu"
-  }
-}

.tofu/platforms/upc/prod/outputs.tf

@@ -1,13 +0,0 @@
-# ─── Cluster ─────────────────────────────────────────────────────────
-
-output "cluster_id" {
-  value = module.cluster.cluster_id
-}
-
-output "cluster_name" {
-  value = module.cluster.cluster_name
-}
-
-output "zone" {
-  value = module.cluster.zone
-}

.tofu/platforms/upc/prod/providers.tf

@@ -1,14 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    upcloud = {
-      source  = "UpCloudLtd/upcloud"
-      version = "~> 5.0"
-    }
-  }
-}
-
-provider "upcloud" {
-  # Set via environment variables: UPCLOUD_USERNAME, UPCLOUD_PASSWORD
-}

.tofu/platforms/upc/workload/main.tf

@@ -1,116 +0,0 @@
-# =============================================================================
-# UpCloud Workload Cluster
-# =============================================================================
-# A lean UCS cluster for running application workloads. No managed data
-# services — those live on the platform cluster. ArgoCD (on the platform
-# cluster) deploys apps to this cluster via the app-of-apps pattern.
-#
-# Platform components deployed by deploy-workload.sh:
-#   nginx-ingress, cert-manager, external-dns, external-secrets, alloy
-#
-# Usage:
-#   tofu init && tofu plan && tofu apply
-#   ./sync-tofu-outputs.sh --env upcloud-workload
-#   ./deploy-workload.sh --env upcloud-workload
-# =============================================================================
-
-variable "prefix" {
-  description = "Prefix for resource names"
-  type        = string
-  default     = "clst-workload"
-}
-
-variable "zone" {
-  description = "UpCloud zone"
-  type        = string
-  default     = "fi-hel1"
-}
-
-variable "node_plan" {
-  description = "UpCloud server plan for worker nodes"
-  type        = string
-  default     = "2xCPU-4GB"
-}
-
-variable "node_count" {
-  description = "Number of worker nodes"
-  type        = number
-  default     = 2
-}
-
-variable "network_cidr" {
-  description = "CIDR block for the private network"
-  type        = string
-  default     = "10.110.0.0/24"
-}
-
-variable "control_plane_ip_filter" {
-  description = "CIDRs allowed to access the K8s API"
-  type        = list(string)
-  default     = ["0.0.0.0/0"]
-}
-
-variable "tags" {
-  description = "Labels to apply to resources"
-  type        = map(string)
-  default = {
-    Environment = "workload"
-    ManagedBy   = "tofu"
-  }
-}
-
-# ─── Networking ───────────────────────────────────────────────────────
-
-resource "upcloud_router" "kubernetes" {
-  name = "${var.prefix}-workload-router"
-}
-
-resource "upcloud_gateway" "kubernetes" {
-  name     = "${var.prefix}-workload-gateway"
-  zone     = var.zone
-  features = ["nat"]
-  router {
-    id = upcloud_router.kubernetes.id
-  }
-}
-
-resource "upcloud_network" "kubernetes" {
-  name   = "${var.prefix}-workload-network"
-  zone   = var.zone
-  router = upcloud_router.kubernetes.id
-
-  ip_network {
-    address            = var.network_cidr
-    dhcp               = true
-    dhcp_default_route = true
-    family             = "IPv4"
-    gateway            = cidrhost(var.network_cidr, 1)
-  }
-
-  depends_on = [upcloud_gateway.kubernetes]
-}
-
-# ─── Kubernetes Cluster ───────────────────────────────────────────────
-
-resource "upcloud_kubernetes_cluster" "main" {
-  name                    = "${var.prefix}-workload"
-  zone                    = var.zone
-  network                 = upcloud_network.kubernetes.id
-  control_plane_ip_filter = var.control_plane_ip_filter
-
-  private_node_groups = true
-}
-
-resource "upcloud_kubernetes_node_group" "workers" {
-  cluster       = upcloud_kubernetes_cluster.main.id
-  name          = "${var.prefix}-workload-workers"
-  node_count    = var.node_count
-  plan          = var.node_plan
-  anti_affinity = var.node_count > 1
-  labels = {
-    prefix  = var.prefix
-    cluster = "workload"
-    role    = "worker"
-    env     = lookup(var.tags, "Environment", "workload")
-  }
-}

.tofu/platforms/upc/workload/outputs.tf

@@ -1,3 +0,0 @@
-output "cluster_name" { value = upcloud_kubernetes_cluster.main.name }
-output "cluster_id"   { value = upcloud_kubernetes_cluster.main.id }
-output "zone"         { value = var.zone }

.tofu/platforms/upc/workload/providers.tf

@@ -1,14 +0,0 @@
-terraform {
-  required_version = ">= 1.0"
-
-  required_providers {
-    upcloud = {
-      source  = "UpCloudLtd/upcloud"
-      version = "~> 5.0"
-    }
-  }
-}
-
-provider "upcloud" {
-  # Set via environment variables: UPCLOUD_USERNAME, UPCLOUD_PASSWORD
-}

.tofu/scripts/get-kubeconfig.sh

@@ -1,66 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-TOFU_ROOT="$(dirname "$SCRIPT_DIR")"
-PROJECT_ROOT="$(dirname "$TOFU_ROOT")"
-
-CLUSTER="${1:?Usage: $0 <cluster> (e.g., aks-dev, eks-prod)}"
-PLATFORM="${CLUSTER%%-*}"
-ENV="${CLUSTER#*-}"
-
-KUBECONFIG_FILE="$PROJECT_ROOT/private/$CLUSTER/kubeconfig"
-
-if [[ -f "$KUBECONFIG_FILE" ]]; then
-  echo "Kubeconfig already exists: $KUBECONFIG_FILE"
-  echo ""
-  echo "  export KUBECONFIG=$KUBECONFIG_FILE"
-else
-  echo "No cached kubeconfig. Fetching from platform..."
-
-  # Load platform credentials
-  ENV_FILE="$TOFU_ROOT/configs/$PLATFORM.env"
-  if [[ -f "$ENV_FILE" ]]; then
-    set -a; source "$ENV_FILE"; set +a
-  fi
-
-  TOFU_DIR="$TOFU_ROOT/platforms/$PLATFORM/$ENV"
-  mkdir -p "$(dirname "$KUBECONFIG_FILE")"
-
-  case "$PLATFORM" in
-    aks)
-      cd "$TOFU_DIR"
-      RG=$(tofu output -raw resource_group_name 2>/dev/null || echo "$CLUSTER-rg")
-      NAME=$(tofu output -raw cluster_name 2>/dev/null || echo "$CLUSTER")
-      az aks get-credentials --resource-group "$RG" --name "$NAME" --file "$KUBECONFIG_FILE" --overwrite-existing
-      ;;
-    eks)
-      cd "$TOFU_DIR"
-      NAME=$(tofu output -raw cluster_name 2>/dev/null || echo "$CLUSTER")
-      REGION=$(tofu output -raw aws_region 2>/dev/null || echo "${AWS_REGION:-eu-west-1}")
-      aws eks update-kubeconfig --name "$NAME" --region "$REGION" --kubeconfig "$KUBECONFIG_FILE"
-      ;;
-    gke)
-      cd "$TOFU_DIR"
-      NAME=$(tofu output -raw cluster_name 2>/dev/null || echo "$CLUSTER")
-      REGION=$(tofu output -raw region 2>/dev/null || echo "${GCP_REGION:-europe-west4}")
-      PROJECT=$(tofu output -raw project_id 2>/dev/null || echo "${GCP_PROJECT_ID:-}")
-      gcloud container clusters get-credentials "$NAME" --region "$REGION" --project "$PROJECT"
-      cp ~/.kube/config "$KUBECONFIG_FILE"
-      ;;
-    upc)
-      cd "$TOFU_DIR"
-      CLUSTER_ID=$(tofu output -raw cluster_id 2>/dev/null || echo "${UPCLOUD_CLUSTER_ID:-}")
-      upctl kubernetes config "$CLUSTER_ID" > "$KUBECONFIG_FILE"
-      ;;
-    *)
-      echo "Error: unknown platform '$PLATFORM'"
-      exit 1
-      ;;
-  esac
-
-  chmod 600 "$KUBECONFIG_FILE"
-  echo "Kubeconfig saved: $KUBECONFIG_FILE"
-  echo ""
-  echo "  export KUBECONFIG=$KUBECONFIG_FILE"
-fi

.tofu/scripts/setup-cluster.sh

@@ -1,246 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-TOFU_ROOT="$(dirname "$SCRIPT_DIR")"
-PROJECT_ROOT="$(dirname "$TOFU_ROOT")"
-
-# ─── Usage ────────────────────────────────────────────────────────────
-usage() {
-  cat <<EOF
-Usage: $0 <cluster> [options]
-
-  Provision a Kubernetes cluster using OpenTofu.
-  Mirrors bootstrap.sh convention: cluster = <platform>-<env>
-
-  Clusters:   aks-dev | aks-prod | eks-dev | eks-prod
-              gke-dev | gke-prod | upc-dev | upc-prod
-              <platform>-workload (for workload clusters)
-
-  Options:
-    --plan        Plan only, don't apply
-    --destroy     Destroy the cluster (use teardown-cluster.sh instead)
-    --auto        Skip confirmation prompts
-    -h, --help    Show this help
-
-  Examples:
-    $0 aks-dev
-    $0 eks-prod --plan
-    $0 upc-dev --auto
-
-  Prerequisites:
-    - tofu, kubectl, helm installed
-    - Platform credentials in .tofu/configs/<platform>.env
-    - Cluster config in clusters/<cluster>.yaml
-
-  After provisioning, run:
-    ./bootstrap.sh <cluster>
-EOF
-  exit "${1:-0}"
-}
-
-# ─── Parse arguments ──────────────────────────────────────────────────
-CLUSTER=""
-PLAN_ONLY=false
-DESTROY=false
-AUTO_APPROVE=false
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --plan)       PLAN_ONLY=true; shift ;;
-    --destroy)    DESTROY=true; shift ;;
-    --auto)       AUTO_APPROVE=true; shift ;;
-    -h|--help)    usage 0 ;;
-    -*)           echo "Unknown option: $1"; usage 1 ;;
-    *)
-      if [[ -z "$CLUSTER" ]]; then
-        CLUSTER="$1"
-      else
-        echo "Error: unexpected argument '$1'"
-        usage 1
-      fi
-      shift
-      ;;
-  esac
-done
-
-[[ -z "$CLUSTER" ]] && { echo "Error: <cluster> argument required"; usage 1; }
-
-# ─── Map cluster → platform + env ────────────────────────────────────
-PLATFORM="${CLUSTER%%-*}"   # aks-dev → aks
-ENV="${CLUSTER#*-}"         # aks-dev → dev
-
-case "$PLATFORM" in
-  aks|eks|gke|upc) ;;
-  *) echo "Error: unknown platform '$PLATFORM'. Expected: aks, eks, gke, upc"; exit 1 ;;
-esac
-
-TOFU_DIR="$TOFU_ROOT/platforms/$PLATFORM/$ENV"
-if [[ ! -d "$TOFU_DIR" ]]; then
-  echo "Error: tofu directory not found: $TOFU_DIR"
-  echo "Available environments for $PLATFORM:"
-  ls -1 "$TOFU_ROOT/platforms/$PLATFORM/" 2>/dev/null | grep -v modules || echo "  (none)"
-  exit 1
-fi
-
-echo "========================================="
-echo "  Kubernetes Cluster Setup"
-echo "========================================="
-echo ""
-echo "  Cluster:   $CLUSTER"
-echo "  Platform:  $PLATFORM"
-echo "  Env:       $ENV"
-echo "  Tofu dir:  $TOFU_DIR"
-echo ""
-
-# ─── Prerequisites ────────────────────────────────────────────────────
-echo "=== Checking Prerequisites ==="
-command -v tofu    >/dev/null 2>&1 || { echo "Error: tofu is not installed."; exit 1; }
-command -v kubectl >/dev/null 2>&1 || { echo "Error: kubectl is not installed."; exit 1; }
-command -v helm    >/dev/null 2>&1 || { echo "Error: helm is not installed."; exit 1; }
-echo "  tofu, kubectl, helm: OK"
-
-# ─── Load platform credentials ────────────────────────────────────────
-ENV_FILE="$TOFU_ROOT/configs/$PLATFORM.env"
-if [[ -f "$ENV_FILE" ]]; then
-  echo "  Loading credentials from configs/$PLATFORM.env"
-  set -a
-  # shellcheck disable=SC1090
-  source "$ENV_FILE"
-  set +a
-else
-  echo "  Warning: $ENV_FILE not found — using existing environment/CLI auth"
-  echo "  Copy configs/$PLATFORM.env.example → configs/$PLATFORM.env to configure"
-fi
-
-# ─── Load cluster config (if exists) ──────────────────────────────────
-CLUSTER_CONFIG="$PROJECT_ROOT/clusters/$CLUSTER.yaml"
-if [[ -f "$CLUSTER_CONFIG" ]]; then
-  echo "  Loading cluster config from clusters/$CLUSTER.yaml"
-  if command -v yq >/dev/null 2>&1; then
-    eval "$(yq -r 'to_entries[] | "export CLUSTER_\(.key)=\"\(.value)\""' "$CLUSTER_CONFIG")"
-    echo "  Cluster name: ${CLUSTER_clusterName:-$CLUSTER}"
-  else
-    echo "  Warning: yq not installed — cluster config not loaded"
-  fi
-else
-  echo "  Warning: $CLUSTER_CONFIG not found — using defaults"
-fi
-echo ""
-
-# ─── Run OpenTofu ─────────────────────────────────────────────────────
-cd "$TOFU_DIR"
-
-echo "=== Initializing OpenTofu ==="
-tofu init
-
-echo ""
-if $DESTROY; then
-  echo "=== Planning Destruction ==="
-  tofu plan -destroy -out=tfplan
-
-  if ! $AUTO_APPROVE; then
-    echo ""
-    read -rp "DESTROY cluster $CLUSTER? This is irreversible. (yes/no) " REPLY
-    [[ "$REPLY" == "yes" ]] || { echo "Cancelled."; exit 1; }
-  fi
-
-  echo "Destroying infrastructure..."
-  tofu apply tfplan
-  echo ""
-  echo "=== Cluster $CLUSTER Destroyed ==="
-
-elif $PLAN_ONLY; then
-  echo "=== Planning Infrastructure ==="
-  tofu plan
-  echo ""
-  echo "=== Plan complete (--plan mode, no changes applied) ==="
-
-else
-  echo "=== Planning Infrastructure ==="
-  tofu plan -out=tfplan
-
-  if ! $AUTO_APPROVE; then
-    echo ""
-    read -rp "Apply this plan for $CLUSTER? (y/n) " -n 1 REPLY
-    echo
-    [[ "$REPLY" =~ ^[Yy]$ ]] || { echo "Cancelled."; exit 1; }
-  fi
-
-  echo "Applying infrastructure..."
-  tofu apply tfplan
-
-  # ─── Save kubeconfig ──────────────────────────────────────────────
-  KUBECONFIG_DIR="$PROJECT_ROOT/private/$CLUSTER"
-  mkdir -p "$KUBECONFIG_DIR"
-  KUBECONFIG_FILE="$KUBECONFIG_DIR/kubeconfig"
-
-  echo ""
-  echo "=== Saving Kubeconfig ==="
-
-  case "$PLATFORM" in
-    aks)
-      if tofu output -raw kubeconfig > "$KUBECONFIG_FILE" 2>/dev/null; then
-        echo "  Saved from tofu output"
-      else
-        echo "  Fetching from Azure CLI..."
-        RG=$(tofu output -raw resource_group_name 2>/dev/null || echo "${CLUSTER_clusterName:-$CLUSTER}-rg")
-        NAME=$(tofu output -raw cluster_name 2>/dev/null || echo "${CLUSTER_clusterName:-$CLUSTER}")
-        az aks get-credentials --resource-group "$RG" --name "$NAME" --file "$KUBECONFIG_FILE" --overwrite-existing
-      fi
-      ;;
-    eks)
-      NAME=$(tofu output -raw cluster_name 2>/dev/null || echo "${CLUSTER_clusterName:-$CLUSTER}")
-      REGION=$(tofu output -raw aws_region 2>/dev/null || echo "${AWS_REGION:-eu-west-1}")
-      aws eks update-kubeconfig --name "$NAME" --region "$REGION" --kubeconfig "$KUBECONFIG_FILE"
-      ;;
-    gke)
-      NAME=$(tofu output -raw cluster_name 2>/dev/null || echo "${CLUSTER_clusterName:-$CLUSTER}")
-      REGION=$(tofu output -raw region 2>/dev/null || echo "${GCP_REGION:-europe-west4}")
-      PROJECT=$(tofu output -raw project_id 2>/dev/null || echo "${GCP_PROJECT_ID:-}")
-      gcloud container clusters get-credentials "$NAME" --region "$REGION" --project "$PROJECT" 2>/dev/null \
-        && cp ~/.kube/config "$KUBECONFIG_FILE" \
-        || echo "  Warning: could not fetch kubeconfig via gcloud"
-      ;;
-    upc)
-      if tofu output -raw kubeconfig > "$KUBECONFIG_FILE" 2>/dev/null; then
-        echo "  Saved from tofu output"
-      else
-        CLUSTER_ID=$(tofu output -raw cluster_id 2>/dev/null || echo "${UPCLOUD_CLUSTER_ID:-}")
-        if [[ -n "$CLUSTER_ID" ]]; then
-          upctl kubernetes config "$CLUSTER_ID" > "$KUBECONFIG_FILE"
-        else
-          echo "  Warning: could not determine cluster ID for kubeconfig"
-        fi
-      fi
-      ;;
-  esac
-
-  if [[ -f "$KUBECONFIG_FILE" ]]; then
-    chmod 600 "$KUBECONFIG_FILE"
-    echo "  Kubeconfig: $KUBECONFIG_FILE"
-  fi
-
-  # ─── Wait for nodes ──────────────────────────────────────────────
-  echo ""
-  echo "=== Waiting for Cluster Nodes ==="
-  export KUBECONFIG="$KUBECONFIG_FILE"
-  if kubectl wait --for=condition=Ready nodes --all --timeout=300s 2>/dev/null; then
-    echo "  All nodes ready"
-  else
-    echo "  Warning: nodes not ready within timeout — check cluster status"
-  fi
-
-  # ─── Summary ─────────────────────────────────────────────────────
-  echo ""
-  echo "========================================="
-  echo "  Cluster $CLUSTER Provisioned"
-  echo "========================================="
-  echo ""
-  echo "  Kubeconfig: $KUBECONFIG_FILE"
-  echo ""
-  echo "  Next steps:"
-  echo "    export KUBECONFIG=$KUBECONFIG_FILE"
-  echo "    ./bootstrap.sh $CLUSTER"
-  echo ""
-fi

.tofu/scripts/teardown-cluster.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# Delegate to setup-cluster.sh with --destroy flag
-exec "$SCRIPT_DIR/setup-cluster.sh" "$@" --destroy

README.md

@@ -80,23 +80,8 @@ This repository contains the complete GitOps configuration for our Kubernetes cl
 
 ```
 .
-├── bootstrap.sh                # Cluster initialization (ArgoCD + GitOps)
+├── bootstrap.sh                # Cluster initialization script
-├── _app-of-apps-{cluster}.yaml # Root ArgoCD Application (per cluster)
+├── _app-of-apps.yaml          # Root ArgoCD Application (App-of-Apps pattern)
-│
-├── .tofu/                     # Infrastructure provisioning (OpenTofu)
-│   ├── platforms/             # Per-platform IaC (one dir per cloud)
-│   │   ├── aks/               # Azure AKS (modules/ + dev/ + prod/ + workload/)
-│   │   ├── eks/               # AWS EKS
-│   │   ├── gke/               # GCP GKE
-│   │   └── upc/               # UpCloud
-│   ├── configs/               # Platform credentials (git-ignored)
-│   │   └── *.env.example      # Template for each platform
-│   └── scripts/               # Cluster lifecycle scripts
-│       ├── setup-cluster.sh   # Create cluster: ./setup-cluster.sh aks-dev
-│       ├── teardown-cluster.sh
-│       └── get-kubeconfig.sh
-│
-├── clusters/                  # Cluster metadata (domain, trustedIPs, etc.)
 │
 ├── infra/                     # Infrastructure ArgoCD Applications (Kustomize multi-cluster)
 │   ├── base/                  # Base ArgoCD Application manifests (one dir per component)

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

@@ -1,33 +1,34 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: vaultwarden
----
-
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: vaultwarden-postgresql
+  name: feedback
   namespace: argocd
   annotations:
-    argocd.argoproj.io/sync-wave: "0"
+    argocd.argoproj.io/sync-wave: "12"
   labels:
-    app.kubernetes.io/name: vaultwarden-postgresql
+    app.kubernetes.io/name: feedback
-    app.kubernetes.io/part-of: security
+    app.kubernetes.io/part-of: apps
     app.kubernetes.io/managed-by: argocd
   finalizers:
   - resources-finalizer.argocd.argoproj.io
 spec:
   project: default
 
-  source:
+  sources:
-    repoURL: ssh://git@git.forteapps.net:2222/Forte/launchpad.git
+  - repoURL: ssh://git@git.forteapps.net:2222/Forte/forte-helm.git
+    path: forteapp
     targetRevision: HEAD
-    path: infra/overlays/upc-dev/vaultwarden-postgresql/resources
+    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: vaultwarden
+    namespace: feedback
 
   syncPolicy:
     automated:
@@ -38,6 +39,12 @@ spec:
     - CreateNamespace=true
     - Validate=true
     - ServerSideApply=true
+    retry:
+      limit: 5
+      backoff:
+        duration: 5s
+        factor: 2
+        maxDuration: 3m
 
   ignoreDifferences:
   - group: apps

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

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

apps/overlays/upc-dev/kustomization.yaml

@@ -3,6 +3,7 @@ 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/azuredns-config-sealed.yaml

@@ -1,15 +0,0 @@
----
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: azuredns-config
-  namespace: cert-manager
-spec:
-  encryptedData:
-    client-secret: AgBPCix6yTt8gXV2pMfRx6weWtLWUeMa/cBwuaDBZkqZE4CTSDxjQWWK8ul5OtndlEX7+gXV2HpuAmHRhGC8P1z39yWRxIDbKf+AH4JOGSIfu57tnrGvzAwjanKtqeFCEM67Y42Kz1rahCEtdwJj2YIL9oVdCtRPkpAJrAJclqmrCvJZtqQYcDeEn5ONK5Gchxc6x2/J0U0LTjLz/MP74CEKw3CiZ+9VKA4ppvPqjqoE4yyAXSglSnhYTqtMZpFg5sr+at6rAB1ufmtiS70Vfks46OL0/ZJjdS6h5wjIZhl/1DgIFXqc1yoAjuEoMRzMeW9ji1PnjRqas4lU19tuEOf9/Eq65BYOqSIqJ3saG4I/+z013coCGCalo4ghuufmu5pcsi6ywcszz+g20N/PZcVcLbzZbMnKcXsaE007MDLxGY1QD89aribAvsypDUNEuNh7w2n/OAyQdw+nRDGIi8Oz3FoJUmC0HBxin2hstuBnrAXtxdqRX1NU25HfR2s3qt/yQ33TFx4xHA3NAll8Riyg2rvgqAKo9x9rmlcnzML011vlNu5oLKAuCqJlH8W/Nnnh6LNcZJy8Cj+fqXPeWHS4Qk7nEAbYJN9/sNAUg/VzsP0yYejPfjwzoDDaPLvTHROwv9nZ+Lr/U5epHr231jc5+i3x8dLuBtg+aa5PHoS/Ml1a4811w3Bxj3u36q8UPJGnszQXLKCpucynVVstAj4ufhXhhNXJdK/U31Zrc6j3Skw4zgF8Ddv0
-  template:
-    metadata:
-      creationTimestamp: null
-      name: azuredns-config
-      namespace: cert-manager

cluster-resources/letsencrypt-issuer.yaml

@@ -12,24 +12,10 @@ spec:
     privateKeySecretRef:
       name: letsencrypt-staging-key
     solvers:
-    - dns01:
-        azureDNS:
-          subscriptionID: 1b52bc03-6815-4574-b579-60745dce544d
-          resourceGroupName: forteapps-domain
-          hostedZoneName: forteapps.net
-          environment: AzurePublicCloud
-          clientID: 3b7a4ebf-894c-4f5d-9b1e-2b61312f8e74
-          clientSecretSecretRef:
-            name: azuredns-config
-            key: client-secret
-      selector:
-        dnsNames:
-        - '*.forteapps.net'
-        - 'forteapps.net'
-    # HTTP-01 fallback for non-wildcard certificates
     - http01:
         ingress:
           class: traefik
+
 ---
 # Production ClusterIssuer for browser-trusted certificates
 apiVersion: cert-manager.io/v1
@@ -44,146 +30,6 @@ spec:
     privateKeySecretRef:
       name: letsencrypt-prod-key
     solvers:
-    # DNS-01 solver for wildcard certificates (*.forteapps.net)
-    - dns01:
-        azureDNS:
-          subscriptionID: 1b52bc03-6815-4574-b579-60745dce544d
-          resourceGroupName: forteapps-domain
-          hostedZoneName: forteapps.net
-          environment: AzurePublicCloud
-          clientID: 3b7a4ebf-894c-4f5d-9b1e-2b61312f8e74
-          clientSecretSecretRef:
-            name: azuredns-config
-            key: client-secret
-      selector:
-        dnsNames:
-        - '*.forteapps.net'
-        - 'forteapps.net'
-    # HTTP-01 fallback for non-wildcard certificates
     - http01:
         ingress:
           class: traefik
-
-# =============================================================================
-# CONFIGURATION INSTRUCTIONS FOR AZURE DNS WITH WILDCARD CERTIFICATES
-# =============================================================================
-#
-# PREREQUISITES IN AZURE DNS PORTAL:
-# ----------------------------------
-# 1. Ensure you have an Azure DNS Zone for "forteapps.net" created in your
-#    Azure subscription. If not, create it in Azure Portal:
-#    - Search for "DNS zones" → Create → Zone name: forteapps.net
-#    - Note the Resource Group where you create it (e.g., "dns-zones-rg")
-#
-# 2. Configure NS records at your domain registrar to point to Azure DNS:
-#    - In Azure Portal → DNS zones → forteapps.net
-#    - Note the 4 NS records shown (e.g., ns1-04.azure-dns.com, etc.)
-#    - Go to your domain registrar and update the NS records to these values
-#
-# AUTHENTICATION (Service Principal - Required for UpCloud/non-Azure clusters):
-# ----------------------------------------------------------------------------
-# Since your cluster runs on UpCloud (not AKS), you must use Service Principal
-# authentication. Managed Identity only works with Azure-hosted resources.
-#
-# =============================================================================
-# SETUP: Service Principal for UpCloud Clusters
-# =============================================================================
-#
-# 1. Create Azure AD App Registration:
-#    az ad sp create-for-rbac --name cert-manager-dns --sdk-auth
-#    # Save the JSON output - you'll need appId (clientID) and password (clientSecret)
-#
-# 2. Assign DNS Zone Contributor role:
-#    az role assignment create \
-#      --role "DNS Zone Contributor" \
-#      --assignee <SERVICE_PRINCIPAL_CLIENT_ID> \
-#      --scope /subscriptions/<SUBSCRIPTION_ID>/resourceGroups/<DNS_RESOURCE_GROUP>/providers/Microsoft.Network/dnszones/forteapps.net
-#
-# 3. Create Kubernetes secret for the service principal:
-#    kubectl create secret generic azuredns-config \
-#      --namespace cert-manager \
-#      --from-literal=client-secret=YOUR_CLIENT_SECRET
-#
-# 4. Update the ClusterIssuer above with:
-#    - subscriptionID: Your Azure subscription ID
-#    - resourceGroupName: The resource group containing your DNS zone
-#    - clientID: The Service Principal appId/clientID
-#    - clientSecretSecretRef: References the secret created in step 3
-#
-# =============================================================================
-# ALTERNATIVE DNS PROVIDERS (for reference):
-# =============================================================================
-
-# -----------------------------------------------------------------------------
-# Cloudflare (original configuration)
-# -----------------------------------------------------------------------------
-# Create secret with: kubectl create secret generic cloudflare-api-token-secret \
-#   --from-literal=api-token=YOUR_CLOUDFLARE_API_TOKEN -n cert-manager
-#
-# dns01:
-#   cloudflare:
-#     email: your-cloudflare-email@example.com
-#     apiTokenSecretRef:
-#       name: cloudflare-api-token-secret
-#       key: api-token
-
-# -----------------------------------------------------------------------------
-# AWS Route53
-# -----------------------------------------------------------------------------
-# Create secret with: kubectl create secret generic route53-credentials \
-#   --from-literal=secret-access-key=YOUR_SECRET_KEY -n cert-manager
-#
-# dns01:
-#   route53:
-#     region: us-east-1
-#     hostedZoneID: ZXXXXXXXXXXXXX
-#     accessKeyID: YOUR_ACCESS_KEY_ID
-#     secretAccessKeySecretRef:
-#       name: route53-credentials
-#       key: secret-access-key
-
-# -----------------------------------------------------------------------------
-# Google Cloud DNS
-# -----------------------------------------------------------------------------
-# Create secret with service account JSON key:
-# kubectl create secret generic clouddns-service-account \
-#   --from-file=service-account.json=path/to/key.json -n cert-manager
-#
-# dns01:
-#   cloudDNS:
-#     project: YOUR_GCP_PROJECT_ID
-#     hostedZoneName: example-com
-#     serviceAccountSecretRef:
-#       name: clouddns-service-account
-#       key: service-account.json
-
-# -----------------------------------------------------------------------------
-# GoDaddy
-# -----------------------------------------------------------------------------
-# Requires external webhook: https://github.com/snowdrop/godaddy-webhook
-#
-# dns01:
-#   webhook:
-#     groupName: acme.yourcompany.com
-#     solverName: godaddy
-#     config:
-#       apiKeySecretRef:
-#         name: godaddy-api-credentials
-#         key: api-key
-#       apiSecretSecretRef:
-#         name: godaddy-api-credentials
-#         key: api-secret
-
-# -----------------------------------------------------------------------------
-# Manual/Dynamic DNS (for homelab)
-# -----------------------------------------------------------------------------
-# Requires RFC2136 provider or external webhook
-#
-# dns01:
-#   rfc2136:
-#     nameserver: your-dns-server.example.com
-#     tsigKeyName: cert-manager-key
-#     tsigAlgorithm: HMACSHA256
-#     tsigSecretSecretRef:
-#       name: tsig-secret
-#       key: secret

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

@@ -245,6 +245,12 @@ 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
@@ -324,6 +330,8 @@ 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/policies/label-checker.yaml

@@ -0,0 +1,40 @@
+apiVersion: kyverno.io/v1
+kind: ClusterPolicy
+metadata:
+  name: require-labels
+  annotations:
+    policies.kyverno.io/title: Require Labels
+    policies.kyverno.io/category: Best Practices
+    policies.kyverno.io/minversion: 1.6.0
+    policies.kyverno.io/severity: medium
+    policies.kyverno.io/subject: Pod, Label
+    policies.kyverno.io/description: Define and use labels that identify semantic attributes of your application or Deployment. A common set of labels allows tools to work collaboratively, describing objects in a common manner that all tools can understand. The recommended labels describe applications in a way that can be queried. This policy validates that the label `app.kubernetes.io/name` is specified with some value.
+spec:
+  validationFailureAction: Audit
+  background: true
+  rules:
+  - name: check-for-labels
+    skipBackgroundRequests: true
+    exclude:
+      any:
+      - resources:
+          namespaces:
+          - kube-system
+          - istio-system
+          - argocd
+          - cert-manager
+          - monitoring
+          - secrets
+          - kyverno
+    match:
+      any:
+      - resources:
+          kinds:
+          - Pod
+    validate:
+      message: The label `app.kubernetes.io/name` is required.
+      allowExistingViolations: true
+      pattern:
+        metadata:
+          labels:
+            app.kubernetes.io/name: "?*"

devbox.json

@@ -17,9 +17,7 @@
     "claude-code@latest",
     "go@latest",
     "dotnet-sdk@latest",
-    "opentofu@1.11.6",
+    "opentofu@1.11.6"
-    "_1password@latest",
-    "github-cli@latest"
   ],
   "shell": {
     "init_hook": [

docs/DEVELOPER-GUIDE.md

@@ -1336,34 +1336,16 @@ stringData:
 
 | Field | Required | Description |
 |-------|----------|-------------|
-| `clientId` | Yes | Keycloak client ID (must be unique in realm) |
+| `clientId` | Yes | Keycloak client ID |
-| `name` | Yes | Display name in Keycloak UI |
+| `name` | Yes | Display name in Keycloak |
-| `redirectUris` | Yes | Allowed OAuth redirect URLs (supports wildcards like `/*`) |
+| `redirectUris` | Yes | Allowed redirect URIs |
-| `webOrigins` | Yes | Allowed CORS origins |
+| `webOrigins` | Yes | Allowed web origins (CORS) |
-| `defaultClientScopes` | No | OIDC scopes (default: `["openid", "email", "profile"]`) |
+| `defaultClientScopes` | No | Scopes (default: `["openid", "email", "profile"]`) |
-| `protocolMappers` | No | Custom claim mappers for tokens (see examples below) |
+| `protocolMappers` | No | Custom claim mappers (default: `[]`) |
-| `secret.namespace` | No | Target namespace for credentials (default: `source-namespace` annotation value) |
+| `secret.namespace` | No | Namespace for the credential Secret (default: source namespace) |
-| `secret.name` | No | Credential Secret name (default: `<clientId>-oidc-credentials`) |
+| `secret.name` | No | Name of the credential Secret (default: `<clientId>-oidc-credentials`) |
-| `secret.keys.clientId` | No | Key name for client ID (default: `client-id`) |
+| `secret.keys.clientId` | No | Key name for client ID in credential Secret (default: `client-id`) |
-| `secret.keys.clientSecret` | No | Key name for client secret (default: `client-secret`) |
+| `secret.keys.clientSecret` | No | Key name for client secret in credential Secret (default: `client-secret`) |
-
-**Protocol Mappers Example**:
-```json
-"protocolMappers": [
-  {
-    "name": "groups",
-    "protocol": "openid-connect",
-    "protocolMapper": "oidc-group-membership-mapper",
-    "config": {
-      "claim.name": "groups",
-      "full.path": "false",
-      "id.token.claim": "true",
-      "access.token.claim": "true",
-      "userinfo.token.claim": "true"
-    }
-  }
-]
-```
 
 #### Step 2: Reference the Credential Secret
 

docs/GITOPS-ARCHITECTURE.md

@@ -115,30 +115,9 @@ This Kubernetes cluster uses a **GitOps approach** powered by **ArgoCD**, where
 
 ```
 launchpad/
-├── bootstrap.sh                      # Cluster initialization (ArgoCD + GitOps)
+├── bootstrap.sh                      # Cluster initialization script
-├── _app-of-apps-{cluster}.yaml      # Root ArgoCD Application (per cluster)
+├── _app-of-apps-upc-dev.yaml        # Root ArgoCD Application (upc-dev cluster)
-│
+├── _app-of-apps-upc-prod.yaml       # Root ArgoCD Application (upc-prod cluster)
-├── .tofu/                            # Infrastructure provisioning (OpenTofu)
-│   ├── platforms/                    # Per-platform IaC
-│   │   ├── aks/                      # Azure AKS
-│   │   │   ├── modules/cluster/     # Reusable AKS module
-│   │   │   ├── dev/                 # tofu root for aks-dev
-│   │   │   ├── prod/                # tofu root for aks-prod
-│   │   │   └── workload/            # workload cluster (no data services)
-│   │   ├── eks/                      # AWS EKS (same structure)
-│   │   ├── gke/                      # GCP GKE
-│   │   └── upc/                      # UpCloud
-│   ├── configs/                      # Platform credentials (git-ignored)
-│   │   └── {platform}.env.example   # Template per platform
-│   └── scripts/
-│       ├── setup-cluster.sh          # ./setup-cluster.sh <cluster> [--plan|--auto]
-│       ├── teardown-cluster.sh       # ./teardown-cluster.sh <cluster>
-│       └── get-kubeconfig.sh         # ./get-kubeconfig.sh <cluster>
-│
-├── clusters/                         # Cluster metadata YAML (domain, IPs, etc.)
-│   ├── aks-dev.yaml
-│   ├── upc-dev.yaml
-│   └── ...
 │
 ├── infra/                            # Infrastructure ArgoCD Applications (Kustomize)
 │   ├── base/                         # Base Application manifests (one dir per component)

docs/REFERENCE.md

@@ -72,22 +72,9 @@ Internet
 
 ```
 launchpad/
-├── bootstrap.sh                   # Cluster initialization (ArgoCD + GitOps)
+├── bootstrap.sh                   # Cluster initialization script
-├── _app-of-apps-{cluster}.yaml   # Root ArgoCD Application (per cluster)
+├── _app-of-apps-upc-dev.yaml     # Root ArgoCD Application (upc-dev)
-│
+├── _app-of-apps-upc-prod.yaml    # Root ArgoCD Application (upc-prod)
-├── .tofu/                         # Infrastructure provisioning (OpenTofu)
-│   ├── platforms/                 # Per-platform IaC
-│   │   ├── aks/                   # Azure: modules/cluster/, dev/, prod/, workload/
-│   │   ├── eks/                   # AWS: same structure
-│   │   ├── gke/                   # GCP
-│   │   └── upc/                   # UpCloud
-│   ├── configs/                   # Platform credentials (git-ignored)
-│   └── scripts/                   # setup-cluster.sh, teardown-cluster.sh, get-kubeconfig.sh
-│
-├── clusters/                      # Cluster metadata YAML
-│   ├── aks-dev.yaml
-│   ├── upc-dev.yaml
-│   └── ...
 │
 ├── infra/                         # Infrastructure applications (Kustomize)
 │   ├── base/                      # One subdirectory per component
@@ -1076,52 +1063,6 @@ 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://bitwarden.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
-  host: vaultwarden-postgresql  # StatefulSet in overlay
-  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).
-
-**SSO**: Keycloak OIDC via `forte` realm (client ID: `vaultwarden`). Self-service client config Secret (`keycloak-client-vaultwarden`) triggers registrar to create KC client and sync credentials to `vaultwarden-oidc-credentials`. PKCE enabled.
-
-**Endpoints**:
-- Web UI: `https://bitwarden.forteapps.net`
-
-**Database**: Separate ArgoCD Application `vaultwarden-postgresql` (sync-wave `"0"`) deploys PostgreSQL 16 StatefulSet + SealedSecret before Vaultwarden (wave `"1"`). 2Gi PVC. Chart does NOT include a PostgreSQL subchart — must be provisioned separately.
-
-**Secrets**:
-- `prod-db-creds` (SealedSecret) — PostgreSQL credentials (`pgusername`, `pgpassword`) + SMTP credentials
-- `vaultwarden-oidc-credentials` (registrar-managed) — OIDC client ID + secret
-- `vaultwarden-tls` — auto-managed by cert-manager
-
 ### AI Code Review (ai-review)
 
 **Type**: Gitea Actions workflow (`.gitea/workflows/ai-review.yaml`)
@@ -1200,30 +1141,6 @@ 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`)
@@ -1255,18 +1172,9 @@ The realm uses a custom browser authentication flow (`browser-auto-idp`) that sk
 
 **Resources**:
 - `ServiceAccount`: `keycloak-client-registrar` (namespace: `keycloak`)
-- `ClusterRole`: `keycloak-client-registrar` 
+- `ClusterRole`: `keycloak-client-registrar` (secrets: get/list/create/update/patch; namespaces: get/list)
-  - Secrets: `get`, `list`, `create`, `update`, `patch`
-  - Namespaces: `get`, `list`
 - `ClusterRoleBinding`: `keycloak-client-registrar`
 - `CronJob`: `keycloak-client-registrar`
-  - **Schedule**: `*/2 * * * *` (every 2 minutes)
-  - **Concurrency Policy**: `Forbid` (prevents concurrent runs)
-  - **Backoff Limit**: 3 retries per job
-  - **History**: 1 successful job, 3 failed jobs retained
-  - **Resources**: 50m CPU / 64Mi memory (requests), 200m CPU / 128Mi memory (limits)
-
-**Container**: Alpine 3.20 with `curl` and `jq` installed
 
 **Kyverno Policy**: `keycloak-client-config-cloner` — clones labeled Secrets from app namespaces to `keycloak` namespace (see [Kyverno Policies](#kyverno-policies))
 
@@ -1476,6 +1384,46 @@ 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/base/keycloak/keycloak.yaml

@@ -43,6 +43,10 @@ spec:
     - ServerSideApply=true
 
   ignoreDifferences:
+  - group: batch
+    kind: CronJob
+    jsonPointers:
+    - /spec/jobTemplate/spec/template/spec/containers/0/args
   - group: apps
     kind: StatefulSet
     jsonPointers:

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

@@ -0,0 +1,15 @@
+---
+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,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ../../base
-- vaultwarden-postgresql
+- 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-postgresql/resources/kustomization.yaml

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

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

@@ -1,98 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: vaultwarden-postgresql
-  namespace: vaultwarden
-  labels:
-    app.kubernetes.io/name: postgresql
-    app.kubernetes.io/instance: vaultwarden
-    app.kubernetes.io/component: database
-spec:
-  type: ClusterIP
-  ports:
-  - name: tcp-postgresql
-    port: 5432
-    targetPort: tcp-postgresql
-  selector:
-    app.kubernetes.io/name: postgresql
-    app.kubernetes.io/instance: vaultwarden
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: vaultwarden-postgresql
-  namespace: vaultwarden
-  labels:
-    app.kubernetes.io/name: postgresql
-    app.kubernetes.io/instance: vaultwarden
-    app.kubernetes.io/component: database
-spec:
-  serviceName: vaultwarden-postgresql
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: postgresql
-      app.kubernetes.io/instance: vaultwarden
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: postgresql
-        app.kubernetes.io/instance: vaultwarden
-        app.kubernetes.io/component: database
-    spec:
-      containers:
-      - name: postgresql
-        image: postgres:16-alpine
-        ports:
-        - name: tcp-postgresql
-          containerPort: 5432
-        env:
-        - name: POSTGRES_USER
-          valueFrom:
-            secretKeyRef:
-              name: prod-db-creds
-              key: pgusername
-        - name: POSTGRES_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: prod-db-creds
-              key: pgpassword
-        - name: POSTGRES_DB
-          value: vaultwarden
-        - name: PGDATA
-          value: /var/lib/postgresql/data/pgdata
-        volumeMounts:
-        - name: data
-          mountPath: /var/lib/postgresql/data
-        livenessProbe:
-          exec:
-            command:
-            - sh
-            - -c
-            - pg_isready -U "$POSTGRES_USER" -d vaultwarden
-          initialDelaySeconds: 30
-          periodSeconds: 10
-        readinessProbe:
-          exec:
-            command:
-            - sh
-            - -c
-            - pg_isready -U "$POSTGRES_USER" -d vaultwarden
-          initialDelaySeconds: 5
-          periodSeconds: 5
-        resources:
-          requests:
-            cpu: 100m
-            memory: 256Mi
-          limits:
-            cpu: 500m
-            memory: 512Mi
-  volumeClaimTemplates:
-  - metadata:
-      name: data
-    spec:
-      accessModes:
-      - ReadWriteOnce
-      resources:
-        requests:
-          storage: 2Gi

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

@@ -1,20 +0,0 @@
----
-apiVersion: bitnami.com/v1alpha1
-kind: SealedSecret
-metadata:
-  creationTimestamp: null
-  name: prod-db-creds
-  namespace: vaultwarden
-spec:
-  encryptedData:
-    DATABASE_URL: AgAy1d//kBevUqZxB5KAXd+qxm8QykNxp5J1QP7Y30XCpE8hldPXF+NIx3w0B0PUyMAVsa+JrBmCMtzgibddIJqqF2upu/8EYxJZNusrJPOi47g3VcZIg1WyxoFfffH6jwhzv69TE/T8WGBXmWbD2vr+XWjE24Q+lgwLut0mocVfihUjpuYq0WDjgJx7pqLnY1VatTwgSkAv1uRRVqdi7e1M5isDNEpdItCbEoWwdvZhG5JIMAA/2vecY4/vEne3cg46lJAkv4ueZNATG6DOXGgQgz6h7zCKSGS1xTfGr+4A2V2/vSYpQ/r8Td37mlseoBvwN4H5O+FgHrVREm7N6aafDariYd+ZfqUIGObsZIXhxhDmAM96pjtP8ehYVwq1srWTU+SUewEmwLFWhVP1UFnTB5vgIuOWoKjHlS7dSUpStpw2u7/mQ6vhRhEaDqY6cNzJgM9hipQM/pt5an7z4ovWVeAeK8InGzKU+uxOpv/oxmi9N54B+5O4DVZC+BIbFXchxDvqivRcZrTK+CNjHjkk4We5MvN0qlhSuCYOGzEVaQ192yHciDoncw58D7fG4NicT2AcCJDVIwRGG05wqKal7g61g7Qg16oqdZIauKIU7ChSgBk7Xv33biZ4ZPe+JoSEmp9izJ8R7yyNO3KJgqH7iQ2UQzXDUqhfTr6w/oIdFST8sQtEIo7o1Z5JoXpzd4R1gVkcPWqtbbB22iRrDJsofeW+yvgGqyZLsWT2bKuDMLUn3GiqvaHaeQ9AbhNBnl6Qth3X8heBm2Zle1xxapFktisPwBQC7FDlukgvkiAOO7BywVI0+ITU4KLLOAftVqHmZ4fgDDqNFg8=
-    SMTP_PASSWORD: AgCbhM99+DbSTCcuxtcccOrZq99GjR51B5SkW6DNxz1jW2q4lgc6o21+gHEGGAamRDg/mWyu2UBBNgEzrW024558qP6SjVPwJclWhNZHyL4R4MCA0kv/kqNa43na2j3pq7kzT0MrqPAXD8IJrtYPxr+ngiuo7MCRef/TzEfwbwK+KgkeB1g+9ErwHWr5tU1B+3yAn5tfNeHmGFrLX230mra2ie+ntNx9kn80mb5TYoJ/mSaX7wv4bqZGEHkg7isXrMoMROXLBepCvP0zi3ta+SKJjHy73TvhKSzo7/ZHxapHw3oaazdpKJobeolWB7SziWsbXfT0gYYim3LrcieQeb7hhN3OAvSYx1Z/3UefEE1o3GFEzK1UV9ISwU/mBjMDZWyM7dK9lSbuPGvbpKU1jjP8qZWQP5v2SIT6Nb5TQgNeATdO3RkjoviqRzjJfpuu+oe5paXNeEIUSTskL7HuUjWj13DX1zDqQWTR1/Tb9ntxRtgIoAl2ymDsOednurnJeX71OJ3G++Oc8b5P2EkNQuEwaYb9raNHqZkCXeRpQVyEGIUh9sAGZUplUJSues/Jw25WuFoNBfMi/F022Mkvfnp/s0J+QrMIxSRvqiWS+7hODknvE3Zf2DI+DKClWxspfv084DAkOSV1Lq9fqNy/bKoJR/5MVHmxbW6teza6zXBnwn2nk+2DZ8IU20P15aVdtKR2zG9u8hnrqWrTQHTdvzb34WKjC0km4/MaIGKvboyw
-    SMTP_USERNAME: AgCijAuSvlGeMME1FyPXQdOTGKktyXfT8tjBK/ozt3X8O5hebFVvM61hNLDQTe9V/O/NLw6P1wbV4V+wtztqLs9TPDyq9L3D9JUEDjh97gWxVf7nFf8/d24F0PJoR8srKp3onb7+Rx02318RUp+gp7YsXbK6YBfkaOsoD08UgrFY3ARnP4eIirRICNCdouPgKkh038yAWcQDA20GBN2faJlQSejS4cr8WAa/ME1fRe40Q4tewgiX7hK5BWjt2eoovLrPzcHvbgTbfjwUWvmeiSicnF+VLrc3M56aKML2xuAggBk4vKtla/Af1pJfjv+Ut2z6VzECfIth12yQa6kIvKOE8aa3o/6oKLRJQRO8rQOOmLiInR+jQxrOmYw+OzkON07nBIeBon7nKYSIMiBt68kXKWJ9ZDexF7WGOHsFgUo4hA/z/c/Ccg6XHgxFt7uXZYLyziihQXy33zIsvu0rXOaczT5j3NJIhO60jz2Q8ig9JuWhd7+Dnd9EFMC0WJOM9kjpxeSjg4MYjH7VGnnEDF2GAQTlwDn5HwZJXRQFHfdCiHS5CCpfmak9MtIC9uoIsbPAnEhdTC20wDvIGlR5O4JGlQRyirKKmCdT1MJt8zi5d+EVQiicVZLGGD6nsqCNchvFYcx+glMYqWWsmyS6M+uVaYa/Fb/n+0QR6GNCF3Qi7voMJf2bFxFDk78fk76MG919XPQVAG/FPliNyWJJ7gEM+j/rDYuSrul14duV
-    adminToken: AgCVSgRK39WksTX6GogBvMZtPMd4XzMFkKSPhjTCm8pllzuc88pS2LXHxyGDWVLf+GZXRTCNrf5JLPst8/GTvOX17J9scRAjmhoyVVgzFNbcqGI/czLf9vH6JnhorMmUHxS+kWBm3oLZjhW3f/9vq0xzSbut87VDsyenaK4EcFLrYnfVRlMrwxL9oxPPTeB+Wah/uGoyLNfc7MMLK+/sUma4RO61VJ8YvmLUnwYNFosUcbF2B9hXMSzKKCJ+ihXYIdNIz2YWdMmj7a3D+Mor5x4jIjC+tunT4Zge5L1mx0i92KPgPkP48jKxayIZ/FxnYej+ggU6PmdYD1B6wgUbgLQV6ccwysjHce7ICvGWiM+PozFWI1qEVKqtNgp3kwInThD63Hyub9Euj0g/SE/nZcwy8DuIEhsLpLSdvxDT2lCps0VdXcb01kuta/3i4vgozSBvdIL1FrQKPLqF5+6ZEQ6BdZDkgxVqQ845WZoGbfqIyI03BMvsx/8HB5c+0Y0w0C6DRpEW55T9yRTZqzvqWUOpXy5/L2Nc9G4PCUK3lY0QPIFlPCBDl+cKgfP/XvKhMFcFpwp/Ssd0o+RhgOMBHJ5qk7RxAN1k2Y6Tkros39eUKWbM6UQ97LjrAdLcgJKX86ZkEChdeeKOnSxRmqHFXx5m4Wa6syixjipeQPwybCYQA9TgNBv0lToA7gi+lcVvXkoAgYIeB9Cp0j8UVEwdgvwWp8YgkpuWhPCAafhboH8qGhHhVfKADmlB05vUItZ0eoEVv7D9SqUTFueUmoZXwo67uyMLZhQo7eGr9+k8hiesCoEm11HCTa4DvF9zE54zgkyt0TMsKAEKmX47zJwnw76zidZC/K9e
-    pgpassword: AgCeQLwzajVBHW+o1ZSAcfbcJXny5K7UxxMfjud0j3hm9qx3TlLaFJrNoWd4XCuHAW1Ybl23ynWm+8kpXfZv95bXGkl0jZIm989MlAJQYKcaSTdhIM6Bkl3Cbr8kTVj2yrylGPJ96QISKNoiV7IetU82t8f21kxjyrNwt4lQEwWRFjW45jozb32qFXRkTioJ1WKaeJkyRSHWn7nLVitqZ4QjZzoN9AC7cUDOY/FffEiz7QRYSf6xaVPqQfCeH6QVtfmwtU5qNTcthOW0+/LQKpkg8i2nuoAsyOe7tsOYCENbDGkLckNTns2oPvDnH5eA8F5VDlnyJtROlwKjWfTC2zjazZynpA6cBH9XzX3Pg9P45G5HJ/4TVSUbTMCSVrbW8Ec+zdA2P4l3ytfVM2ER4N2/bQrUEVW2/ngDzhsKllmOPEN/M7b/VTed7U1xyJHsoT+AJEqVJO/vFBRxpI/ZacD+m5kWf3sp1SUWSgkUi+YWH8xuRurM2/kiUGwwUXu5ZMumjpMTkJBfX4NYRezq0DCsgaXdO2yI4xTfAysj78UikdU0PKyAXPcT8y55kJQ1jECszFauyeSYh0FpLu/XAmeB8dunlBqgISLszwnnman0/ThLeo96MFo6WPXoAeMTy8+GfTSH5tkmm8TVD7A+gRHprfFS66eY5Zi38OPU+VGRJS1J8yLSD2cNvCFR/sz1Br9VV7IySx1S+HvbEd7BwmdWrIoEcVUwIAD/U0Uxbw4sr7wLQ2wFQjDil4VItA==
-    pgusername: AgAcgel8GpdRVThE9i4EfFwcJYHEPnCyi4jHEaAltn4VMtub6hvhtH+ihxS97AhK6kgrTLEgtlfb07n1EZ3AK18A+ci9P5ulP0GgwMrMt1yxiHliqInvZPNb8vWC/2f2lZm7EFrBvYqMFRPV10YygtkW3Kku8h31l0xc2/DUKqZ2hMymIjx7hupabUOhnPJeF+IxVhTcsAa6SjhppX1ED0R/Im73pxTxbfLQETkHd5KcB4h6RLIPvuNiG5uftkPP8qjJqFIhNew+0IxMrsTzJbyLx90vqI6LHHtsrNDAsOHqWGnyZqIdkK+Bagm84VlpBfIdz8Fs0YqzBQaZts4+QXByzkcQZBDy11Hg9FCjdUVk3VgVLDQj+hL+aWTeJ0Iui4zW4LMSB0Dk0ZQeQa4BtwuDllky5GUA7sLmkbceAWymBNzNXSOeeAi1qfR6h6rNnh0x5yOnSN8soReNaCEYBSa8HjUamvuzu4yn+fKOJyI50QEJ7hKLXLaqyiNpa5bJw4FQvGM7qESkZW2BZLEvkq4mlKjzvSm891DozA44Zy1s/3CvytFsUtaWmquSvqqHWUxqEEemJ8zOCFXEYo1TjEfkYIUipM5KJ+PrpQGTgjdnL8FbAv3r3NG7DoucQtVeJJVeaBqOZcfEQw4Xz15grsdjggFunhmz+ZjWjgEwV4G/dCmeus3SBWJWLMOoPWCvBWrQZRQq9KVj
-  template:
-    metadata:
-      creationTimestamp: null
-      name: prod-db-creds
-      namespace: vaultwarden

infra/overlays/upc-dev/vaultwarden/keycloak-client-config.yaml

@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: keycloak-client-vaultwarden
-  namespace: vaultwarden
-  labels:
-    keycloak.forteapps.net/client-config: "true"
-stringData:
-  client.json: |
-    {
-      "clientId": "vaultwarden",
-      "name": "Vaultwarden",
-      "redirectUris": ["https://vaultwarden.forteapps.net/*"],
-      "webOrigins": ["https://vaultwarden.forteapps.net"],
-      "protocolMappers": [],
-      "secret": {
-        "namespace": "vaultwarden",
-        "name": "vaultwarden-oidc-credentials",
-        "keys": { "clientId": "client-id", "clientSecret": "client-secret" }
-      }
-    }

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

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

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

@@ -1,43 +0,0 @@
-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,7 +41,6 @@ gitea:
     oauth2:
       ENABLED: true
       ENABLE_AUTO_REGISTRATION: true
-      ACCOUNT_LINKING: auto
       USERNAME: email
 
     session:

infra/values/base/keycloak-values.yaml

@@ -58,9 +58,6 @@ keycloakConfigCli:
   enabled: true
   image:
     repository: bitnamilegacy/keycloak-config-cli
-  extraEnvVars:
-  - name: IMPORT_MANAGED_PROTOCOL_MAPPER
-    value: "no-delete"
   configuration:
     forte-realm.json: |
       {
@@ -104,18 +101,6 @@ 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"
-                }
               }
             ]
           },
@@ -188,54 +173,7 @@ 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"
@@ -321,7 +259,7 @@ extraDeploy:
                 ADMIN_PASS=$(cat /secrets/admin-password)
 
                 echo "Authenticating to Keycloak..."
-                TOKEN=$(curl -sf -X POST "${KEYCLOAK_URL}/realms/master/protocol/openid-connect/token" \
+                TOKEN=$(curl -s -X POST "${KEYCLOAK_URL}/realms/master/protocol/openid-connect/token" \
                   -d "client_id=admin-cli" \
                   -d "username=${ADMIN_USER}" \
                   -d "password=${ADMIN_PASS}" \
@@ -338,7 +276,7 @@ extraDeploy:
                 upsert_secret() {
                   local ns="$1" name="$2" manifest="$3"
                   local code
-                  code=$(curl -sf -o /dev/null -w "%{http_code}" \
+                  code=$(curl -s -o /dev/null -w "%{http_code}" \
                     --cacert "$CA_CERT" \
                     -H "Authorization: Bearer ${SA_TOKEN}" \
                     -H "Content-Type: application/json" \
@@ -347,7 +285,7 @@ extraDeploy:
                   if [ "$code" = "200" ]; then
                     echo "  Updated secret '${ns}/${name}'"
                   elif [ "$code" = "404" ]; then
-                    code=$(curl -sf -o /dev/null -w "%{http_code}" \
+                    code=$(curl -s -o /dev/null -w "%{http_code}" \
                       --cacert "$CA_CERT" \
                       -H "Authorization: Bearer ${SA_TOKEN}" \
                       -H "Content-Type: application/json" \
@@ -394,7 +332,7 @@ extraDeploy:
 
                   # Get the client secret from Keycloak
                   local secret_value
-                  secret_value=$(curl -sf -H "Authorization: Bearer ${TOKEN}" \
+                  secret_value=$(curl -s -H "Authorization: Bearer ${TOKEN}" \
                     "${KEYCLOAK_URL}/admin/realms/${REALM}/clients/${client_uuid}/client-secret" \
                     | jq -r '.value')
 
@@ -409,7 +347,7 @@ extraDeploy:
 
                   # Write to target namespace (if it exists)
                   local ns_status
-                  ns_status=$(curl -sf -o /dev/null -w "%{http_code}" \
+                  ns_status=$(curl -s -o /dev/null -w "%{http_code}" \
                     --cacert "$CA_CERT" \
                     -H "Authorization: Bearer ${SA_TOKEN}" \
                     "${K8S_API}/api/v1/namespaces/${target_ns}")
@@ -433,12 +371,12 @@ extraDeploy:
                   local ns="$1" name="$2" key="$3" value="$4"
                   local patch
                   patch=$(printf '{"metadata":{"annotations":{"%s":"%s"}}}' "$key" "$value")
-                  curl -sf -o /dev/null \
+                  curl -s -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}"
+                    "${K8S_API}/api/v1/namespaces/${ns}/secrets/${name}" || true
                 }
 
                 # =============================================
@@ -446,7 +384,7 @@ extraDeploy:
                 # =============================================
                 echo "=== Legacy sync: clients with k8s.secret.sync=true ==="
 
-                CLIENTS=$(curl -sf -H "Authorization: Bearer ${TOKEN}" \
+                CLIENTS=$(curl -s -H "Authorization: Bearer ${TOKEN}" \
                   "${KEYCLOAK_URL}/admin/realms/${REALM}/clients")
 
                 SYNC_CLIENTS=$(echo "$CLIENTS" | jq -c '[.[] | select(.attributes["k8s.secret.sync"] == "true")]')
@@ -471,7 +409,7 @@ extraDeploy:
                 echo ""
                 echo "=== Self-service: config Secrets with label keycloak.forteapps.net/client-config=true ==="
 
-                CONFIG_SECRETS=$(curl -sf \
+                CONFIG_SECRETS=$(curl -s \
                   --cacert "$CA_CERT" \
                   -H "Authorization: Bearer ${SA_TOKEN}" \
                   "${K8S_API}/api/v1/namespaces/keycloak/secrets?labelSelector=keycloak.forteapps.net/client-config=true")
@@ -492,6 +430,10 @@ 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
@@ -508,7 +450,7 @@ extraDeploy:
                   CRED_EXISTS=$(curl -s -o /dev/null -w "%{http_code}" \
                     --cacert "$CA_CERT" \
                     -H "Authorization: Bearer ${SA_TOKEN}" \
-                    "${K8S_API}/api/v1/namespaces/${CRED_NS}/secrets/${CRED_NAME}" || echo "000")
+                    "${K8S_API}/api/v1/namespaces/${CRED_NS}/secrets/${CRED_NAME}")
 
                   # Skip if hash matches and credential Secret exists
                   if [ "$CONFIG_HASH" = "$EXISTING_HASH" ] && [ "$CRED_EXISTS" = "200" ]; then
@@ -529,46 +471,68 @@ extraDeploy:
                     redirectUris: .redirectUris,
                     webOrigins: .webOrigins,
                     protocolMappers: (.protocolMappers // [])
-                  } | with_entries(select(.value != null))')
+                  } + if .defaultClientScopes then {defaultClientScopes: .defaultClientScopes} else {} end')
 
                   # Check if client already exists
-                  EXISTING_RESPONSE=$(curl -s -H "Authorization: Bearer ${TOKEN}" \
+                  EXISTING=$(curl -s -H "Authorization: Bearer ${TOKEN}" \
-                    "${KEYCLOAK_URL}/admin/realms/${REALM}/clients?clientId=${CLIENT_ID}" || true)
+                    "${KEYCLOAK_URL}/admin/realms/${REALM}/clients?clientId=${CLIENT_ID}" \
-                  EXISTING=$(echo "$EXISTING_RESPONSE" | jq -r '.[0].id // empty' 2>/dev/null || true)
+                    | jq -r '.[0].id // empty')
 
                   if [ -n "$EXISTING" ]; then
                     echo "  Updating existing Keycloak client (uuid: ${EXISTING})"
-                    RESPONSE=$(curl -s -w "\n%{http_code}" \
+                    HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" \
                       -H "Authorization: Bearer ${TOKEN}" \
                       -H "Content-Type: application/json" \
                       -X PUT -d "$KC_CLIENT" \
-                      "${KEYCLOAK_URL}/admin/realms/${REALM}/clients/${EXISTING}" || true)
+                      "${KEYCLOAK_URL}/admin/realms/${REALM}/clients/${EXISTING}")
-                    HTTP_CODE=$(echo "$RESPONSE" | tail -1)
-                    RESPONSE_BODY=$(echo "$RESPONSE" | sed '$d')
                     if [ "$HTTP_CODE" != "204" ] && [ "$HTTP_CODE" != "200" ]; then
-                      echo "  ERROR: Failed to update client '${CLIENT_ID}' (HTTP ${HTTP_CODE}): ${RESPONSE_BODY}"
+                      echo "  ERROR: Failed to update client '${CLIENT_ID}' (HTTP ${HTTP_CODE})"
                       annotate_secret "keycloak" "$CONFIG_NAME" "keycloak.forteapps.net/sync-status" "error"
                       continue
                     fi
                     CLIENT_UUID="$EXISTING"
                   else
                     echo "  Creating new Keycloak client '${CLIENT_ID}'"
-                    RESPONSE=$(curl -s -w "\n%{http_code}" \
+                    HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" \
                       -H "Authorization: Bearer ${TOKEN}" \
                       -H "Content-Type: application/json" \
                       -X POST -d "$KC_CLIENT" \
-                      "${KEYCLOAK_URL}/admin/realms/${REALM}/clients" || true)
+                      "${KEYCLOAK_URL}/admin/realms/${REALM}/clients")
-                    HTTP_CODE=$(echo "$RESPONSE" | tail -1)
-                    RESPONSE_BODY=$(echo "$RESPONSE" | sed '$d')
                     if [ "$HTTP_CODE" != "201" ]; then
-                      echo "  ERROR: Failed to create client '${CLIENT_ID}' (HTTP ${HTTP_CODE}): ${RESPONSE_BODY}"
+                      echo "  ERROR: Failed to create client '${CLIENT_ID}' (HTTP ${HTTP_CODE})"
                       annotate_secret "keycloak" "$CONFIG_NAME" "keycloak.forteapps.net/sync-status" "error"
                       continue
                     fi
                     # Fetch the newly created client's UUID
                     CLIENT_UUID=$(curl -s -H "Authorization: Bearer ${TOKEN}" \
                       "${KEYCLOAK_URL}/admin/realms/${REALM}/clients?clientId=${CLIENT_ID}" \
-                      | jq -r '.[0].id' || true)
+                      | 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

infra/values/base/vaultwarden-values.yaml

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

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

@@ -59,10 +59,6 @@ config:
         href: https://benken.hackathon.forteapps.net
         description: Teknisk kompetanse fra offentlige anbud
         icon: forte
-    - Forte Drop:
-        href: https://drop.hackathon.forteapps.net
-        description: Self-hosted HTML-drops + MCP for Claude
-        icon: forte
     - Forte Feedback:
         href: https://feedback.forteapps.net
         description: Fortes internal feedback app

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

@@ -1,2 +1,112 @@
 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

@@ -1,82 +0,0 @@
-adminToken:
-  existingSecret: "prod-db-creds"
-  existingSecretKey: "adminToken"
-domain: "https://vaultwarden.forteapps.net"
-signupsAllowed: false
-resourceType: StatefulSet
-database:
-  type: postgresql
-  host: vaultwarden-postgresql
-  port: "5432"
-  dbName: vaultwarden
-  existingSecret: prod-db-creds
-  existingSecretKey: DATABASE_URL
-  existingSecretUserKey: pgusername
-  existingSecretPasswordKey: pgpassword
-ingress:
-  enabled: true
-  class: "traefik"
-  tls: true
-  tlsSecret: vaultwarden-tls
-  hostname: vaultwarden.forteapps.net
-  additionalAnnotations:
-    cert-manager.io/cluster-issuer: letsencrypt-prod
-    gethomepage.dev/enabled: "true"
-    gethomepage.dev/name: "VaultWarden"
-    gethomepage.dev/description: "Password management"
-    gethomepage.dev/group: "Security"
-    gethomepage.dev/icon: "vaultwarden"
-    gethomepage.dev/href: "https://vaultwarden.forteapps.net"
-
-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
-  security: starttls
-  port: 587
-  authMechanism: "Login"
-  from: noreply@fortedigital.com
-  fromName: "Forte Bitwarden Administrator"
-  debug: true
-  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"
-
-sso:
-  enabled: true
-  existingSecret: vaultwarden-oidc-credentials
-  authority: "https://id.forteapps.net/realms/forte"
-  scopes: "email profile"
-  onlySSO: true
-  pkce: true
-  signupsMatchEmail: true
-  clientId:
-    existingSecretKey: client-id
-  clientSecret:
-    existingSecretKey: client-secret