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"
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@@ -6,71 +6,11 @@ metadata:
|
||||
name: woodpecker
|
||||
description: null
|
||||
options:
|
||||
storage-agent:
|
||||
default:
|
||||
size: 10Gi
|
||||
storageClass: ''
|
||||
writeMany: 'false'
|
||||
examples:
|
||||
- size: 10Gi
|
||||
storageClass: ''
|
||||
writeMany: 'false'
|
||||
properties:
|
||||
size:
|
||||
default: 10Gi
|
||||
type: string
|
||||
storageClass:
|
||||
default: ''
|
||||
type: string
|
||||
writeMany:
|
||||
default: 'false'
|
||||
type: string
|
||||
type: object
|
||||
sub-domain:
|
||||
default: ci
|
||||
examples:
|
||||
- ci
|
||||
type: string
|
||||
app-group:
|
||||
default: dev
|
||||
examples:
|
||||
- dev
|
||||
type: string
|
||||
timeouts:
|
||||
default:
|
||||
default: '60'
|
||||
max: '120'
|
||||
examples:
|
||||
- default: '60'
|
||||
max: '120'
|
||||
properties:
|
||||
default:
|
||||
default: '60'
|
||||
type: string
|
||||
max:
|
||||
default: '120'
|
||||
type: string
|
||||
type: object
|
||||
domain-name:
|
||||
default: your_company.com
|
||||
examples:
|
||||
- your_company.com
|
||||
type: string
|
||||
domain:
|
||||
default: your-company
|
||||
examples:
|
||||
- your-company
|
||||
type: string
|
||||
ingress-class:
|
||||
ingress_class:
|
||||
default: traefik
|
||||
examples:
|
||||
- traefik
|
||||
type: string
|
||||
issuer:
|
||||
default: letsencrypt-prod
|
||||
examples:
|
||||
- letsencrypt-prod
|
||||
type: string
|
||||
images:
|
||||
default:
|
||||
agent:
|
||||
@@ -187,11 +127,71 @@ options:
|
||||
default: 10Gi
|
||||
type: string
|
||||
type: object
|
||||
timeouts:
|
||||
default:
|
||||
default: '60'
|
||||
max: '120'
|
||||
examples:
|
||||
- default: '60'
|
||||
max: '120'
|
||||
properties:
|
||||
default:
|
||||
default: '60'
|
||||
type: string
|
||||
max:
|
||||
default: '120'
|
||||
type: string
|
||||
type: object
|
||||
sub-domain:
|
||||
default: ci
|
||||
examples:
|
||||
- ci
|
||||
type: string
|
||||
issuer:
|
||||
default: letsencrypt-prod
|
||||
examples:
|
||||
- letsencrypt-prod
|
||||
type: string
|
||||
storage-agent:
|
||||
default:
|
||||
size: 10Gi
|
||||
storageClass: ''
|
||||
writeMany: 'false'
|
||||
examples:
|
||||
- size: 10Gi
|
||||
storageClass: ''
|
||||
writeMany: 'false'
|
||||
properties:
|
||||
size:
|
||||
default: 10Gi
|
||||
type: string
|
||||
storageClass:
|
||||
default: ''
|
||||
type: string
|
||||
writeMany:
|
||||
default: 'false'
|
||||
type: string
|
||||
type: object
|
||||
app_group:
|
||||
default: dev
|
||||
examples:
|
||||
- dev
|
||||
type: string
|
||||
domain_name:
|
||||
default: your_company.com
|
||||
examples:
|
||||
- your_company.com
|
||||
type: string
|
||||
admin-users:
|
||||
default: woodpecker,admin
|
||||
examples:
|
||||
- woodpecker,admin
|
||||
type: string
|
||||
domain:
|
||||
default: your-company
|
||||
examples:
|
||||
- your-company
|
||||
type: string
|
||||
dependencies:
|
||||
- dist: null
|
||||
category: apps
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
locals {
|
||||
dns_name = "${var.sub-domain}.${var.domain-name}"
|
||||
dns_name = "${var.sub-domain}.${var.domain_name}"
|
||||
dns_names = [local.dns_name]
|
||||
icon = "favicons/favicon-light-default.png"
|
||||
service = {
|
||||
@@ -16,7 +16,7 @@ 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
|
||||
middlewares = []
|
||||
@@ -30,7 +30,7 @@ module "application" {
|
||||
source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application"
|
||||
component = var.component
|
||||
instance = var.instance
|
||||
app_group = var.app-group
|
||||
app_group = var.app_group
|
||||
dns_name = local.dns_name
|
||||
icon = local.icon
|
||||
providers = {
|
||||
|
||||
Reference in New Issue
Block a user