Compare commits
2 Commits
main
...
399cf38fb4
| Author | SHA1 | Date | |
|---|---|---|---|
| 399cf38fb4 | |||
| 5de9793bdf |
@@ -79,7 +79,7 @@ module "app_policies" {
|
|||||||
for_each = { for app in var.applications : app.name => app }
|
for_each = { for app in var.applications : app.name => app }
|
||||||
name = each.value.name
|
name = each.value.name
|
||||||
envs = each.value.envs
|
envs = each.value.envs
|
||||||
ops_policies = each.value.ops_policies
|
ops_policies = each.value.policies
|
||||||
service_account_names = each.value.service_account_names
|
service_account_names = each.value.service_account_names
|
||||||
service_account_namespaces = each.value.service_account_namespaces
|
service_account_namespaces = each.value.service_account_namespaces
|
||||||
gitea_app_id = var.gitea_app_id
|
gitea_app_id = var.gitea_app_id
|
||||||
|
|||||||
@@ -8,14 +8,18 @@
|
|||||||
locals {
|
locals {
|
||||||
name = lower(var.name)
|
name = lower(var.name)
|
||||||
envs = [for e in var.envs : lower(e)]
|
envs = [for e in var.envs : lower(e)]
|
||||||
|
|
||||||
# Elision rule: env=prod → bare name; else <name>-<env>
|
# Elision rule: env=prod → bare name; else <name>-<env>
|
||||||
instances = [for e in local.envs : e == "prod" ? local.name : "${local.name}-${e}"]
|
instances = [for e in local.envs : e == "prod" ? local.name : "${local.name}-${e}"]
|
||||||
|
# Non-prod instances only (for the per-env runtime policy iteration that doesn't touch the prod state address)
|
||||||
non_prod_instances = [for e in local.envs : "${local.name}-${e}" if e != "prod"]
|
non_prod_instances = [for e in local.envs : "${local.name}-${e}" if e != "prod"]
|
||||||
|
|
||||||
# Per-instance SA name/namespace sets used by the CI policy's allowed_parameter blocks.
|
# Per-instance SA name/namespace sets used by the CI policy's allowed_parameter blocks.
|
||||||
per_instance_sa_names = { for inst in local.instances : inst => concat([inst], var.service_account_names) }
|
per_instance_sa_names = { for inst in local.instances : inst => concat([inst], var.service_account_names) }
|
||||||
per_instance_sa_namespaces = { for inst in local.instances : inst => concat([inst], var.service_account_namespaces) }
|
per_instance_sa_namespaces = { for inst in local.instances : inst => concat([inst], var.service_account_namespaces) }
|
||||||
|
|
||||||
|
# Backwards-compat aliases kept for any caller that referenced these (unused outside the module).
|
||||||
|
bound_service_account_names = concat([var.name], var.service_account_names)
|
||||||
|
bound_service_account_namespaces = concat([var.name], var.service_account_namespaces)
|
||||||
}
|
}
|
||||||
|
|
||||||
data "vault_policy_document" "ops" {
|
data "vault_policy_document" "ops" {
|
||||||
|
|||||||
@@ -3,17 +3,17 @@ data "vault_auth_backend" "kubernetes" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
locals {
|
locals {
|
||||||
name = lower(var.name)
|
name = lower(var.name)
|
||||||
env = lower(var.env)
|
env = lower(var.env)
|
||||||
database = var.database == null ? local.instance : var.database
|
|
||||||
|
|
||||||
# Elision rule (factory runbook conventions.md):
|
# Elision rule (factory runbook conventions.md):
|
||||||
# env == prod → identical to the single-env baseline (no suffix)
|
# env == prod → identical to the single-env baseline (no suffix)
|
||||||
# else → kebab-case "<name>-<env>" for K8s/Vault paths.
|
# else → kebab-case "<name>-<env>" for K8s/Vault paths
|
||||||
|
instance = local.env == "prod" ? local.name : "${local.name}-${local.env}"
|
||||||
# Postgres owner role stays snake-case for consistency with the existing "_role" suffix.
|
# Postgres owner role stays snake-case for consistency with the existing "_role" suffix.
|
||||||
instance = local.env == "prod" ? local.name : "${local.name}-${local.env}"
|
|
||||||
owner_role = local.env == "prod" ? "${local.name}_role" : "${local.name}_${local.env}_role"
|
owner_role = local.env == "prod" ? "${local.name}_role" : "${local.name}_${local.env}_role"
|
||||||
|
|
||||||
|
database = var.database == null ? local.instance : var.database
|
||||||
|
|
||||||
bound_service_account_names = concat([local.instance], var.service_account_names)
|
bound_service_account_names = concat([local.instance], var.service_account_names)
|
||||||
bound_service_account_namespaces = concat([local.instance], var.service_account_namespaces)
|
bound_service_account_namespaces = concat([local.instance], var.service_account_namespaces)
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
applications = [
|
applications = [
|
||||||
{ name = "webapp" },
|
{ name = "webapp" },
|
||||||
{ name = "erp", envs = ["prod", "sandbox"] },
|
{ name = "erp" },
|
||||||
{ name = "dance-lessons-coach" },
|
{ name = "dance-lessons-coach" },
|
||||||
{
|
{
|
||||||
name = "cms"
|
name = "cms"
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ variable "POSTGRES_CREDENTIALS_EDITOR_PASSWORD" {
|
|||||||
variable "applications" {
|
variable "applications" {
|
||||||
type = set(object({
|
type = set(object({
|
||||||
name = string
|
name = string
|
||||||
ops_policies = optional(list(string), [])
|
policies = optional(list(string), [])
|
||||||
service_account_names = optional(list(string), [])
|
service_account_names = optional(list(string), [])
|
||||||
service_account_namespaces = optional(list(string), [])
|
service_account_namespaces = optional(list(string), [])
|
||||||
# Multi-env extension: list of envs this app deploys to. Defaults to ["prod"] for
|
# Multi-env extension: list of envs this app deploys to. Defaults to ["prod"] for
|
||||||
|
|||||||
Reference in New Issue
Block a user