From e1cd2ea8f37c826464730da0f39afa33aa11edab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Sat, 2 Dec 2023 20:51:41 +0100 Subject: [PATCH] fix --- apps/code-server/datas.tf | 1 + apps/code-server/index.yaml | 100 ++++++++++----------- apps/dbgate/datas.tf | 2 + apps/dbgate/index.yaml | 130 +++++++++++++-------------- apps/okd/datas.tf | 2 + apps/okd/index.yaml | 38 ++++---- apps/traefik-ui/datas.tf | 2 + apps/traefik-ui/index.yaml | 32 +++---- share/accounts-management/datas.tf | 2 + share/accounts-management/index.yaml | 34 +++---- share/authentik-forward/datas.tf | 2 + share/authentik-forward/index.yaml | 18 ++-- share/authentik-ldap/datas.tf | 2 + share/authentik-ldap/index.yaml | 2 + share/division/datas.tf | 2 + share/division/index.yaml | 10 +-- 16 files changed, 199 insertions(+), 180 deletions(-) diff --git a/apps/code-server/datas.tf b/apps/code-server/datas.tf index 024fc34..856efae 100644 --- a/apps/code-server/datas.tf +++ b/apps/code-server/datas.tf @@ -19,5 +19,6 @@ data "kubernetes_secret_v1" "authentik" { data "kustomization_overlay" "data" { namespace = var.namespace + common_labels = local.common-labels resources = [] } diff --git a/apps/code-server/index.yaml b/apps/code-server/index.yaml index f45c602..32b7d53 100644 --- a/apps/code-server/index.yaml +++ b/apps/code-server/index.yaml @@ -6,6 +6,21 @@ metadata: name: code-server description: null options: + admin: + default: + cluster: false + namespace: false + examples: + - cluster: false + namespace: false + properties: + cluster: + default: false + type: boolean + namespace: + default: false + type: boolean + type: object images: default: codeserver: @@ -45,11 +60,46 @@ options: type: number type: object type: object + domain: + default: your-company + examples: + - your-company + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + sub-domain: + default: code + examples: + - code + type: string + domain-name: + default: your_company.com + examples: + - your_company.com + type: string timezone: default: Europe/Paris examples: - Europe/Paris type: string + ingress-class: + default: traefik + examples: + - traefik + type: string + no-editor: + default: false + examples: + - false + type: boolean + app-group: + default: dev + examples: + - dev + type: string storage: default: accessMode: ReadWriteOnce @@ -77,56 +127,6 @@ options: - Block type: string type: object - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string - domain: - default: your-company - examples: - - your-company - type: string - no-editor: - default: false - examples: - - false - type: boolean - sub-domain: - default: code - examples: - - code - type: string - app-group: - default: dev - examples: - - dev - type: string - admin: - default: - cluster: false - namespace: false - examples: - - cluster: false - namespace: false - properties: - cluster: - default: false - type: boolean - namespace: - default: false - type: boolean - type: object - domain-name: - default: your_company.com - examples: - - your_company.com - type: string dependencies: - dist: null category: share diff --git a/apps/dbgate/datas.tf b/apps/dbgate/datas.tf index f084bc2..72119ca 100644 --- a/apps/dbgate/datas.tf +++ b/apps/dbgate/datas.tf @@ -25,5 +25,7 @@ data "kubernetes_ingress_v1" "authentik" { } data "kustomization_overlay" "data" { + namespace = var.namespace + common_labels = local.common-labels resources = [] } diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml index c372f94..f7a91b4 100644 --- a/apps/dbgate/index.yaml +++ b/apps/dbgate/index.yaml @@ -6,35 +6,16 @@ metadata: name: dbgate description: null options: - sub-domain: - default: dbgate + domain: + default: your-company examples: - - dbgate - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod + - your-company type: string app-group: default: dev examples: - dev type: string - redis: - default: [] - examples: - - [] - items: - properties: - name: - default: '' - type: string - namespace: - default: '' - type: string - type: object - type: array maria: default: [] examples: @@ -64,6 +45,45 @@ options: type: string type: object type: array + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + mongo: + default: [] + examples: + - [] + items: + properties: + dbname: + default: '' + type: string + name: + default: '' + type: string + namespace: + default: '' + type: string + secret: + properties: + key: + default: '' + type: string + name: + default: '' + type: string + type: object + username: + default: '' + type: string + type: object + type: array + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string images: default: dbgate: @@ -103,35 +123,16 @@ options: type: string type: object type: object - mongo: - default: [] + sub-domain: + default: dbgate examples: - - [] - items: - properties: - dbname: - default: '' - type: string - name: - default: '' - type: string - namespace: - default: '' - type: string - secret: - properties: - key: - default: '' - type: string - name: - default: '' - type: string - type: object - username: - default: '' - type: string - type: object - type: array + - dbgate + type: string + ingress-class: + default: traefik + examples: + - traefik + type: string storage: default: accessMode: ReadWriteOnce @@ -159,6 +160,20 @@ options: - Block type: string type: object + redis: + default: [] + examples: + - [] + items: + properties: + name: + default: '' + type: string + namespace: + default: '' + type: string + type: object + type: array pg: default: [] examples: @@ -188,21 +203,6 @@ options: type: string type: object type: array - ingress-class: - default: traefik - examples: - - traefik - type: string - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - domain: - default: your-company - examples: - - your-company - type: string dependencies: - dist: null category: share diff --git a/apps/okd/datas.tf b/apps/okd/datas.tf index ac5f6fe..856efae 100644 --- a/apps/okd/datas.tf +++ b/apps/okd/datas.tf @@ -18,5 +18,7 @@ data "kubernetes_secret_v1" "authentik" { } data "kustomization_overlay" "data" { + namespace = var.namespace + common_labels = local.common-labels resources = [] } diff --git a/apps/okd/index.yaml b/apps/okd/index.yaml index 7c9ca26..53c6cf3 100644 --- a/apps/okd/index.yaml +++ b/apps/okd/index.yaml @@ -6,6 +6,16 @@ metadata: name: okd description: null options: + namespaces: + default: [] + items: + type: string + type: array + domain-name: + default: your_company.com + examples: + - your_company.com + type: string sub-domain: default: okd examples: @@ -16,16 +26,11 @@ options: examples: - traefik type: string - domain: - default: your-company + issuer: + default: letsencrypt-prod examples: - - your-company + - letsencrypt-prod type: string - namespaces: - default: [] - items: - type: string - type: array images: default: okd: @@ -69,25 +74,20 @@ options: type: string type: object type: object - domain-name: - default: your_company.com + app-group: + default: infra examples: - - your_company.com + - infra type: string cluster-admin: default: false examples: - false type: boolean - issuer: - default: letsencrypt-prod + domain: + default: your-company examples: - - letsencrypt-prod - type: string - app-group: - default: infra - examples: - - infra + - your-company type: string dependencies: - dist: null diff --git a/apps/traefik-ui/datas.tf b/apps/traefik-ui/datas.tf index ac5f6fe..856efae 100644 --- a/apps/traefik-ui/datas.tf +++ b/apps/traefik-ui/datas.tf @@ -18,5 +18,7 @@ data "kubernetes_secret_v1" "authentik" { } data "kustomization_overlay" "data" { + namespace = var.namespace + common_labels = local.common-labels resources = [] } diff --git a/apps/traefik-ui/index.yaml b/apps/traefik-ui/index.yaml index 75fba7f..33511b0 100644 --- a/apps/traefik-ui/index.yaml +++ b/apps/traefik-ui/index.yaml @@ -6,36 +6,36 @@ metadata: name: traefik-ui description: Access to the Traefik UI options: - ingress-class: - default: traefik + domain: + default: your-company examples: - - traefik - type: string - app-group: - default: infra - examples: - - infra - type: string - domain-name: - default: your_company.com - examples: - - your_company.com + - your-company type: string sub-domain: default: traefik examples: - traefik type: string - domain: - default: your-company + ingress-class: + default: traefik examples: - - your-company + - traefik + type: string + domain-name: + default: your_company.com + examples: + - your_company.com type: string issuer: default: letsencrypt-prod examples: - letsencrypt-prod type: string + app-group: + default: infra + examples: + - infra + type: string dependencies: - dist: null category: share diff --git a/share/accounts-management/datas.tf b/share/accounts-management/datas.tf index 821c848..5f9c468 100644 --- a/share/accounts-management/datas.tf +++ b/share/accounts-management/datas.tf @@ -18,5 +18,7 @@ data "kubernetes_secret_v1" "authentik" { } data "kustomization_overlay" "data" { + namespace = var.namespace + common_labels = local.common-labels resources = [] } diff --git a/share/accounts-management/index.yaml b/share/accounts-management/index.yaml index 22ca2bd..8503bcb 100644 --- a/share/accounts-management/index.yaml +++ b/share/accounts-management/index.yaml @@ -6,23 +6,6 @@ metadata: name: accounts-management description: null options: - employes: - default: - apps: [] - examples: - - apps: [] - properties: - apps: - default: [] - items: - type: string - type: array - type: object - domain: - default: your-company - examples: - - your-company - type: string clients: default: apps: [] @@ -40,6 +23,23 @@ options: default: false type: boolean type: object + domain: + default: your-company + examples: + - your-company + type: string + employes: + default: + apps: [] + examples: + - apps: [] + properties: + apps: + default: [] + items: + type: string + type: array + type: object fournisseurs: default: apps: [] diff --git a/share/authentik-forward/datas.tf b/share/authentik-forward/datas.tf index 821c848..5f9c468 100644 --- a/share/authentik-forward/datas.tf +++ b/share/authentik-forward/datas.tf @@ -18,5 +18,7 @@ data "kubernetes_secret_v1" "authentik" { } data "kustomization_overlay" "data" { + namespace = var.namespace + common_labels = local.common-labels resources = [] } diff --git a/share/authentik-forward/index.yaml b/share/authentik-forward/index.yaml index 8dcc8bc..87a1b5e 100644 --- a/share/authentik-forward/index.yaml +++ b/share/authentik-forward/index.yaml @@ -6,6 +6,11 @@ metadata: name: authentik-forward description: null options: + ingress-class: + default: traefik + examples: + - traefik + type: string domain-name: default: your_company.com examples: @@ -13,20 +18,15 @@ options: type: string sub-domain: default: null - domain: - default: your-company - examples: - - your-company - type: string issuer: default: letsencrypt-prod examples: - letsencrypt-prod type: string - ingress-class: - default: traefik + domain: + default: your-company examples: - - traefik + - your-company type: string dependencies: - dist: null @@ -39,3 +39,5 @@ providers: postgresql: null restapi: null http: true + gitea: null +tfaddtype: null diff --git a/share/authentik-ldap/datas.tf b/share/authentik-ldap/datas.tf index 821c848..5f9c468 100644 --- a/share/authentik-ldap/datas.tf +++ b/share/authentik-ldap/datas.tf @@ -18,5 +18,7 @@ data "kubernetes_secret_v1" "authentik" { } data "kustomization_overlay" "data" { + namespace = var.namespace + common_labels = local.common-labels resources = [] } diff --git a/share/authentik-ldap/index.yaml b/share/authentik-ldap/index.yaml index a9f0bdb..b377d54 100644 --- a/share/authentik-ldap/index.yaml +++ b/share/authentik-ldap/index.yaml @@ -22,3 +22,5 @@ providers: postgresql: null restapi: null http: true + gitea: null +tfaddtype: null diff --git a/share/division/datas.tf b/share/division/datas.tf index 821c848..5f9c468 100644 --- a/share/division/datas.tf +++ b/share/division/datas.tf @@ -18,5 +18,7 @@ data "kubernetes_secret_v1" "authentik" { } data "kustomization_overlay" "data" { + namespace = var.namespace + common_labels = local.common-labels resources = [] } diff --git a/share/division/index.yaml b/share/division/index.yaml index 6c38be2..cc520ac 100644 --- a/share/division/index.yaml +++ b/share/division/index.yaml @@ -25,11 +25,6 @@ options: type: string type: object type: array - apps: - default: [] - items: - type: string - type: array parent: default: employes enum: @@ -39,6 +34,11 @@ options: examples: - employes type: string + apps: + default: [] + items: + type: string + type: array dependencies: - dist: null category: share