fix
This commit is contained in:
@@ -8,6 +8,16 @@ locals {
|
||||
}, org) if org.name == name
|
||||
]
|
||||
])
|
||||
common_org_param = {
|
||||
"stages" = []
|
||||
"datasets" = []
|
||||
"haveGitea" = var.haveGitea
|
||||
"haveTekton" = var.haveTekton
|
||||
"haveFlux" = var.haveFlux
|
||||
"autoCD" = var.autoCD
|
||||
"gitea_ssh_prefix" = var.gitea_ssh_prefix
|
||||
"gitea_ssh_port" = var.gitea_ssh_port
|
||||
}
|
||||
}
|
||||
|
||||
resource "kubectl_manifest" "organisations" {
|
||||
@@ -24,17 +34,7 @@ resource "kubectl_manifest" "organisations" {
|
||||
category: "share"
|
||||
component: "organisation"
|
||||
options: ${jsonencode(merge(
|
||||
local.global,
|
||||
{
|
||||
"stages" = []
|
||||
"datasets" = []
|
||||
"haveGitea" = var.haveGitea
|
||||
"haveTekton" = var.haveTekton
|
||||
"haveFlux" = var.haveFlux
|
||||
"autoCD" = var.autoCD
|
||||
"gitea_ssh_prefix" = var.gitea_ssh_prefix
|
||||
"gitea_ssh_port" = var.gitea_ssh_port
|
||||
},
|
||||
local.global, local.common_org_param,
|
||||
{ for k, v in local.sorted-organisations[count.index] : k => v if !contains(["name"], k) }
|
||||
))}
|
||||
EOF
|
||||
|
||||
Reference in New Issue
Block a user