fix
This commit is contained in:
@@ -150,9 +150,9 @@ data "kustomization_overlay" "data" {
|
||||
- name: WOODPECKER_ADMIN
|
||||
value: "${var.admin-users}"
|
||||
- name: WOODPECKER_HOST
|
||||
value: "https://${var.sub-domain}.${var.domain-name}"
|
||||
value: "https://${var.sub_domain}.${var.domain_name}"
|
||||
- name: WOODPECKER_HOST
|
||||
value: "https://${var.sub-domain}.${var.domain-name}"
|
||||
value: "https://${var.sub_domain}.${var.domain_name}"
|
||||
envFrom:
|
||||
- secretRef:
|
||||
name: woodpecker-secret
|
||||
|
||||
@@ -22,7 +22,7 @@ resource "gitea_oauth2_app" "prj" {
|
||||
name = var.component
|
||||
confidential_client = true
|
||||
redirect_uris = [
|
||||
"https://${var.sub-domain}.${var.domain-name}/authorize"
|
||||
"https://${var.sub_domain}.${var.domain_name}/authorize"
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@@ -36,12 +36,12 @@ options:
|
||||
examples:
|
||||
- your-company
|
||||
type: string
|
||||
domain-name:
|
||||
domain_name:
|
||||
default: your_company.com
|
||||
examples:
|
||||
- your_company.com
|
||||
type: string
|
||||
app-group:
|
||||
app_group:
|
||||
default: dev
|
||||
examples:
|
||||
- dev
|
||||
@@ -162,7 +162,7 @@ options:
|
||||
default: 10Gi
|
||||
type: string
|
||||
type: object
|
||||
ingress-class:
|
||||
ingress_class:
|
||||
default: traefik
|
||||
examples:
|
||||
- traefik
|
||||
@@ -187,7 +187,7 @@ options:
|
||||
default: '120'
|
||||
type: string
|
||||
type: object
|
||||
sub-domain:
|
||||
sub_domain:
|
||||
default: ci
|
||||
examples:
|
||||
- ci
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
locals {
|
||||
dns-name = "${var.sub-domain}.${var.domain-name}"
|
||||
dns-names = [local.dns-name]
|
||||
dns_name = "${var.sub_domain}.${var.domain_name}"
|
||||
dns_names = [local.dns_name]
|
||||
icon = "favicons/favicon-light-default.png"
|
||||
service = {
|
||||
"name" = "${var.component}-server"
|
||||
@@ -16,9 +16,9 @@ module "ingress" {
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
issuer = var.issuer
|
||||
ingress-class = var.ingress-class
|
||||
ingress_class = var.ingress_class
|
||||
labels = local.common-labels
|
||||
dns-names = local.dns-names
|
||||
dns_names = local.dns_names
|
||||
middlewares = []
|
||||
service = local.service
|
||||
providers = {
|
||||
@@ -30,8 +30,8 @@ module "application" {
|
||||
source = "/dist/modules/application"
|
||||
component = var.component
|
||||
instance = var.instance
|
||||
app-group = var.app-group
|
||||
dns-name = local.dns-name
|
||||
app_group = var.app_group
|
||||
dns_name = local.dns_name
|
||||
icon = local.icon
|
||||
providers = {
|
||||
authentik = authentik
|
||||
|
||||
Reference in New Issue
Block a user