vynil/domain-incoming
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Sébastien Huss
2024-01-25 18:35:22 +01:00
parent 0727fca591
commit 8c4348d215
97 changed files with 402 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/code-server/deploy.tf
View File

@@ -9,7 +9,7 @@ resource "kubectl_manifest" "deploy" {
spec:
replicas: 1
hostname: "${var.component}-${var.instance}"
subdomain: "${var.domain-name}"
subdomain: "${var.domain_name}"
selector:
matchLabels: ${jsonencode(local.common-labels)}
template:

8
apps/code-server/index.yaml
View File

@@ -6,17 +6,17 @@ metadata:
name: code-server
description: null
options:
app-group:
app_group:
default: dev
examples:
- dev
type: string
sub-domain:
sub_domain:
default: code
examples:
- code
type: string
ingress-class:
ingress_class:
default: traefik
examples:
- traefik
@@ -48,7 +48,7 @@ options:
- Block
type: string
type: object
domain-name:
domain_name:
default: your_company.com
examples:
- your_company.com

20
apps/code-server/presentation.tf
View File

@@ -1,7 +1,7 @@
locals {
dns-name = "${var.instance}.${var.sub-domain}.${var.domain-name}"
dns-names = [local.dns-name]
app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
dns_name = "${var.instance}.${var.sub_domain}.${var.domain_name}"
dns_names = [local.dns_name]
app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
icon = "_static/src/browser/media/favicon-dark-support.svg"
request_headers = {
"Content-Type" = "application/json"
@@ -34,10 +34,10 @@ 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 = ["forward-${local.app-name}"]
dns_names = local.dns_names
middlewares = ["forward-${local.app_name}"]
service = local.service
providers = {
kubectl = kubectl
@@ -48,8 +48,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
protocol_provider = module.forward.provider-id
providers = {
@@ -73,9 +73,9 @@ module "forward" {
instance = var.instance
domain = var.domain
namespace = var.namespace
ingress-class = var.ingress-class
ingress_class = var.ingress_class
labels = local.common-labels
dns-names = local.dns-names
dns_names = local.dns_names
service = local.service
icon = local.icon
request_headers = local.request_headers

6
apps/code-server/pvc.tf
View File

@@ -8,10 +8,10 @@ resource "kubectl_manifest" "pvc" {
labels: ${jsonencode(local.common-labels)}
spec:
accessModes:
- "${var.storage.accessMode}"
- "${var.storage.volume.accessMode}"
resources:
requests:
storage: "${var.storage.size}"
volumeMode: "${var.storage.type}"
storage: "${var.storage.volume.size}"
volumeMode: "${var.storage.volume.type}"
EOF
}

8
apps/dbgate/index.yaml
View File

@@ -72,7 +72,7 @@ options:
examples:
- letsencrypt-prod
type: string
sub-domain:
sub_domain:
default: dbgate
examples:
- dbgate
@@ -106,12 +106,12 @@ options:
type: string
type: object
type: array
domain-name:
domain_name:
default: your_company.com
examples:
- your_company.com
type: string
app-group:
app_group:
default: dev
examples:
- dev
@@ -169,7 +169,7 @@ options:
type: string
type: object
type: array
ingress-class:
ingress_class:
default: traefik
examples:
- traefik

16
apps/dbgate/presentation.tf
View File

@@ -1,7 +1,7 @@
locals {
dns-name = "${var.sub-domain}.${var.domain-name}"
dns-names = [local.dns-name]
app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
dns_name = "${var.sub_domain}.${var.domain_name}"
dns_names = [local.dns_name]
app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
icon = "logo192.png"
request_headers = {
"Content-Type" = "application/json"
@@ -34,9 +34,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 = {
@@ -48,8 +48,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
protocol_provider = module.oauth2.provider-id
providers = {
@@ -63,7 +63,7 @@ module "oauth2" {
instance = var.instance
namespace = var.namespace
labels = local.common-labels
dns-name = local.dns-name
dns_name = local.dns_name
redirect-path = ""
providers = {
kubernetes = kubernetes

6
apps/dbgate/pvc.tf
View File

@@ -8,10 +8,10 @@ resource "kubectl_manifest" "pvc" {
labels: ${jsonencode(local.common-labels)}
spec:
accessModes:
- "${var.storage.accessMode}"
- "${var.storage.volume.accessMode}"
resources:
requests:
storage: "${var.storage.size}"
volumeMode: "${var.storage.type}"
storage: "${var.storage.volume.size}"
volumeMode: "${var.storage.volume.type}"
EOF
}

14
apps/dolibarr/application.tf
View File

@@ -1,6 +1,6 @@
locals {
app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
main-group = format("app-%s", local.app-name)
app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
main-group = format("app-%s", local.app_name)
sorted-group-names = reverse(distinct(sort([
for grp in var.user-groups: grp.name
])))
@@ -19,7 +19,7 @@ data "authentik_group" "vynil-admin" {
resource "authentik_group" "groups" {
count = length(local.sorted-groups)
name = local.sorted-groups[count.index].name
attributes = jsonencode({"${local.app-name}" = true})
attributes = jsonencode({"${local.app_name}" = true})
}
data "authentik_group" "readed_groups" {
depends_on = [ authentik_group.groups ]
@@ -38,7 +38,7 @@ resource "authentik_policy_expression" "policy" {
name = local.main-group
expression = <<-EOF
attr = request.user.group_attributes()
return attr['${local.app-name}'] if '${local.app-name}' in attr else False
return attr['${local.app_name}'] if '${local.app_name}' in attr else False
EOF
}
@@ -61,10 +61,10 @@ resource "authentik_policy_binding" "dolibarr_ldap_access_vynil" {
resource "authentik_application" "dolibarr_application_saml" {
name = "${var.instance}"
slug = "${var.component}-${var.instance}"
group = var.app-group
group = var.app_group
protocol_provider = authentik_provider_saml.dolibarr.id
meta_launch_url = format("https://%s.%s", var.sub-domain, var.domain-name)
meta_icon = format("https://%s.%s/%s", var.sub-domain, var.domain-name, "theme/dolibarr_256x256_color.png")
meta_launch_url = format("https://%s.%s", var.sub_domain, var.domain_name)
meta_icon = format("https://%s.%s/%s", var.sub_domain, var.domain_name, "theme/dolibarr_256x256_color.png")
}
resource "authentik_policy_binding" "dolibarr_saml_access_users" {

2
apps/dolibarr/configmap.tf
View File

@@ -167,7 +167,7 @@ resource "kubectl_manifest" "config" {
DOLI_ADMIN_LOGIN: "admin_${var.instance}"
DOLI_MODULES: "modSociete,modBlockedLog,modSamlConnector,modLdap"
DOLI_AUTH: "dolibarr"
DOLI_URL_ROOT: "https://${var.sub-domain}.${var.domain-name}"
DOLI_URL_ROOT: "https://${var.sub_domain}.${var.domain_name}"
DOLI_LDAP_PORT: "389"
DOLI_LDAP_VERSION: "3"
DOLI_LDAP_SERVERTYPE: "openldap"

8
apps/dolibarr/index.yaml
View File

@@ -89,7 +89,7 @@ options:
type: string
type: object
type: object
sub-domain:
sub_domain:
default: erp
examples:
- erp
@@ -155,7 +155,7 @@ options:
default: '14'
type: string
type: object
domain-name:
domain_name:
default: your_company.com
examples:
- your_company.com
@@ -198,7 +198,7 @@ options:
default: 2Gi
type: string
type: object
app-group:
app_group:
default: ''
examples:
- ''
@@ -341,7 +341,7 @@ options:
- block
type: string
type: object
ingress-class:
ingress_class:
default: traefik
examples:
- traefik

10
apps/dolibarr/ingress.tf
View File

@@ -1,5 +1,5 @@
locals {
dns-names = ["${var.sub-domain}.${var.domain-name}"]
dns_names = ["${var.sub_domain}.${var.domain_name}"]
middlewares = ["${var.instance}-https"]
service = {
"name" = "${var.instance}"
@@ -7,7 +7,7 @@ locals {
"number" = 80
}
}
rules = [ for v in local.dns-names : {
rules = [ for v in local.dns_names : {
"host" = "${v}"
"http" = {
"paths" = [{
@@ -31,7 +31,7 @@ resource "kubectl_manifest" "prj_certificate" {
labels: ${jsonencode(local.common-labels)}
spec:
secretName: "${var.instance}-cert"
dnsNames: ${jsonencode(local.dns-names)}
dnsNames: ${jsonencode(local.dns_names)}
issuerRef:
name: "${var.issuer}"
kind: "ClusterIssuer"
@@ -66,10 +66,10 @@ resource "kubectl_manifest" "prj_ingress" {
annotations:
"traefik.ingress.kubernetes.io/router.middlewares": "${join(",", [for m in local.middlewares : format("%s-%s@kubernetescrd", var.namespace, m)])}"
spec:
ingressClassName: "${var.ingress-class}"
ingressClassName: "${var.ingress_class}"
rules: ${jsonencode(local.rules)}
tls:
- hosts: ${jsonencode(local.dns-names)}
- hosts: ${jsonencode(local.dns_names)}
secretName: "${var.instance}-cert"
EOF
}

2
apps/dolibarr/ldap.tf
View File

@@ -5,7 +5,7 @@ data "kubernetes_secret_v1" "authentik" {
}
}
locals {
base-dn = format("dc=%s", join(",dc=", split(".", format("%s.%s", var.sub-domain, var.domain-name))))
base-dn = format("dc=%s", join(",dc=", split(".", format("%s.%s", var.sub_domain, var.domain_name))))
base-group-dn = format("ou=groups,%s", local.base-dn)
base-user-dn = format("ou=users,%s", local.base-dn)
authentik_url = "http://authentik.${var.domain}-auth.svc"

6
apps/dolibarr/pvc.tf
View File

@@ -10,10 +10,10 @@ resource "kubectl_manifest" "pvc" {
labels: ${jsonencode(local.common-labels)}
spec:
accessModes:
- "${var.storage.accessMode}"
- "${var.storage.volume.accessMode}"
resources:
requests:
storage: "${var.storage.size}"
volumeMode: "${var.storage.type}"
storage: "${var.storage.volume.size}"
volumeMode: "${var.storage.volume.type}"
EOF
}

6
apps/dolibarr/redis.tf
View File

@@ -13,7 +13,7 @@ resource "kubectl_manifest" "dolibarr_redis" {
labels: ${jsonencode(local.redis-labels)}
spec:
kubernetesConfig:
image: "${var.redis.image}"
image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}"
imagePullPolicy: "IfNotPresent"
storage:
volumeClaimTemplate:
@@ -21,10 +21,10 @@ resource "kubectl_manifest" "dolibarr_redis" {
accessModes: ["ReadWriteOnce"]
resources:
requests:
storage: "${var.redis.storage}"
storage: "${var.storage.redis}"
redisExporter:
enabled: ${var.redis.exporter.enabled}
image: "${var.redis.exporter.image}"
image: "${var.images.redis_exporter.registry}/${var.images.redis_exporter.repository}:${var.images.redis_exporter.tag}"
securityContext:
runAsUser: 1000
fsGroup: 1000

4
apps/dolibarr/saml.tf
View File

@@ -35,7 +35,7 @@ resource "kubectl_manifest" "saml_certificate" {
labels: ${jsonencode(local.common-labels)}
spec:
secretName: "${var.instance}-${var.component}-saml"
dnsNames: ${jsonencode(local.dns-names)}
dnsNames: ${jsonencode(local.dns_names)}
issuerRef:
name: "self-sign"
kind: "ClusterIssuer"
@@ -47,7 +47,7 @@ resource "authentik_provider_saml" "dolibarr" {
name = "dolibarr-${var.instance}-saml"
authentication_flow = data.authentik_flow.default-authentication-flow.id
authorization_flow = data.authentik_flow.default-authorization-flow.id
acs_url = "https://${var.sub-domain}.${var.domain-name}/custom/samlconnector/acs.php?entity=1&fk_idp=0"
acs_url = "https://${var.sub_domain}.${var.domain_name}/custom/samlconnector/acs.php?entity=1&fk_idp=0"
property_mappings = data.authentik_property_mapping_saml.saml_maps.ids
name_id_mapping = data.authentik_property_mapping_saml.saml_name.id
signing_kp = data.authentik_certificate_key_pair.generated.id

10
apps/gitea/index.yaml
View File

@@ -156,7 +156,7 @@ options:
default: 2Gi
type: string
type: object
ssh-sub-domain:
ssh-sub_domain:
default: git
examples:
- git
@@ -185,12 +185,12 @@ options:
default: 10Gi
type: string
type: object
app-group:
app_group:
default: dev
examples:
- dev
type: string
ingress-class:
ingress_class:
default: traefik
examples:
- traefik
@@ -301,7 +301,7 @@ options:
default: false
type: boolean
type: object
sub-domain:
sub_domain:
default: git
examples:
- git
@@ -351,7 +351,7 @@ options:
default: false
type: boolean
type: object
domain-name:
domain_name:
default: your_company.com
examples:
- your_company.com

8
apps/gitea/inline-config.tf
View File

@@ -43,15 +43,15 @@ ROOT=/data/git/gitea-repositories
EOF
server = <<-EOF
APP_DATA_PATH=/data
DOMAIN=${var.sub-domain}.${var.domain-name}
DOMAIN=${var.sub_domain}.${var.domain_name}
ENABLE_PPROF=false
HTTP_PORT=3000
PROTOCOL=http
ROOT_URL=https://${var.sub-domain}.${var.domain-name}
SSH_DOMAIN=${var.sub-domain}.${var.domain-name}
ROOT_URL=https://${var.sub_domain}.${var.domain_name}
SSH_DOMAIN=${var.sub_domain}.${var.domain_name}
SSH_LISTEN_PORT=2222
SSH_PORT=${var.ssh-port}
SSH_DOMAIN=${var.ssh-sub-domain}.${var.domain-name}
SSH_DOMAIN=${var.ssh-sub_domain}.${var.domain_name}
START_SSH_SERVER=true
EOF
ui = <<-EOF

16
apps/gitea/presentation.tf
View File

@@ -1,7 +1,7 @@
locals {
dns-name = "${var.sub-domain}.${var.domain-name}"
dns-names = [local.dns-name]
app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
dns_name = "${var.sub_domain}.${var.domain_name}"
dns_names = [local.dns_name]
app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
icon = "assets/img/logo.svg"
request_headers = {
"Content-Type" = "application/json"
@@ -34,9 +34,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 = {
@@ -48,8 +48,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
protocol_provider = module.oauth2.provider-id
providers = {
@@ -63,7 +63,7 @@ module "oauth2" {
instance = var.instance
namespace = var.namespace
labels = local.common-labels
dns-name = local.dns-name
dns_name = local.dns_name
redirect-path = "user/oauth2/vynil/callback"
providers = {
kubernetes = kubernetes

6
apps/gitea/redis.tf
View File

@@ -13,7 +13,7 @@ resource "kubectl_manifest" "prj_redis" {
labels: ${jsonencode(local.redis-labels)}
spec:
kubernetesConfig:
image: "${var.redis.image}"
image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}"
imagePullPolicy: "IfNotPresent"
storage:
volumeClaimTemplate:
@@ -21,10 +21,10 @@ resource "kubectl_manifest" "prj_redis" {
accessModes: ["ReadWriteOnce"]
resources:
requests:
storage: "${var.redis.storage}"
storage: "${var.storage.redis}"
redisExporter:
enabled: ${var.redis.exporter.enabled}
image: "${var.redis.exporter.image}"
image: "${var.images.redis_exporter.registry}/${var.images.redis_exporter.repository}:${var.images.redis_exporter.tag}"
securityContext:
runAsUser: 1000
fsGroup: 1000

8
apps/gramo/index.yaml
View File

@@ -11,12 +11,12 @@ options:
examples:
- your-company
type: string
ingress-class:
ingress_class:
default: traefik
examples:
- traefik
type: string
sub-domain:
sub_domain:
default: gramo
examples:
- gramo
@@ -70,7 +70,7 @@ options:
examples:
- false
type: boolean
domain-name:
domain_name:
default: your_company.com
examples:
- your_company.com
@@ -85,7 +85,7 @@ options:
examples:
- letsencrypt-prod
type: string
app-group:
app_group:
default: infra
examples:
- infra

20
apps/gramo/presentation.tf
View File

@@ -1,7 +1,7 @@
locals {
dns-name = "${var.sub-domain}.${var.domain-name}"
dns-names = [local.dns-name]
app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
dns_name = "${var.sub_domain}.${var.domain_name}"
dns_names = [local.dns_name]
app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
icon = "icon.svg"
request_headers = {
"Content-Type" = "application/json"
@@ -34,10 +34,10 @@ 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 = ["forward-${local.app-name}"]
dns_names = local.dns_names
middlewares = ["forward-${local.app_name}"]
services = [local.service]
providers = {
kubectl = kubectl
@@ -48,8 +48,8 @@ module "application" {
source = "git::https://git.solidite.fr/vynil/kydah-modules.git//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
protocol_provider = module.forward.provider-id
providers = {
@@ -73,9 +73,9 @@ module "forward" {
instance = var.instance
domain = var.domain
namespace = var.namespace
ingress_class = var.ingress-class
ingress_class = var.ingress_class
labels = local.common-labels
dns_names = local.dns-names
dns_names = local.dns_names
service = local.service
icon = local.icon
request_headers = local.request_headers

6
apps/k8s-api/index.yaml
View File

@@ -6,7 +6,7 @@ metadata:
name: k8s-api
description: Access to the kubernetes api
options:
ingress-class:
ingress_class:
default: traefik
examples:
- traefik
@@ -21,12 +21,12 @@ options:
examples:
- letsencrypt-prod
type: string
domain-name:
domain_name:
default: your_company.com
examples:
- your_company.com
type: string
sub-domain:
sub_domain:
default: api
examples:
- api

6
apps/k8s-api/ingress.tf
View File

@@ -1,5 +1,5 @@
locals {
dns-names = ["${var.sub-domain}.${var.domain-name}"]
dns_names = ["${var.sub_domain}.${var.domain_name}"]
middlewares = []
services = [{
"kind" = "Service"
@@ -7,7 +7,7 @@ locals {
"namespace" = "default"
"port" = 443
}]
routes = [ for v in local.dns-names : {
routes = [ for v in local.dns_names : {
"kind" = "Rule"
"match" = "Host(`${v}`)"
"middlewares" = local.middlewares
@@ -25,7 +25,7 @@ resource "kubectl_manifest" "prj_certificate" {
labels: ${jsonencode(local.common-labels)}
spec:
secretName: "${var.instance}-cert"
dnsNames: ${jsonencode(local.dns-names)}
dnsNames: ${jsonencode(local.dns_names)}
issuerRef:
name: "${var.issuer}"
kind: "ClusterIssuer"

2
apps/nextcloud/collabora.tf
View File

@@ -36,7 +36,7 @@ resource "kubectl_manifest" "collabora_deploy" {
imagePullPolicy: "${var.images.collabora.pullPolicy}"
env:
- name: aliasgroup1
value: "https://${local.dns-name}"
value: "https://${local.dns_name}"
- name: DONT_GEN_SSL_CERT
value: "true"
- name: extra_params

6
apps/nextcloud/configs.tf
View File

@@ -17,7 +17,7 @@ locals {
fi
}
run_as ./occ --no-warnings config:system:set trusted_domains 0 --value=nextcloud
run_as ./occ --no-warnings config:system:set trusted_domains 1 --value="${local.dns-name}"
run_as ./occ --no-warnings config:system:set trusted_domains 1 --value="${local.dns_name}"
run_as ./occ app:install user_oidc ||:
run_as ./occ user_oidc:provider "$${OAUTH2_CONNECTOR_NAME}" --clientid="$${OAUTH2_CLIENT_ID}" \
--clientsecret="$${OAUTH2_CLIENT_SECRET}" \
@@ -41,14 +41,14 @@ locals {
var.apps.collabora?[
"run_as ./occ app:install richdocuments ||:",
"run_as ./occ app:enable richdocuments ||:",
"run_as ./occ config:app:set richdocuments wopi_url --value=\"https://collabora.${local.dns-name}/\"",
"run_as ./occ config:app:set richdocuments wopi_url --value=\"https://collabora.${local.dns_name}/\"",
"run_as ./occ config:app:set richdocuments federation_use_trusted_domains --value=yes",
"run_as ./occ richdocuments:activate-config ||:",
]:["run_as ./occ app:disable richdocuments ||:"],
var.apps.onlyoffice?[
"run_as ./occ app:install onlyoffice ||:",
"run_as ./occ app:enable onlyoffice ||:",
"run_as ./occ --no-warnings config:app:set onlyoffice DocumentServerUrl --value=\"https://onlyoffice.${local.dns-name}/\"",
"run_as ./occ --no-warnings config:app:set onlyoffice DocumentServerUrl --value=\"https://onlyoffice.${local.dns_name}/\"",
"run_as ./occ --no-warnings config:app:set onlyoffice DocumentServerInternalUrl --value=\"http://${var.instance}-onlyoffice/\"",
"run_as ./occ --no-warnings config:app:set onlyoffice StorageUrl --value=\"http://nextcloud/\"",
"run_as ./occ --no-warnings config:app:set onlyoffice jwt_secret --value=\"$${ONLYOFFICE_JWT_SECRET}\"",

12
apps/nextcloud/datas.tf
View File

@@ -81,7 +81,7 @@ data "kustomization_overlay" "data" {
secretKeyRef:
name: "${var.instance}-${var.component}-pg-app"
- name: NEXTCLOUD_TRUSTED_DOMAINS
value: "${local.dns-name}"
value: "${local.dns_name}"
- name: REDIS_HOST
value: "${var.instance}-${var.component}-redis.${var.namespace}.svc"
- name: REDIS_HOST_PORT
@@ -134,12 +134,12 @@ data "kustomization_overlay" "data" {
httpGet:
httpHeaders:
- name: Host
value: "${local.dns-name}"
value: "${local.dns_name}"
livenessProbe:
httpGet:
httpHeaders:
- name: Host
value: "${local.dns-name}"
value: "${local.dns_name}"
EOF
}
patches {
@@ -163,7 +163,7 @@ data "kustomization_overlay" "data" {
imagePullPolicy: "${var.images.exporter.pullPolicy}"
env:
- name: NEXTCLOUD_SERVER
value: "https://${local.dns-name}"
value: "https://${local.dns_name}"
- name: NEXTCLOUD_TLS_SKIP_VERIFY
value: "${var.issuer=="letsencrypt-prod"?"false":"true"}"
EOF
@@ -182,10 +182,10 @@ data "kustomization_overlay" "data" {
k8up.io/backup: "true"
spec:
accessModes:
- "${var.storage.accessMode}"
- "${var.storage.volume.accessMode}"
resources:
requests:
storage: "${var.storage.size}"
storage: "${var.storage.volume.size}"
EOF
}
patches {

8
apps/nextcloud/index.yaml
View File

@@ -21,7 +21,7 @@ options:
examples:
- your-company
type: string
app-group:
app_group:
default: ''
examples:
- ''
@@ -36,12 +36,12 @@ options:
examples:
- letsencrypt-prod
type: string
domain-name:
domain_name:
default: your_company.com
examples:
- your_company.com
type: string
ingress-class:
ingress_class:
default: traefik
examples:
- traefik
@@ -497,7 +497,7 @@ options:
default: '14'
type: string
type: object
sub-domain:
sub_domain:
default: files
examples:
- files

28
apps/nextcloud/presentation.tf
View File

@@ -1,9 +1,9 @@
locals {
dns-name = "${var.sub-domain}.${var.domain-name}"
dns-collabora = "collabora.${local.dns-name}"
dns-onlyoffice = "onlyoffice.${local.dns-name}"
dns-names = [local.dns-name]
app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
dns_name = "${var.sub_domain}.${var.domain_name}"
dns-collabora = "collabora.${local.dns_name}"
dns-onlyoffice = "onlyoffice.${local.dns_name}"
dns_names = [local.dns_name]
app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
icon = "apps/theming/favicon"
service = {
"name" = "${var.component}"
@@ -31,9 +31,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 = ["${var.instance}-sslenforce", "${var.instance}-redirectdav", "${var.instance}-redirectindex"]
service = local.service
providers = {
@@ -45,8 +45,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
protocol_provider = module.oauth2.provider-id
providers = {
@@ -60,7 +60,7 @@ module "oauth2" {
instance = var.instance
namespace = var.namespace
labels = local.common-labels
dns-name = local.dns-name
dns_name = local.dns_name
redirect-path = "apps/user_oidc/code"
providers = {
kubernetes = kubernetes
@@ -90,9 +90,9 @@ module "collabora-ingress" {
instance = var.instance
namespace = var.namespace
issuer = var.issuer
ingress-class = var.ingress-class
ingress_class = var.ingress_class
labels = local.collabora-labels
dns-names = [local.dns-collabora]
dns_names = [local.dns-collabora]
middlewares = []
service = local.collabora-service
providers = {
@@ -121,9 +121,9 @@ module "onlyoffice-ingress" {
instance = var.instance
namespace = var.namespace
issuer = var.issuer
ingress-class = var.ingress-class
ingress_class = var.ingress_class
labels = local.onlyoffice-labels
dns-names = [local.dns-onlyoffice]
dns_names = [local.dns-onlyoffice]
middlewares = []
service = local.onlyoffice-service
providers = {

6
apps/nextcloud/redis.tf
View File

@@ -13,7 +13,7 @@ resource "kubectl_manifest" "prj_redis" {
labels: ${jsonencode(local.redis-labels)}
spec:
kubernetesConfig:
image: "${var.redis.image}"
image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}"
imagePullPolicy: "IfNotPresent"
storage:
volumeClaimTemplate:
@@ -21,10 +21,10 @@ resource "kubectl_manifest" "prj_redis" {
accessModes: ["ReadWriteOnce"]
resources:
requests:
storage: "${var.redis.storage}"
storage: "${var.storage.redis}"
redisExporter:
enabled: ${var.redis.exporter.enabled}
image: "${var.redis.exporter.image}"
image: "${var.images.redis_exporter.registry}/${var.images.redis_exporter.repository}:${var.images.redis_exporter.tag}"
securityContext:
runAsUser: 1000
fsGroup: 1000

8
apps/okd/index.yaml
View File

@@ -6,12 +6,12 @@ metadata:
name: okd
description: null
options:
domain-name:
domain_name:
default: your_company.com
examples:
- your_company.com
type: string
sub-domain:
sub_domain:
default: okd
examples:
- okd
@@ -65,7 +65,7 @@ options:
examples:
- letsencrypt-prod
type: string
app-group:
app_group:
default: infra
examples:
- infra
@@ -75,7 +75,7 @@ options:
examples:
- false
type: boolean
ingress-class:
ingress_class:
default: traefik
examples:
- traefik

20
apps/okd/presentation.tf
View File

@@ -1,7 +1,7 @@
locals {
dns-name = "${var.sub-domain}.${var.domain-name}"
dns-names = [local.dns-name]
app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
dns_name = "${var.sub_domain}.${var.domain_name}"
dns_names = [local.dns_name]
app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
icon = "static/assets/okd-logo.svg"
request_headers = {
"Content-Type" = "application/json"
@@ -34,10 +34,10 @@ 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 = ["forward-${local.app-name}"]
dns_names = local.dns_names
middlewares = ["forward-${local.app_name}"]
service = local.service
providers = {
kubectl = kubectl
@@ -48,8 +48,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
protocol_provider = module.forward.provider-id
providers = {
@@ -73,9 +73,9 @@ module "forward" {
instance = var.instance
domain = var.domain
namespace = var.namespace
ingress-class = var.ingress-class
ingress_class = var.ingress_class
labels = local.common-labels
dns-names = local.dns-names
dns_names = local.dns_names
service = local.service
icon = local.icon
request_headers = local.request_headers

6
apps/sonar/index.yaml
View File

@@ -6,12 +6,12 @@ metadata:
name: sonar
description: null
options:
ingress-class:
ingress_class:
default: traefik
examples:
- traefik
type: string
sub-domain:
sub_domain:
default: sonar
examples:
- sonar
@@ -78,7 +78,7 @@ options:
examples:
- your-company
type: string
domain-name:
domain_name:
default: your_company.com
examples:
- your_company.com

8
apps/traefik-ui/index.yaml
View File

@@ -11,7 +11,7 @@ options:
examples:
- letsencrypt-prod
type: string
app-group:
app_group:
default: infra
examples:
- infra
@@ -21,17 +21,17 @@ options:
examples:
- your-company
type: string
ingress-class:
ingress_class:
default: traefik
examples:
- traefik
type: string
sub-domain:
sub_domain:
default: traefik
examples:
- traefik
type: string
domain-name:
domain_name:
default: your_company.com
examples:
- your_company.com

20
apps/traefik-ui/presentation.tf
View File

@@ -1,7 +1,7 @@
locals {
dns-name = "${var.sub-domain}.${var.domain-name}"
dns-names = [local.dns-name]
app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
dns_name = "${var.sub_domain}.${var.domain_name}"
dns_names = [local.dns_name]
app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
icon = "dashboard/statics/icons/favicon-96x96.png"
request_headers = {
"Content-Type" = "application/json"
@@ -21,10 +21,10 @@ 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 = ["forward-${local.app-name}"]
dns_names = local.dns_names
middlewares = ["forward-${local.app_name}"]
service = local.service
providers = {
kubectl = kubectl
@@ -35,8 +35,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
protocol_provider = module.forward.provider-id
providers = {
@@ -60,9 +60,9 @@ module "forward" {
instance = var.instance
domain = var.domain
namespace = var.namespace
ingress-class = var.ingress-class
ingress_class = var.ingress_class
labels = local.common-labels
dns-names = local.dns-names
dns_names = local.dns_names
service = local.service
icon = local.icon
request_headers = local.request_headers

4
apps/woodpecker/datas.tf
View File

@@ -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

2
apps/woodpecker/gitea_token.tf
View File

@@ -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"
]
}

8
apps/woodpecker/index.yaml
View File

@@ -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

12
apps/woodpecker/presentation.tf
View File

@@ -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