fix

2023-09-21 12:44:34 +02:00
parent 287b4b8caa
commit cfed1eb857
23 changed files with 1009 additions and 780 deletions
--- a/meta/domain-apps/apps.tf
+++ b/meta/domain-apps/apps.tf
@@ -7,13 +7,19 @@ locals {
      "vynil.solidite.fr/ingress" = var.ingress-class
    }
    global = {
-        "domain" = var.namespace
-        "domain-name" = var.domain-name
-        "issuer" = var.issuer
+        "domain"        = var.namespace
+        "domain-name"   = var.domain-name
+        "issuer"        = var.issuer
        "ingress-class" = var.ingress-class
-        "backups"        = var.backups
+        "backups"       = var.backups
    }
-    nextcloud = { for k, v in var.nextcloud : k => v if k!="enable" }
+    nextcloud = { for k, v in var.nextcloud : k => v if contains(["enable","storage"],k) }
+    nextcloud-storage = merge({
+      "storage" = {
+        "size" = "10Gi"
+        "accessMode" = var.storage-classes.FilesystemReadWriteMany!=""?"ReadWriteMany":"ReadWriteOnce"
+      }
+    }, { for k, v in var.nextcloud : k => v if k=="storage" })
 }

 resource "kubernetes_namespace_v1" "files-ns" {
@@ -39,6 +45,6 @@ resource "kubectl_manifest" "nextcloud" {
      distrib: "${var.distributions.domain}"
      category: "apps"
      component: "nextcloud"
-      options: ${jsonencode(merge(local.global, local.nextcloud))}
+      options: ${jsonencode(merge(local.global, local.nextcloud-storage, local.nextcloud))}
  EOF
 }
--- a/meta/domain-apps/index.yaml
+++ b/meta/domain-apps/index.yaml
@@ -6,51 +6,11 @@ metadata:
  name: domain-apps
  description: null
 options:
-  nextcloud:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
  domain:
    default: your-company
    examples:
    - your-company
    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
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
  backups:
    default:
      enable: false
@@ -81,6 +41,71 @@ options:
        default: backup-settings
        type: string
    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
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  nextcloud:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  storage-classes:
+    default:
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    examples:
+    - BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    properties:
+      BlockReadWriteMany:
+        default: ''
+        type: string
+      BlockReadWriteOnce:
+        default: ''
+        type: string
+      FilesystemReadWriteMany:
+        default: ''
+        type: string
+      FilesystemReadWriteOnce:
+        default: ''
+        type: string
+    type: object
 dependencies: []
 providers:
  kubernetes: true
--- a/meta/domain-auth/index.yaml
+++ b/meta/domain-auth/index.yaml
@@ -6,71 +6,6 @@ metadata:
  name: domain-auth
  description: null
 options:
-  authentik:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  authentik-ldap:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  backups:
-    default:
-      enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      secret-key: s3-secret
-      secret-name: backup-settings
-    examples:
-    - enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      secret-key: s3-secret
-      secret-name: backup-settings
-    properties:
-      enable:
-        default: false
-        type: boolean
-      endpoint:
-        default: ''
-        type: string
-      key-id-key:
-        default: s3-id
-        type: string
-      secret-key:
-        default: s3-secret
-        type: string
-      secret-name:
-        default: backup-settings
-        type: string
-    type: object
  distributions:
    default:
      core: core
@@ -101,6 +36,96 @@ options:
    examples:
    - letsencrypt-prod
    type: string
+  authentik:
+    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
+  authentik-ldap:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      secret-key: s3-secret
+      secret-name: backup-settings
+    examples:
+    - enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      secret-key: s3-secret
+      secret-name: backup-settings
+    properties:
+      enable:
+        default: false
+        type: boolean
+      endpoint:
+        default: ''
+        type: string
+      key-id-key:
+        default: s3-id
+        type: string
+      secret-key:
+        default: s3-secret
+        type: string
+      secret-name:
+        default: backup-settings
+        type: string
+    type: object
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  storage-classes:
+    default:
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    examples:
+    - BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    properties:
+      BlockReadWriteMany:
+        default: ''
+        type: string
+      BlockReadWriteOnce:
+        default: ''
+        type: string
+      FilesystemReadWriteMany:
+        default: ''
+        type: string
+      FilesystemReadWriteOnce:
+        default: ''
+        type: string
+    type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
 dependencies: []
 providers:
  kubernetes: true
--- a/meta/domain-ci/apps.tf
+++ b/meta/domain-ci/apps.tf
@@ -13,8 +13,19 @@ locals {
        "ingress-class"  = var.ingress-class
        "backups"        = var.backups
    }
-    gitea = { for k, v in var.gitea : k => v if k!="enable" }
+    gitea = { for k, v in var.gitea : k => v if contains(["enable","storage-server","storage-agent"],k) }
    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"
+      }
+      "storage-agent" = {
+        "size" = "10Gi"
+        "writeMany" = var.storage-classes.FilesystemReadWriteMany!=""?"true":"false"
+        "storageClass" = var.storage-classes.FilesystemReadWriteMany!=""?var.storage-classes.FilesystemReadWriteMany:var.storage-classes.FilesystemReadWriteOnce
+      }
+    }, { for k, v in var.dolibarr : k => v if contains(["storage-server","storage-agent"],k) })
 }

 resource "kubernetes_namespace_v1" "ci-ns" {
@@ -58,6 +69,6 @@ resource "kubectl_manifest" "woodpecker" {
      distrib: "${var.distributions.domain}"
      category: "apps"
      component: "woodpecker"
-      options: ${jsonencode(merge(local.global, local.woodpecker))}
+      options: ${jsonencode(merge(local.global, local.woodpecker-storage, local.woodpecker))}
  EOF
 }
--- a/meta/domain-ci/index.yaml
+++ b/meta/domain-ci/index.yaml
@@ -6,51 +6,6 @@ metadata:
  name: domain-ci
  description: null
 options:
-  gitea:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    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
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
  backups:
    default:
      enable: false
@@ -81,15 +36,85 @@ options:
        default: backup-settings
        type: string
    type: object
+  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
  domain-name:
    default: your_company.com
    examples:
    - your_company.com
    type: string
-  issuer:
-    default: letsencrypt-prod
+  woodpecker:
+    default:
+      enable: false
    examples:
-    - letsencrypt-prod
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+  storage-classes:
+    default:
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    examples:
+    - BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    properties:
+      BlockReadWriteMany:
+        default: ''
+        type: string
+      BlockReadWriteOnce:
+        default: ''
+        type: string
+      FilesystemReadWriteMany:
+        default: ''
+        type: string
+      FilesystemReadWriteOnce:
+        default: ''
+        type: string
+    type: object
+  gitea:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
    type: string
 dependencies: []
 providers:
--- a/meta/domain-erp/apps.tf
+++ b/meta/domain-erp/apps.tf
@@ -13,7 +13,14 @@ locals {
        "ingress-class" = var.ingress-class
        "backups"       = var.backups
    }
-    dolibarr = { for k, v in var.dolibarr : k => v if k!="enable" }
+    dolibarr = { for k, v in var.dolibarr : k => v if contains(["enable","storage"],k) }
+    doli-storage = merge({
+      "storage" = {
+        "size" = "10Gi"
+        "accessMode" = var.storage-classes.FilesystemReadWriteMany!=""?"ReadWriteMany":"ReadWriteOnce"
+        "type" = "Filesystem"
+      }
+    }, { for k, v in var.dolibarr : k => v if k=="storage" })
 }

 resource "kubernetes_namespace_v1" "erp-ns" {
@@ -39,6 +46,6 @@ resource "kubectl_manifest" "dolibarr" {
      distrib: "${var.distributions.domain}"
      category: "apps"
      component: "dolibarr"
-      options: ${jsonencode(merge(local.global, local.dolibarr))}
+      options: ${jsonencode(merge(local.global, local.doli-storage, local.dolibarr))}
  EOF
 }
--- a/meta/domain-erp/index.yaml
+++ b/meta/domain-erp/index.yaml
@@ -11,21 +11,6 @@ options:
    examples:
    - your-company
    type: string
-  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
  distributions:
    default:
      core: core
@@ -71,6 +56,36 @@ options:
        default: backup-settings
        type: string
    type: object
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  storage-classes:
+    default:
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    examples:
+    - BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    properties:
+      BlockReadWriteMany:
+        default: ''
+        type: string
+      BlockReadWriteOnce:
+        default: ''
+        type: string
+      FilesystemReadWriteMany:
+        default: ''
+        type: string
+      FilesystemReadWriteOnce:
+        default: ''
+        type: string
+    type: object
  dolibarr:
    default:
      enable: true
@@ -81,6 +96,16 @@ options:
        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
 dependencies: []
 providers:
  kubernetes: true
--- a/meta/domain-infra/apps.tf
+++ b/meta/domain-infra/apps.tf
@@ -12,6 +12,7 @@ locals {
        "issuer"        = var.issuer
        "ingress-class" = var.ingress-class
        "backups"       = var.backups
+        "app-group"     = var.app-group
    }
    traefik = { for k, v in var.traefik : k => v if k!="enable" }
    dns = { for k, v in var.dns : k => v if k!="enable" }
@@ -52,7 +53,7 @@ resource "kubectl_manifest" "traefik" {
    apiVersion: "vynil.solidite.fr/v1"
    kind: "Install"
    metadata:
-      name: "traefik-ui-${var.namespace}"
+      name: "${var.namespace}"
      namespace: "${var.traefik.namespace}"
      labels: ${jsonencode(local.common-labels)}
    spec:
--- a/meta/domain-infra/index.yaml
+++ b/meta/domain-infra/index.yaml
@@ -6,71 +6,6 @@ metadata:
  name: domain-infra
  description: null
 options:
-  dns:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-  traefik:
-    default:
-      enable: false
-      namespace: traefik
-    examples:
-    - enable: false
-      namespace: traefik
-    properties:
-      enable:
-        default: false
-        type: boolean
-      namespace:
-        default: traefik
-        type: string
-    type: object
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  api:
-    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
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
  backups:
    default:
      enable: false
@@ -101,11 +36,106 @@ options:
        default: backup-settings
        type: string
    type: object
+  app-group:
+    default: infra
+    examples:
+    - infra
+    type: string
+  traefik:
+    default:
+      enable: false
+      namespace: traefik
+    examples:
+    - enable: false
+      namespace: traefik
+    properties:
+      enable:
+        default: false
+        type: boolean
+      namespace:
+        default: traefik
+        type: string
+    type: object
+  dns:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+  api:
+    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
  domain-name:
    default: your_company.com
    examples:
    - your_company.com
    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  storage-classes:
+    default:
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    examples:
+    - BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    properties:
+      BlockReadWriteMany:
+        default: ''
+        type: string
+      BlockReadWriteOnce:
+        default: ''
+        type: string
+      FilesystemReadWriteMany:
+        default: ''
+        type: string
+      FilesystemReadWriteOnce:
+        default: ''
+        type: string
+    type: object
 dependencies: []
 providers:
  kubernetes: true
--- a/meta/domain/index.yaml
+++ b/meta/domain/index.yaml
@@ -6,11 +6,78 @@ metadata:
  name: domain
  description: null
 options:
-  ingress-class:
-    default: traefik
+  distributions:
+    default:
+      core: core
+      domain: domain
    examples:
-    - traefik
-    type: string
+    - core: core
+      domain: domain
+    properties:
+      core:
+        default: core
+        type: string
+      domain:
+        default: domain
+        type: string
+    type: object
+  erp:
+    default:
+      dolibarr:
+        enable: true
+      enable: false
+    examples:
+    - dolibarr:
+        enable: true
+      enable: false
+    properties:
+      dolibarr:
+        default:
+          enable: true
+        properties:
+          enable:
+            default: true
+            type: boolean
+        type: object
+      enable:
+        default: false
+        type: boolean
+    type: object
+  storage-classes:
+    default:
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    examples:
+    - BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    properties:
+      BlockReadWriteMany:
+        default: ''
+        type: string
+      BlockReadWriteOnce:
+        default: ''
+        type: string
+      FilesystemReadWriteMany:
+        default: ''
+        type: string
+      FilesystemReadWriteOnce:
+        default: ''
+        type: string
+    type: object
+  auth:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
  backups:
    default:
      enable: false
@@ -41,85 +108,38 @@ options:
        default: backup-settings
        type: string
    type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
  domain-name:
    default: your_company.com
    examples:
    - your_company.com
    type: string
-  distributions:
-    default:
-      core: core
-      domain: domain
+  issuer:
+    default: letsencrypt-prod
    examples:
-    - core: core
-      domain: domain
-    properties:
-      core:
-        default: core
-        type: string
-      domain:
-        default: domain
-        type: string
-    type: object
-  auth:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-  ci:
+    - letsencrypt-prod
+    type: string
+  infra:
    default:
      enable: false
-      gitea:
-        enable: true
+      traefik:
+        enable: false
    examples:
    - enable: false
-      gitea:
-        enable: true
+      traefik:
+        enable: false
    properties:
      enable:
        default: false
        type: boolean
-      gitea:
+      traefik:
        default:
-          enable: true
+          enable: false
        properties:
          enable:
-            default: true
+            default: false
            type: boolean
        type: object
    type: object
-  erp:
-    default:
-      dolibarr:
-        enable: true
-      enable: false
-    examples:
-    - dolibarr:
-        enable: true
-      enable: false
-    properties:
-      dolibarr:
-        default:
-          enable: true
-        properties:
-          enable:
-            default: true
-            type: boolean
-        type: object
-      enable:
-        default: false
-        type: boolean
-    type: object
  apps:
    default:
      enable: false
@@ -142,29 +162,44 @@ options:
            type: boolean
        type: object
    type: object
-  infra:
+  mail:
    default:
      enable: false
-      traefik:
-        enable: false
    examples:
    - enable: false
-      traefik:
-        enable: false
    properties:
      enable:
        default: false
        type: boolean
-      traefik:
+    type: object
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  ci:
+    default:
+      enable: false
+      gitea:
+        enable: true
+    examples:
+    - enable: false
+      gitea:
+        enable: true
+    properties:
+      enable:
+        default: false
+        type: boolean
+      gitea:
        default:
-          enable: false
+          enable: true
        properties:
          enable:
-            default: false
+            default: true
            type: boolean
        type: object
    type: object
-  mail:
+  devspaces:
    default:
      enable: false
    examples:
--- a/meta/domain/installs.tf
+++ b/meta/domain/installs.tf
@@ -6,6 +6,7 @@ locals {
        "ingress-class"  = var.ingress-class
        "distributions"  = var.distributions
        "backups"        = var.backups
+        "storage-classes"= var.storage-classes
    }
    annotations = {
      "vynil.solidite.fr/meta" = var.component