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
|
||||
}
|
||||
|
||||
|
||||
@@ -6,46 +6,6 @@ metadata:
|
||||
name: domain-ci
|
||||
description: null
|
||||
options:
|
||||
domain:
|
||||
default: your-company
|
||||
examples:
|
||||
- your-company
|
||||
type: string
|
||||
issuer:
|
||||
default: letsencrypt-prod
|
||||
examples:
|
||||
- letsencrypt-prod
|
||||
type: string
|
||||
distributions:
|
||||
default:
|
||||
core: core
|
||||
domain: domain
|
||||
examples:
|
||||
- core: core
|
||||
domain: domain
|
||||
properties:
|
||||
core:
|
||||
default: core
|
||||
type: string
|
||||
domain:
|
||||
default: domain
|
||||
type: string
|
||||
type: object
|
||||
woodpecker:
|
||||
default:
|
||||
enable: false
|
||||
examples:
|
||||
- enable: false
|
||||
properties:
|
||||
enable:
|
||||
default: false
|
||||
type: boolean
|
||||
type: object
|
||||
ingress-class:
|
||||
default: traefik
|
||||
examples:
|
||||
- traefik
|
||||
type: string
|
||||
storage-classes:
|
||||
default:
|
||||
BlockReadWriteMany: ''
|
||||
@@ -71,21 +31,21 @@ options:
|
||||
default: ''
|
||||
type: string
|
||||
type: object
|
||||
gitea:
|
||||
default:
|
||||
enable: true
|
||||
examples:
|
||||
- enable: true
|
||||
properties:
|
||||
enable:
|
||||
default: true
|
||||
type: boolean
|
||||
type: object
|
||||
domain-name:
|
||||
default: your_company.com
|
||||
examples:
|
||||
- your_company.com
|
||||
type: string
|
||||
issuer:
|
||||
default: letsencrypt-prod
|
||||
examples:
|
||||
- letsencrypt-prod
|
||||
type: string
|
||||
ingress-class:
|
||||
default: traefik
|
||||
examples:
|
||||
- traefik
|
||||
type: string
|
||||
backups:
|
||||
default:
|
||||
enable: false
|
||||
@@ -116,6 +76,46 @@ options:
|
||||
default: backup-settings
|
||||
type: string
|
||||
type: object
|
||||
domain:
|
||||
default: your-company
|
||||
examples:
|
||||
- your-company
|
||||
type: string
|
||||
gitea:
|
||||
default:
|
||||
enable: true
|
||||
examples:
|
||||
- enable: true
|
||||
properties:
|
||||
enable:
|
||||
default: true
|
||||
type: boolean
|
||||
type: object
|
||||
woodpecker:
|
||||
default:
|
||||
enable: false
|
||||
examples:
|
||||
- enable: false
|
||||
properties:
|
||||
enable:
|
||||
default: false
|
||||
type: boolean
|
||||
type: object
|
||||
distributions:
|
||||
default:
|
||||
core: core
|
||||
domain: domain
|
||||
examples:
|
||||
- core: core
|
||||
domain: domain
|
||||
properties:
|
||||
core:
|
||||
default: core
|
||||
type: string
|
||||
domain:
|
||||
default: domain
|
||||
type: string
|
||||
type: object
|
||||
dependencies: []
|
||||
providers:
|
||||
kubernetes: true
|
||||
@@ -124,4 +124,5 @@ providers:
|
||||
postgresql: null
|
||||
restapi: null
|
||||
http: null
|
||||
gitea: null
|
||||
tfaddtype: null
|
||||
|
||||
Reference in New Issue
Block a user