fix

2024-01-25 17:43:46 +01:00
parent e066715b9b
commit 0727fca591
124 changed files with 1848 additions and 1796 deletions
--- a/meta/domain-erp/apps.tf
+++ b/meta/domain-erp/apps.tf
@@ -6,6 +6,10 @@ locals {
      "vynil.solidite.fr/issuer" = var.issuer
      "vynil.solidite.fr/ingress" = var.ingress-class
    }
+    annotations_default = {
+      "vynil.solidite.fr/default/domain_name" = var.domain-name
+      "vynil.solidite.fr/default/*" = var.domain-name
+    }
    global = {
        "domain"        = var.namespace
        "domain-name"   = var.domain-name
@@ -27,7 +31,7 @@ locals {
 resource "kubernetes_namespace_v1" "erp-ns" {
  count = ( var.dolibarr.enable )? 1 : 0
  metadata {
-    annotations = local.annotations
+    annotations = merge(local.annotations, local.annotations_default)
    labels = merge(local.common-labels, local.annotations)
    name = "${var.namespace}-erp"
  }
--- a/meta/domain-erp/index.yaml
+++ b/meta/domain-erp/index.yaml
@@ -6,26 +6,6 @@ metadata:
  name: domain-erp
  description: null
 options:
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    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
  backups:
    default:
      enable: false
@@ -61,6 +41,48 @@ options:
    examples:
    - traefik
    type: string
+  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
+    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
+  dolibarr:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: apps
+    x-vynil-package: dolibarr
  storage-classes:
    default:
      BlockReadWriteMany: ''
@@ -86,28 +108,6 @@ options:
        default: ''
        type: string
    type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  dolibarr:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: apps
-    x-vynil-package: dolibarr
 dependencies: []
 providers:
  kubernetes: true
--- a/meta/domain-monitor/index.yaml
+++ b/meta/domain-monitor/index.yaml
@@ -6,7 +6,12 @@ metadata:
  name: domain-monitor
  description: null
 options:
-  dashboards-namespace:
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  alerts-containers:
    default:
      enable: true
    examples:
@@ -17,7 +22,106 @@ options:
        type: boolean
    type: object
    x-vynil-category: monitor
-    x-vynil-package: dashboards-namespace
+    x-vynil-package: alerts-containers
+  loki:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: loki
+  promtail:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: promtail
+  kube-state-metrics:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: kube-state-metrics
+  dashboards-cluster:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: dashboards-cluster
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  app-group:
+    default: monitor
+    examples:
+    - monitor
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  grafana:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: grafana
+  monitor-control-plan:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: monitor-control-plan
+  dashboards-workload:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: dashboards-workload
  backups:
    default:
      enable: false
@@ -48,7 +152,7 @@ options:
        default: backup-settings
        type: string
    type: object
-  alertmanager:
+  alerts-core:
    default:
      enable: true
    examples:
@@ -59,8 +163,8 @@ options:
        type: boolean
    type: object
    x-vynil-category: monitor
-    x-vynil-package: alertmanager
-  loki:
+    x-vynil-package: alerts-core
+  dashboards-namespace:
    default:
      enable: true
    examples:
@@ -71,24 +175,39 @@ options:
        type: boolean
    type: object
    x-vynil-category: monitor
-    x-vynil-package: loki
-  dashboards-workload:
-    default:
-      enable: true
+    x-vynil-package: dashboards-namespace
+  domain-name:
+    default: your_company.com
    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: dashboards-workload
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
+    - your_company.com
    type: string
+  dashboards-minimal:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: dashboards-minimal
+  distributions:
+    default:
+      core: core
+      domain: domain
+    examples:
+    - core: core
+      domain: domain
+    properties:
+      core:
+        default: core
+        type: string
+      domain:
+        default: domain
+        type: string
+    type: object
  storage-classes:
    default:
      BlockReadWriteMany: ''
@@ -114,47 +233,6 @@ options:
        default: ''
        type: string
    type: object
-  node-exporter:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: node-exporter
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  monitor-control-plan:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: monitor-control-plan
-  alerts-core:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: alerts-core
  prometheus:
    default:
      enable: true
@@ -167,7 +245,7 @@ options:
    type: object
    x-vynil-category: monitor
    x-vynil-package: prometheus
-  kube-state-metrics:
+  alertmanager:
    default:
      enable: true
    examples:
@@ -178,28 +256,8 @@ options:
        type: boolean
    type: object
    x-vynil-category: monitor
-    x-vynil-package: kube-state-metrics
-  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
-  alerts-containers:
+    x-vynil-package: alertmanager
+  node-exporter:
    default:
      enable: true
    examples:
@@ -210,65 +268,7 @@ options:
        type: boolean
    type: object
    x-vynil-category: monitor
-    x-vynil-package: alerts-containers
-  dashboards-minimal:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: dashboards-minimal
-  promtail:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: promtail
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  grafana:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: grafana
-  app-group:
-    default: monitor
-    examples:
-    - monitor
-    type: string
-  dashboards-cluster:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: dashboards-cluster
+    x-vynil-package: node-exporter
 dependencies: []
 providers:
  kubernetes: true