fix
This commit is contained in:
@@ -13,17 +13,24 @@ locals {
|
||||
"ingress-class" = var.ingress-class
|
||||
"backups" = var.backups
|
||||
}
|
||||
default-mode = var.storage-classes.FilesystemReadWriteMany!=""?"ReadWriteMany":"ReadWriteOnce"
|
||||
gitea = { for k, v in var.gitea : k => v if contains(["enable","storage-server","storage-agent"],k) }
|
||||
gitea-storage = {
|
||||
"volume" = {
|
||||
"size" = lookup(lookup(local.gitea, "volume",{}), "size", "20Gi")
|
||||
"accessMode" = lookup(lookup(local.gitea, "volume",{}), "accessMode", local.default-mode)
|
||||
}
|
||||
}
|
||||
woodpecker = { for k, v in var.woodpecker : k => v if k!="enable" }
|
||||
woodpecker-storage = merge({
|
||||
"storage-server" = {
|
||||
"size" = "10Gi"
|
||||
"accessMode" = var.storage-classes.FilesystemReadWriteMany!=""?"ReadWriteMany":"ReadWriteOnce"
|
||||
"size" = lookup(lookup(local.woodpecker, "storage-server",{}), "size", "10Gi")
|
||||
"accessMode" = lookup(lookup(local.woodpecker, "storage-server",{}), "accessMode", local.default-mode)
|
||||
}
|
||||
"storage-agent" = {
|
||||
"size" = "10Gi"
|
||||
"writeMany" = var.storage-classes.FilesystemReadWriteMany!=""?"true":"false"
|
||||
"storageClass" = var.storage-classes.FilesystemReadWriteMany!=""?var.storage-classes.FilesystemReadWriteMany:var.storage-classes.FilesystemReadWriteOnce
|
||||
"size" = lookup(lookup(local.woodpecker, "storage-agent",{}), "size", "10Gi")
|
||||
"writeMany" = lookup(lookup(local.woodpecker, "storage-agent",{}), "writeMany", var.storage-classes.FilesystemReadWriteMany!=""?"true":"false")
|
||||
"storageClass" = lookup(lookup(local.woodpecker, "storage-agent",{}), "storageClass", var.storage-classes.FilesystemReadWriteMany!=""?var.storage-classes.FilesystemReadWriteMany:var.storage-classes.FilesystemReadWriteOnce)
|
||||
}
|
||||
}, { for k, v in var.woodpecker : k => v if contains(["storage-server","storage-agent"],k) })
|
||||
}
|
||||
@@ -51,7 +58,7 @@ resource "kubectl_manifest" "gitea" {
|
||||
distrib: "${var.distributions.domain}"
|
||||
category: "apps"
|
||||
component: "gitea"
|
||||
options: ${jsonencode(merge(local.global, local.gitea))}
|
||||
options: ${jsonencode(merge(local.global, local.gitea-storage, local.gitea))}
|
||||
EOF
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user