fix

share/accounts-management/datas.tf

@@ -1,7 +1,7 @@
 locals {
   authentik_url = "http://authentik.${var.domain}-auth.svc"
   authentik_token = data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]
-  common-labels = {
+  common_labels = {
     "vynil.solidite.fr/owner-name" = var.instance
     "vynil.solidite.fr/owner-namespace" = var.namespace
     "vynil.solidite.fr/owner-category" = var.category
@@ -21,6 +21,6 @@ data "kubernetes_secret_v1" "authentik" {
 
 data "kustomization_overlay" "data" {
   namespace = var.namespace
-  common_labels = local.common-labels
+  common_labels = local.common_labels
   resources = []
 }

share/authentik-forward/datas.tf

@@ -1,7 +1,7 @@
 locals {
   authentik_url = "http://authentik.${var.domain}-auth.svc"
   authentik_token = data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]
-  common-labels = {
+  common_labels = {
     "vynil.solidite.fr/owner-name" = var.instance
     "vynil.solidite.fr/owner-namespace" = var.namespace
     "vynil.solidite.fr/owner-category" = var.category
@@ -21,6 +21,6 @@ data "kubernetes_secret_v1" "authentik" {
 
 data "kustomization_overlay" "data" {
   namespace = var.namespace
-  common_labels = local.common-labels
+  common_labels = local.common_labels
   resources = []
 }

share/authentik-ldap/datas.tf

@@ -1,7 +1,7 @@
 locals {
   authentik_url = "http://authentik.${var.domain}-auth.svc"
   authentik_token = data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]
-  common-labels = {
+  common_labels = {
     "vynil.solidite.fr/owner-name" = var.instance
     "vynil.solidite.fr/owner-namespace" = var.namespace
     "vynil.solidite.fr/owner-category" = var.category
@@ -21,6 +21,6 @@ data "kubernetes_secret_v1" "authentik" {
 
 data "kustomization_overlay" "data" {
   namespace = var.namespace
-  common_labels = local.common-labels
+  common_labels = local.common_labels
   resources = []
 }

share/authentik/backups.tf

@@ -6,7 +6,7 @@ resource "kubectl_manifest" "backup_schedule" {
     metadata:
       name: "${var.instance}-backup"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       backend:
         repoPasswordSecretRef:

share/authentik/datas.tf

@@ -1,5 +1,5 @@
 locals {
-  common-labels = {
+  common_labels = {
     "vynil.solidite.fr/owner-name" = var.instance
     "vynil.solidite.fr/owner-namespace" = var.namespace
     "vynil.solidite.fr/owner-category" = var.category
@@ -15,7 +15,7 @@ locals {
 
 data "kustomization_overlay" "data" {
   namespace = var.namespace
-  common_labels = local.common-labels
+  common_labels = local.common_labels
   resources = [for file in fileset(path.module, "*.yaml"): file if file != "index.yaml"]
   images {
     name = "ghcr.io/goauthentik/server"

share/authentik/postgresql.tf

@@ -1,8 +1,8 @@
 locals {
-  pg-labels = merge(local.common-labels, {
+  pg-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "pg"
   })
-  pool-labels = merge(local.common-labels, {
+  pool-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "pg-pool"
   })
 }

share/authentik/presentation.tf

@@ -14,7 +14,7 @@ resource "kubectl_manifest" "gitlab_userinfo" {
     metadata:
       name: "${var.instance}-gitlab-userinfo"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       replacePathRegex:
         regex: ^/application/o/[^\\/]*/api/v4/user
@@ -28,7 +28,7 @@ resource "kubectl_manifest" "gitlab_authorize" {
     metadata:
       name: "${var.instance}-gitlab-authorize"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       replacePathRegex:
         regex: ^/application/o/[^\\/]*/oauth/authorize
@@ -42,7 +42,7 @@ resource "kubectl_manifest" "gitlab_token" {
     metadata:
       name: "${var.instance}-gitlab-token"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       replacePathRegex:
         regex: ^/application/o/[^\\/]*/oauth/token
@@ -56,7 +56,7 @@ module "ingress" {
   namespace         = var.namespace
   issuer            = var.issuer
   ingress_class     = var.ingress_class
-  labels            = local.common-labels
+  labels            = local.common_labels
   dns_names         = local.dns_names
   middlewares       = [kubectl_manifest.gitlab_userinfo.name,kubectl_manifest.gitlab_authorize.name,kubectl_manifest.gitlab_token.name]
   services          = [local.service]

share/authentik/redis.tf

@@ -5,7 +5,7 @@ resource "kubectl_manifest" "authentik_redis" {
     metadata:
       name: "${var.name}-${var.component}-redis"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       kubernetesConfig:
         image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}"

share/authentik/secret.tf

@@ -1,5 +1,5 @@
 locals {
-  secrets-labels = merge(local.common-labels, {
+  secrets-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "backup-secret"
   })
   secret-labels = merge(local.secrets-labels, {

share/dataset-maria/common.tf

@@ -0,0 +1,12 @@
+
+locals {
+  common-labels = {
+    "vynil.solidite.fr/owner-name" = var.instance
+    "vynil.solidite.fr/owner-namespace" = var.namespace
+    "vynil.solidite.fr/owner-category" = var.category
+    "vynil.solidite.fr/owner-component" = var.component
+    "app.kubernetes.io/managed-by" = "vynil"
+    "app.kubernetes.io/name" = var.component
+    "app.kubernetes.io/instance" = var.instance
+  }
+}

share/dataset-maria/index.yaml

@@ -6,11 +6,6 @@ metadata:
   name: dataset-maria
   description: null
 options:
-  storage:
-    default: 8Gi
-    examples:
-    - 8Gi
-    type: string
   images:
     default:
       mariadb:
@@ -50,6 +45,11 @@ options:
             type: string
         type: object
     type: object
+  storage:
+    default: 8Gi
+    examples:
+    - 8Gi
+    type: string
 dependencies:
 - dist: null
   category: dbo
@@ -59,6 +59,7 @@ providers:
   authentik: null
   kubectl: true
   postgresql: null
+  mysql: null
   restapi: null
   http: null
   gitea: null

share/dataset-maria/mariadb.tf

@@ -1,5 +1,5 @@
 locals {
-  maria-labels = merge(local.common-labels, {
+  maria-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "mariadb"
   })
   mariadb-password = data.kubernetes_secret_v1.prj_mariadb_secret.data["password"]

share/dataset-mongo/common.tf

@@ -0,0 +1,12 @@
+
+locals {
+  common-labels = {
+    "vynil.solidite.fr/owner-name" = var.instance
+    "vynil.solidite.fr/owner-namespace" = var.namespace
+    "vynil.solidite.fr/owner-category" = var.category
+    "vynil.solidite.fr/owner-component" = var.component
+    "app.kubernetes.io/managed-by" = "vynil"
+    "app.kubernetes.io/name" = var.component
+    "app.kubernetes.io/instance" = var.instance
+  }
+}

share/dataset-mongo/index.yaml

@@ -6,6 +6,11 @@ metadata:
   name: dataset-mongo
   description: null
 options:
+  cacheSizeGB:
+    default: 1
+    examples:
+    - 1
+    type: integer
   image:
     default:
       pull_policy: IfNotPresent
@@ -20,16 +25,6 @@ options:
         - IfNotPresent
         type: string
     type: object
-  cacheSizeGB:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
   mongo:
     default:
       version: 6.0.13
@@ -40,6 +35,11 @@ options:
         default: 6.0.13
         type: string
     type: object
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
   ressources:
     default:
       limits:

share/dataset-mongo/mongo.tf

@@ -1,5 +1,5 @@
 locals {
-  mongo-labels = merge(local.common-labels, {
+  mongo-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "mongo"
   })
 }

share/dataset-pg/backups.tf

@@ -6,7 +6,7 @@ resource "kubectl_manifest" "backup_schedule" {
     metadata:
       name: "${var.instance}-backup"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       backend:
         repoPasswordSecretRef:

share/dataset-pg/common.tf

@@ -0,0 +1,12 @@
+
+locals {
+  common-labels = {
+    "vynil.solidite.fr/owner-name" = var.instance
+    "vynil.solidite.fr/owner-namespace" = var.namespace
+    "vynil.solidite.fr/owner-category" = var.category
+    "vynil.solidite.fr/owner-component" = var.component
+    "app.kubernetes.io/managed-by" = "vynil"
+    "app.kubernetes.io/name" = var.component
+    "app.kubernetes.io/instance" = var.instance
+  }
+}

share/dataset-pg/databases.tf

@@ -41,7 +41,7 @@ resource "kubectl_manifest" "db_secret" {
     metadata:
       name: "${var.instance}-${var.component}-${local.sorted-dbs[count.index].name}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(merge(local.common-labels, {"app.kubernetes.io/component" = local.sorted-dbs[count.index].name}))}
+      labels: ${jsonencode(merge(local.common_labels, {"app.kubernetes.io/component" = local.sorted-dbs[count.index].name}))}
     spec:
       forceRegenerate: false
       data:

share/dataset-pg/directus.tf

@@ -1,7 +1,7 @@
 locals {
   authentik_url = "http://authentik.${var.domain}-auth.svc"
   authentik_token = data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]
-  directus-labels = merge(local.common-labels, {
+  directus-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "directus"
   })
   directus-icon     = "admin/img/directus-white.png"
@@ -87,7 +87,7 @@ resource "kubectl_manifest" "directus_pvc" {
     metadata:
       name: "${var.instance}-${var.component}-directus"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       accessModes:
       - "${var.extentions.directus.storage.accessMode}"

share/dataset-pg/postgresql.tf

@@ -1,9 +1,9 @@
 locals {
   dns_name  = "${var.instance}.${var.sub_domain}.${var.domain_name}"
-  pg-labels = merge(local.common-labels, {
+  pg-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "postgresql"
   })
-  pool-labels = merge(local.common-labels, {
+  pool-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "pg-pool"
   })
 }

share/dataset-pg/postgrest.tf

@@ -1,5 +1,5 @@
 locals {
-  prest-labels = merge(local.common-labels, {
+  prest-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "postgrest"
   })
   prest-dns_name = "api.${local.dns_name}"

share/dataset-pg/roles.tf

@@ -21,7 +21,7 @@ resource "kubectl_manifest" "db_secret_role" {
     metadata:
       name: "${var.instance}-${var.component}-role-${local.sorted-roles[count.index].name}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(merge(local.common-labels, {"app.kubernetes.io/component" = local.sorted-roles[count.index].name}))}
+      labels: ${jsonencode(merge(local.common_labels, {"app.kubernetes.io/component" = local.sorted-roles[count.index].name}))}
     spec:
       forceRegenerate: false
       data:

share/dataset-rabbit/common.tf

@@ -0,0 +1,12 @@
+
+locals {
+  common-labels = {
+    "vynil.solidite.fr/owner-name" = var.instance
+    "vynil.solidite.fr/owner-namespace" = var.namespace
+    "vynil.solidite.fr/owner-category" = var.category
+    "vynil.solidite.fr/owner-component" = var.component
+    "app.kubernetes.io/managed-by" = "vynil"
+    "app.kubernetes.io/name" = var.component
+    "app.kubernetes.io/instance" = var.instance
+  }
+}

share/dataset-rabbit/index.yaml

@@ -6,11 +6,45 @@ metadata:
   name: dataset-rabbit
   description: null
 options:
-  storage:
-    default: 8Gi
+  images:
+    default:
+      rabbit:
+        pull_policy: IfNotPresent
+        registry: docker.io
+        repository: rabbitmq
+        tag: 3.10.2-management
     examples:
-    - 8Gi
-    type: string
+    - rabbit:
+        pull_policy: IfNotPresent
+        registry: docker.io
+        repository: rabbitmq
+        tag: 3.10.2-management
+    properties:
+      rabbit:
+        default:
+          pull_policy: IfNotPresent
+          registry: docker.io
+          repository: rabbitmq
+          tag: 3.10.2-management
+        properties:
+          pull_policy:
+            default: IfNotPresent
+            enum:
+            - Always
+            - Never
+            - IfNotPresent
+            type: string
+          registry:
+            default: docker.io
+            type: string
+          repository:
+            default: rabbitmq
+            type: string
+          tag:
+            default: 3.10.2-management
+            type: string
+        type: object
+    type: object
   replicas:
     default: 1
     examples:
@@ -57,45 +91,11 @@ options:
             type: string
         type: object
     type: object
-  images:
-    default:
-      rabbit:
-        pull_policy: IfNotPresent
-        registry: docker.io
-        repository: rabbitmq
-        tag: 3.10.2-management
+  storage:
+    default: 8Gi
     examples:
-    - rabbit:
-        pull_policy: IfNotPresent
-        registry: docker.io
-        repository: rabbitmq
-        tag: 3.10.2-management
-    properties:
-      rabbit:
-        default:
-          pull_policy: IfNotPresent
-          registry: docker.io
-          repository: rabbitmq
-          tag: 3.10.2-management
-        properties:
-          pull_policy:
-            default: IfNotPresent
-            enum:
-            - Always
-            - Never
-            - IfNotPresent
-            type: string
-          registry:
-            default: docker.io
-            type: string
-          repository:
-            default: rabbitmq
-            type: string
-          tag:
-            default: 3.10.2-management
-            type: string
-        type: object
-    type: object
+    - 8Gi
+    type: string
 dependencies:
 - dist: null
   category: dbo
@@ -105,6 +105,7 @@ providers:
   authentik: null
   kubectl: true
   postgresql: null
+  mysql: null
   restapi: null
   http: null
   gitea: null

share/dataset-rabbit/rabbit.tf

@@ -1,5 +1,5 @@
 locals {
-  rabbit-labels = merge(local.common-labels, {
+  rabbit-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "rabbit"
   })
 }

share/dataset-redis/common.tf

@@ -0,0 +1,12 @@
+
+locals {
+  common-labels = {
+    "vynil.solidite.fr/owner-name" = var.instance
+    "vynil.solidite.fr/owner-namespace" = var.namespace
+    "vynil.solidite.fr/owner-category" = var.category
+    "vynil.solidite.fr/owner-component" = var.component
+    "app.kubernetes.io/managed-by" = "vynil"
+    "app.kubernetes.io/name" = var.component
+    "app.kubernetes.io/instance" = var.instance
+  }
+}

share/dataset-redis/redis.tf

@@ -1,5 +1,5 @@
 locals {
-  redis-labels = merge(local.common-labels, {
+  redis-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "redis"
   })
 }

share/division/datas.tf

@@ -1,7 +1,7 @@
 locals {
   authentik_url = "http://authentik.${var.domain}-auth.svc"
   authentik_token = data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]
-  common-labels = {
+  common_labels = {
     "vynil.solidite.fr/owner-name" = var.instance
     "vynil.solidite.fr/owner-namespace" = var.namespace
     "vynil.solidite.fr/owner-category" = var.category
@@ -21,6 +21,6 @@ data "kubernetes_secret_v1" "authentik" {
 
 data "kustomization_overlay" "data" {
   namespace = var.namespace
-  common_labels = local.common-labels
+  common_labels = local.common_labels
   resources = []
 }

share/dns/config.tf

@@ -59,7 +59,7 @@ resource "kubernetes_config_map_v1" "coredns-config" {
   metadata {
     name = "${var.component}-${var.instance}"
     namespace = "${var.namespace}"
-    labels = local.common-labels
+    labels = local.common_labels
   }
   data = local.files
 }

share/dns/datas.tf

@@ -1,5 +1,5 @@
 locals {
-  common-labels = {
+  common_labels = {
     "vynil.solidite.fr/owner-name" = var.instance
     "vynil.solidite.fr/owner-namespace" = var.namespace
     "vynil.solidite.fr/owner-category" = var.category
@@ -19,7 +19,7 @@ locals {
 
 data "kustomization_overlay" "data" {
   namespace = var.namespace
-  common_labels = local.common-labels
+  common_labels = local.common_labels
   resources = [for file in fileset(path.module, "*.yaml"): file if file != "index.yaml"]
   images {
     name = "coredns/coredns"

share/gitea-tekton-org/auto-cd.tf

@@ -1,11 +1,11 @@
 locals {
-  create-labels = merge(local.common-labels, {
+  create-labels = merge(local.common_labels, {
     "type" = "repo-new"
   })
-  activate-labels = merge(local.common-labels, {
+  activate-labels = merge(local.common_labels, {
     "type" = "package-new"
   })
-  delete-labels = merge(local.common-labels, {
+  delete-labels = merge(local.common_labels, {
     "type" = "repo-delete"
   })
 }

share/gitea-tekton-org/auto-ci.tf

@@ -1,8 +1,8 @@
 locals {
-  push-labels = merge(local.common-labels, {
+  push-labels = merge(local.common_labels, {
     "type" = "branch-push"
   })
-  tag-labels = merge(local.common-labels, {
+  tag-labels = merge(local.common_labels, {
     "type" = "tag-push"
   })
 }
@@ -118,7 +118,7 @@ resource "kubectl_manifest" "ci-git-repo" {
     metadata:
       name: "${var.instance}-${var.component}-ci"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       interval: 5m0s
       ref:
@@ -137,7 +137,7 @@ resource "kubectl_manifest" "ci-kustomization" {
     metadata:
       name: "${var.instance}-${var.component}-ci"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       interval: 5m
       path: ./ci

share/gitea-tekton-org/datas.tf

@@ -1,5 +1,5 @@
 locals {
-  common-labels = {
+  common_labels = {
     "vynil.solidite.fr/owner-name" = var.instance
     "vynil.solidite.fr/owner-namespace" = var.namespace
     "vynil.solidite.fr/owner-category" = var.category
@@ -12,7 +12,7 @@ locals {
 
 data "kustomization_overlay" "data" {
   namespace = var.namespace
-  common_labels = local.common-labels
+  common_labels = local.common_labels
   resources = [for file in fileset(path.module, "*.yaml"): file if file != "index.yaml"]
   patches {
     target {

share/gitea-tekton-org/listener.tf

@@ -5,7 +5,7 @@ resource "kubectl_manifest" "el" {
     metadata:
       name: "${var.instance}-${var.component}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       serviceAccountName: "${var.instance}-${var.component}"
       triggerGroups:

share/gitea-tekton-org/pvc.tf

@@ -20,7 +20,7 @@ resource "kubectl_manifest" "pvc" {
       namespace: "${var.namespace}"
       annotations:
         k8up.io/backup: "false"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec: ${jsonencode(local.pvc_spec)}
   EOF
 }

share/gitea-tekton-org/rbac.tf

@@ -6,7 +6,7 @@ resource "kubectl_manifest" "sa" {
     metadata:
       name: "${var.instance}-${var.component}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
   EOF
 }
 resource "kubectl_manifest" "rb" {
@@ -16,7 +16,7 @@ resource "kubectl_manifest" "rb" {
     metadata:
       name: "${var.instance}-${var.component}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     subjects:
     - kind: ServiceAccount
       name: "${var.instance}-${var.component}"
@@ -33,7 +33,7 @@ resource "kubectl_manifest" "crb" {
     metadata:
       name: "${var.namespace}-${var.instance}-${var.component}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     subjects:
     - kind: ServiceAccount
       name: "${var.instance}-${var.component}"

share/organisation/ci-space.tf

@@ -2,7 +2,7 @@ resource "kubernetes_namespace_v1" "ns-tekton" {
   count = var.haveGitea && var.haveTekton?1:0
   metadata {
     annotations = local.annotations
-    labels = merge(local.common-labels, local.annotations)
+    labels = merge(local.common_labels, local.annotations)
     name = "${var.domain}-ci-${var.instance}"
   }
 }
@@ -16,7 +16,7 @@ resource "kubectl_manifest" "tekton" {
     metadata:
       name: "tekton-base"
       namespace: "${var.domain}-ci-${var.instance}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "share"
@@ -43,7 +43,7 @@ resource "kubectl_manifest" "ci-ssh-creds" {
     metadata:
       name: "ssh-credentials"
       namespace: "${var.domain}-ci-${var.instance}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       length: "2048"
       forceRegenerate: false

share/organisation/common.tf

@@ -0,0 +1,12 @@
+
+locals {
+  common-labels = {
+    "vynil.solidite.fr/owner-name" = var.instance
+    "vynil.solidite.fr/owner-namespace" = var.namespace
+    "vynil.solidite.fr/owner-category" = var.category
+    "vynil.solidite.fr/owner-component" = var.component
+    "app.kubernetes.io/managed-by" = "vynil"
+    "app.kubernetes.io/name" = var.component
+    "app.kubernetes.io/instance" = var.instance
+  }
+}

share/organisation/gitea-user.tf

@@ -58,7 +58,7 @@ resource "kubectl_manifest" "ssh-creds" {
     metadata:
       name: "ssh-credentials"
       namespace: "${local.sorted-stages[count.index].namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       length: "2048"
       forceRegenerate: false

share/organisation/stages.tf

@@ -38,7 +38,7 @@ resource "kubernetes_namespace_v1" "ns" {
   count = length(local.sorted-stages)
   metadata {
     annotations = local.annotations
-    labels = merge(local.common-labels, local.annotations)
+    labels = merge(local.common_labels, local.annotations)
     name = local.sorted-stages[count.index].namespace
   }
 }
@@ -85,7 +85,7 @@ resource "kubectl_manifest" "ci-git-repo" {
     metadata:
       name: "deploy-git"
       namespace: "${local.sorted-stages[count.index].namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       interval: 5m0s
       ref:
@@ -104,7 +104,7 @@ resource "kubectl_manifest" "ci-kustomization" {
     metadata:
       name: "${var.instance}-${var.component}-deploy"
       namespace: "${local.sorted-stages[count.index].namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       interval: 5m
       path: ./stages/${local.sorted-stages[count.index].name}/deploy
@@ -127,7 +127,7 @@ resource "kubectl_manifest" "datasets" {
     metadata:
       name: "${local.sorted-datasets[count.index].name}"
       namespace: "${local.sorted-datasets[count.index].namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "share"

share/wildduck/haraka.tf

@@ -1,5 +1,5 @@
 locals {
-  haraka-labels = merge(local.common-labels, {
+  haraka-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "haraka"
   })
 }

share/wildduck/mongo.tf

@@ -1,5 +1,5 @@
 locals {
-  mongo-labels = merge(local.common-labels, {
+  mongo-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "mongo"
   })
 }

share/wildduck/redis.tf

@@ -1,5 +1,5 @@
 locals {
-  redis-labels = merge(local.common-labels, {
+  redis-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "redis"
   })
 }

share/wildduck/rspamd.tf

@@ -1,5 +1,5 @@
 locals {
-  rspamd-labels = merge(local.common-labels, {
+  rspamd-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "rspamd"
   })
 }

share/wildduck/scimgateway.tf

@@ -1,5 +1,5 @@
 locals {
-  scimgateway-labels = merge(local.common-labels, {
+  scimgateway-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "scimgateway"
   })
 }

share/wildduck/secret.tf

@@ -6,7 +6,7 @@ resource "kubectl_manifest" "wildduck_secret" {
     metadata:
       name: "${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       forceRegenerate: false
       fields:

share/wildduck/webmail.tf

@@ -1,5 +1,5 @@
 locals {
-  webmail-labels = merge(local.common-labels, {
+  webmail-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "webmail"
   })
 }

share/wildduck/wildduck.tf

@@ -1,5 +1,5 @@
 locals {
-  wildduck-labels = merge(local.common-labels, {
+  wildduck-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "wildduck"
   })
 }

share/wildduck/zonemta.tf

@@ -1,5 +1,5 @@
 locals {
-  zonemta-labels = merge(local.common-labels, {
+  zonemta-labels = merge(local.common_labels, {
     "app.kubernetes.io/component" = "zonemta"
   })
 }