fix

apps/code-server/configs.tf

@@ -5,7 +5,7 @@ resource "kubectl_manifest" "code-server-config" {
     metadata:
       name: "${var.component}-${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     data:
       config.yml: |
         auth: none

apps/code-server/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 = []
 }

apps/code-server/deploy.tf

@@ -5,16 +5,16 @@ resource "kubectl_manifest" "deploy" {
     metadata:
       name: "${var.component}-${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       replicas: 1
       hostname: "${var.component}-${var.instance}"
       subdomain: "${var.domain_name}"
       selector:
-        matchLabels: ${jsonencode(local.common-labels)}
+        matchLabels: ${jsonencode(local.common_labels)}
       template:
         metadata:
-          labels: ${jsonencode(local.common-labels)}
+          labels: ${jsonencode(local.common_labels)}
           annotations:
             container.apparmor.security.beta.kubernetes.io/code-server: unconfined
             container.seccomp.security.alpha.kubernetes.io/code-server: unconfined

apps/code-server/presentation.tf

@@ -14,7 +14,7 @@ module "service" {
   component         = var.component
   instance          = var.instance
   namespace         = var.namespace
-  labels            = local.common-labels
+  labels            = local.common_labels
   targets           = ["http"]
   providers = {
     kubectl = kubectl
@@ -28,7 +28,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       = [module.forward.middleware]
   services          = [module.service.default_definition]
@@ -67,7 +67,7 @@ module "forward" {
   domain            = var.domain
   namespace         = var.namespace
   ingress_class     = var.ingress_class
-  labels            = local.common-labels
+  labels            = local.common_labels
   dns_names         = local.dns_names
   service           = module.service.default_definition
   icon              = local.icon

apps/code-server/pvc.tf

@@ -18,7 +18,7 @@ resource "kubectl_manifest" "pvc" {
     metadata:
       name: "${var.component}-${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec: ${jsonencode(local.pvc_spec)}
   EOF
 }

apps/code-server/rbac.tf

@@ -5,7 +5,7 @@ resource "kubectl_manifest" "sa" {
     metadata:
       name: "${var.component}-${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
   EOF
 }
 
@@ -17,7 +17,7 @@ resource "kubectl_manifest" "role" {
     metadata:
       name: "${var.component}-${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     rules:
     - apiGroups: ['*']
       resources: ['*']
@@ -32,7 +32,7 @@ resource "kubectl_manifest" "rb" {
     metadata:
       name: "${var.component}-${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     roleRef:
       apiGroup: rbac.authorization.k8s.io
       kind: Role
@@ -51,7 +51,7 @@ resource "kubectl_manifest" "clusterrole" {
     kind: ClusterRole
     metadata:
       name: "${var.component}-${var.namespace}-${var.instance}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     rules:
     - apiGroups: ['*']
       resources: ['*']
@@ -65,7 +65,7 @@ resource "kubectl_manifest" "crb" {
     kind: ClusterRoleBinding
     metadata:
       name: "${var.component}-${var.namespace}-${var.instance}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     roleRef:
       apiGroup: rbac.authorization.k8s.io
       kind: ClusterRole

apps/code-server/secret.tf

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

apps/dbgate/configs.tf

@@ -66,7 +66,7 @@ resource "kubectl_manifest" "dbgate-config" {
     metadata:
       name: "${var.component}-${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     data: ${jsonencode(merge(local.oauth_config, local.connection_vars))}
   EOF
 }

apps/dbgate/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
@@ -28,6 +28,6 @@ data "kubernetes_ingress_v1" "authentik" {
 
 data "kustomization_overlay" "data" {
   namespace = var.namespace
-  common_labels = local.common-labels
+  common_labels = local.common_labels
   resources = []
 }

apps/dbgate/deploy.tf

@@ -28,17 +28,17 @@ resource "kubectl_manifest" "deploy" {
     metadata:
       name: "${var.component}-${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
       annotations:
         configmap.reloader.stakater.com/reload: "${var.component}-${var.instance}"
         secret.reloader.stakater.com/reload: "${var.component}-${var.instance}"
     spec:
       replicas: 1
       selector:
-        matchLabels: ${jsonencode(local.common-labels)}
+        matchLabels: ${jsonencode(local.common_labels)}
       template:
         metadata:
-          labels: ${jsonencode(local.common-labels)}
+          labels: ${jsonencode(local.common_labels)}
         spec:
           securityContext:
             fsGroup: 1000

apps/dbgate/presentation.tf

@@ -14,7 +14,7 @@ module "service" {
   component         = var.component
   instance          = var.instance
   namespace         = var.namespace
-  labels            = local.common-labels
+  labels            = local.common_labels
   targets           = ["http"]
   providers = {
     kubectl = kubectl
@@ -28,7 +28,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       = []
   services          = [module.service.default_definition]
@@ -56,7 +56,7 @@ module "oauth2" {
   instance          = var.instance
   namespace         = var.namespace
   domain            = var.domain
-  labels            = local.common-labels
+  labels            = local.common_labels
   dns_name          = local.dns_name
   redirect_path     = ""
   providers = {

apps/dbgate/pvc.tf

@@ -18,7 +18,7 @@ resource "kubectl_manifest" "pvc" {
     metadata:
       name: "${var.component}-${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec: ${jsonencode(local.pvc_spec)}
   EOF
 }

apps/dolibarr/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:

apps/dolibarr/check.rhai

@@ -0,0 +1,17 @@
+const DOMAIN = config.domain;
+fn check_domain() {
+    assert(have_namespace(`${global::DOMAIN}`),                         `There is no ${global::DOMAIN} namespace`);
+}
+fn check_authentik() {
+    assert(have_namespace(`${global::DOMAIN}-auth`),                    `There is no ${global::DOMAIN}-auth namespace`);
+    assert(have_install(`${global::DOMAIN}-auth`, "authentik"),         `No authentik installation in ${global::DOMAIN}-auth`);
+    assert(have_secret(`${global::DOMAIN}-auth`, "authentik"),          `No authentik secret in ${global::DOMAIN}-auth`);
+}
+fn check_authentik_ldap() {
+    assert(have_install(`${global::DOMAIN}-auth`, "authentik-ldap"), `No authentik-forward installation in ${global::DOMAIN}-auth`);
+}
+fn pre_check() {
+    check_domain();
+    check_authentik();
+    check_authentik_ldap();
+}

apps/dolibarr/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
+  }
+}

apps/dolibarr/configmap.tf

@@ -79,7 +79,7 @@ resource "kubectl_manifest" "config-json" {
     metadata:
       name: "${var.instance}-json"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     data:
       "docker-php-ext-redis.ini": |-
         extension = redis.so
@@ -157,7 +157,7 @@ resource "kubectl_manifest" "config" {
     metadata:
       name: "${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     data:
       DOLI_DB_HOST: "${var.instance}-${var.component}-pg-rw.${var.namespace}.svc"
       DOLI_DB_USER: "${var.component}"

apps/dolibarr/deploy.tf

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

apps/dolibarr/ingress.tf

@@ -28,7 +28,7 @@ resource "kubectl_manifest" "prj_certificate" {
     metadata:
       name: "${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
         secretName: "${var.instance}-cert"
         dnsNames: ${jsonencode(local.dns_names)}
@@ -46,7 +46,7 @@ resource "kubectl_manifest" "prj_https_redirect" {
     metadata:
       name: "${var.instance}-https"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       redirectScheme:
         scheme: "https"
@@ -62,7 +62,7 @@ resource "kubectl_manifest" "prj_ingress" {
     metadata:
       name: "${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
       annotations:
         "traefik.ingress.kubernetes.io/router.middlewares": "${join(",", [for m in local.middlewares : format("%s-%s@kubernetescrd", var.namespace, m)])}"
     spec:

apps/dolibarr/ldap.tf

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

apps/dolibarr/nginx-config.tf

@@ -6,7 +6,7 @@ apiVersion: v1
 metadata:
   name: ${var.instance}-nginx
   namespace: "${var.namespace}"
-  labels: ${jsonencode(local.common-labels)}
+  labels: ${jsonencode(local.common_labels)}
 data:
   nginx.conf: |
     worker_processes  5;

apps/dolibarr/postgresql.tf

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

apps/dolibarr/pvc.tf

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

apps/dolibarr/redis.tf

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

apps/dolibarr/saml.tf

@@ -32,7 +32,7 @@ resource "kubectl_manifest" "saml_certificate" {
     metadata:
       name: "${var.instance}-${var.component}-saml"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
         secretName: "${var.instance}-${var.component}-saml"
         dnsNames: ${jsonencode(local.dns_names)}

apps/gitea/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:

apps/gitea/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
@@ -54,7 +54,7 @@ data "kubernetes_ingress_v1" "authentik" {
 }
 
 data "kustomization_overlay" "data" {
-  common_labels = local.common-labels
+  common_labels = local.common_labels
   namespace = var.namespace
   resources = [for file in fileset(path.module, "*.yaml"): file if ! contains(["index.yaml", "v1_ConfigMap_gitea-themes.yaml"], file)]
   patches {

apps/gitea/inline-config.tf

@@ -2,7 +2,7 @@ resource "kubernetes_secret_v1" "gitea_inline_config" {
   metadata {
     name      = "gitea-inline-config"
     namespace = var.namespace
-    labels    = local.common-labels
+    labels    = local.common_labels
   }
 
   data = {

apps/gitea/postgresql.tf

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

apps/gitea/presentation.tf

@@ -22,7 +22,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       = []
   services          = [local.service]
@@ -50,7 +50,7 @@ module "oauth2" {
   instance          = var.instance
   namespace         = var.namespace
   domain            = var.domain
-  labels            = local.common-labels
+  labels            = local.common_labels
   dns_name          = local.dns_name
   redirect_path     = "user/oauth2/vynil/callback"
   providers = {

apps/gitea/redis.tf

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

apps/gitea/secret.tf

@@ -1,5 +1,5 @@
 locals {
-  secret-labels = merge(local.common-labels, {
+  secret-labels = merge(local.common_labels, {
     "k8up.io/backup" = "true"
   })
 }

apps/gramo/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 = []
 }

apps/gramo/deploy.tf

@@ -5,14 +5,14 @@ resource "kubectl_manifest" "deploy" {
     metadata:
       name: "${var.component}-${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       replicas: 1
       selector:
-        matchLabels: ${jsonencode(local.common-labels)}
+        matchLabels: ${jsonencode(local.common_labels)}
       template:
         metadata:
-          labels: ${jsonencode(local.common-labels)}
+          labels: ${jsonencode(local.common_labels)}
         spec:
           securityContext:
             fsGroup: 1000

apps/gramo/presentation.tf

@@ -14,7 +14,7 @@ module "service" {
   component         = var.component
   instance          = var.instance
   namespace         = var.namespace
-  labels            = local.common-labels
+  labels            = local.common_labels
   targets           = ["http"]
   providers = {
     kubectl = kubectl
@@ -28,7 +28,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       = [module.forward.middleware]
   services          = [module.service.default_definition]
@@ -67,7 +67,7 @@ module "forward" {
   domain            = var.domain
   namespace         = var.namespace
   ingress_class     = var.ingress_class
-  labels            = local.common-labels
+  labels            = local.common_labels
   dns_names         = local.dns_names
   service           = module.service.default_definition
   icon              = local.icon

apps/gramo/rbac.tf

@@ -8,7 +8,7 @@ resource "kubectl_manifest" "gramo_sa" {
     metadata:
       name: "${var.component}-${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
   EOF
 }
 
@@ -19,7 +19,7 @@ resource "kubectl_manifest" "gramo_crb_admin" {
     kind: ClusterRoleBinding
     metadata:
       name: "${var.namespace}-${var.component}-${var.instance}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     roleRef:
       apiGroup: rbac.authorization.k8s.io
       kind: ClusterRole
@@ -39,7 +39,7 @@ resource "kubectl_manifest" "gramo_roles" {
     metadata:
       name: "${var.namespace}-${var.component}-${var.instance}"
       namespace: "${local.sorted-namespaces[count.index]}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     rules:
     - apiGroups: ["*"]
       resources: ["*"]
@@ -55,7 +55,7 @@ resource "kubectl_manifest" "gramo_role_bindings" {
     metadata:
       name: "${var.namespace}-${var.component}-${var.instance}"
       namespace: "${local.sorted-namespaces[count.index]}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     subjects:
     - kind: ServiceAccount
       name: "${var.component}-${var.instance}"
@@ -74,7 +74,7 @@ resource "kubectl_manifest" "gramo_clusterrole" {
     kind: ClusterRole
     metadata:
       name: "${var.namespace}-${var.component}-${var.instance}-list"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     rules:
     - apiGroups: [""]
       resources: ["namespaces"]
@@ -97,7 +97,7 @@ resource "kubectl_manifest" "gramo_clusterrole_bindings" {
     metadata:
       name: "${var.namespace}-${var.component}-${var.instance}-list"
       namespace: "${local.sorted-namespaces[count.index]}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     subjects:
     - kind: ServiceAccount
       name: "${var.component}-${var.instance}"

apps/infisical/configs.tf

@@ -5,7 +5,7 @@ resource "kubectl_manifest" "config" {
     metadata:
       name: "${var.instance}-${var.component}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     data:
       NODE_EXTRA_CA_CERTS: /etc/local-ca/ca.crt
       INVITE_ONLY_SIGNUP: "true"

apps/infisical/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 = []
 }

apps/infisical/deploy.tf

@@ -5,17 +5,17 @@ resource "kubectl_manifest" "deploy" {
     metadata:
       name: "${var.instance}-${var.component}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
       annotations:
         configmap.reloader.stakater.com/reload: "${kubectl_manifest.config.name}"
         secret.reloader.stakater.com/reload: "${kubectl_manifest.secret.name}"
     spec:
       replicas: ${var.replicas}
       selector:
-        matchLabels: ${jsonencode(local.common-labels)}
+        matchLabels: ${jsonencode(local.common_labels)}
       template:
         metadata:
-          labels: ${jsonencode(local.common-labels)}
+          labels: ${jsonencode(local.common_labels)}
         spec:
           containers:
           - name: infisical-backend

apps/infisical/presentation.tf

@@ -13,7 +13,7 @@ module "service" {
   component         = var.component
   instance          = var.instance
   namespace         = var.namespace
-  labels            = local.common-labels
+  labels            = local.common_labels
   targets           = ["http"]
   providers = {
     kubectl = kubectl
@@ -27,7 +27,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       = [module.forward.middleware]
   services          = [module.service.default_definition]
@@ -66,7 +66,7 @@ module "forward" {
   domain            = var.domain
   namespace         = var.namespace
   ingress_class     = var.ingress_class
-  labels            = local.common-labels
+  labels            = local.common_labels
   dns_names         = local.dns_names
   service           = module.service.default_definition
   icon              = local.icon

apps/infisical/secret.tf

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

apps/infisical/storage.tf

@@ -3,7 +3,7 @@ module "redis" {
   component         = var.component
   instance          = var.instance
   namespace         = var.namespace
-  labels            = local.common-labels
+  labels            = local.common_labels
   images            = var.images
   exporter          = var.redis.exporter
   providers = {
@@ -15,7 +15,7 @@ module "mongo" {
   component         = var.component
   instance          = var.instance
   namespace         = var.namespace
-  labels            = local.common-labels
+  labels            = local.common_labels
   providers = {
     kubectl = kubectl
   }

apps/k8s-api/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

apps/k8s-api/ingress.tf

@@ -22,7 +22,7 @@ resource "kubectl_manifest" "prj_certificate" {
     metadata:
       name: "${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
         secretName: "${var.instance}-cert"
         dnsNames: ${jsonencode(local.dns_names)}
@@ -41,7 +41,7 @@ resource "kubectl_manifest" "prj_ingress" {
     metadata:
       name: "${var.instance}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       entryPoints: ["websecure"]
       routes: ${jsonencode(local.routes)}

apps/nextcloud/apps_v1_Deployment_nextcloud-metrics.yaml

@@ -1,55 +0,0 @@
-# Source: nextcloud/templates/metrics/deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nextcloud-metrics
-  labels:
-    app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.6.8
-    app.kubernetes.io/instance: nextcloud
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: metrics
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: nextcloud
-      app.kubernetes.io/instance: nextcloud
-      app.kubernetes.io/component: metrics
-  template:
-    metadata:
-      annotations:
-        null
-      labels:
-        app.kubernetes.io/name: nextcloud
-        app.kubernetes.io/instance: nextcloud
-        app.kubernetes.io/component: metrics
-    spec:
-      containers:
-        - name: metrics-exporter
-          image: "xperimental/nextcloud-exporter:0.6.2"
-          imagePullPolicy: IfNotPresent
-          env:
-            - name: NEXTCLOUD_USERNAME
-              valueFrom:
-                secretKeyRef:
-                  name: nextcloud
-                  key: nextcloud-username
-            - name: NEXTCLOUD_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: nextcloud
-                  key: nextcloud-password
-            # NEXTCLOUD_SERVER is used by metrics-exporter to reach the Nextcloud (K8s-)Service to grab the serverinfo api endpoint
-            - name: NEXTCLOUD_SERVER # deployment.namespace.svc.cluster.local
-              value: "http://nextcloud.vynil-cloud.svc.cluster.local:80"
-            - name: NEXTCLOUD_TIMEOUT
-              value: 5s
-            - name: NEXTCLOUD_TLS_SKIP_VERIFY
-              value: "false"
-          ports:
-            - name: metrics
-              containerPort: 9205
-          securityContext:
-            runAsUser: 1000
-            runAsNonRoot: true

apps/nextcloud/apps_v1_Deployment_nextcloud.yaml

@@ -1,185 +0,0 @@
-# Source: nextcloud/templates/deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nextcloud
-  labels:
-    app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.6.8
-    app.kubernetes.io/instance: nextcloud
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: app
-spec:
-  replicas: 1
-  strategy:
-    type: RollingUpdate
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: nextcloud
-      app.kubernetes.io/instance: nextcloud
-      app.kubernetes.io/component: app
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: nextcloud
-        app.kubernetes.io/instance: nextcloud
-        app.kubernetes.io/component: app
-      annotations:
-        nextcloud-config-hash: 389c7a366de1675e1455b824e52d593448eb9f3d376f49a478d2135e037b30a0
-        php-config-hash: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
-        nginx-config-hash: 18dd8f905a93ed27f032e9ae68084222ed7e5926f7144cda17b979780f4da54b
-        hooks-hash: 9525c2748a6c7cd0e28ec740623d0b3fa5a75c83b51ccfd136bc89c76737b204
-    spec:
-      containers:
-        - name: nextcloud
-          image: nextcloud:29.0.0-apache
-          imagePullPolicy: IfNotPresent
-          env:
-            
-            - name: POSTGRES_HOST
-              value: 
-            - name: POSTGRES_DB
-              value: "nextcloud"
-            - name: POSTGRES_USER
-              valueFrom:
-                secretKeyRef:
-                  name: nextcloud-db
-                  key: username
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: nextcloud-db
-                  key: password
-            - name: NEXTCLOUD_ADMIN_USER
-              valueFrom:
-                secretKeyRef:
-                  name: nextcloud
-                  key: nextcloud-username
-            - name: NEXTCLOUD_ADMIN_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: nextcloud
-                  key: nextcloud-password
-            - name: NEXTCLOUD_TRUSTED_DOMAINS
-              value: nextcloud.kube.home
-            - name: NEXTCLOUD_UPDATE
-              value: "1"
-            - name: NEXTCLOUD_DATA_DIR
-              value: "/var/www/html/data"
-          resources:
-            {}
-          volumeMounts:
-            - name: nextcloud-main
-              mountPath: /var/www/
-              subPath: root
-            - name: nextcloud-main
-              mountPath: /var/www/html
-              subPath: html
-            - name: nextcloud-main
-              mountPath: /var/www/html/data
-              subPath: data
-            - name: nextcloud-main
-              mountPath: /var/www/html/config
-              subPath: config
-            - name: nextcloud-main
-              mountPath: /var/www/html/custom_apps
-              subPath: custom_apps
-            - name: nextcloud-main
-              mountPath: /var/www/tmp
-              subPath: tmp
-            - name: nextcloud-main
-              mountPath: /var/www/html/themes
-              subPath: themes
-            - name: nextcloud-config
-              mountPath: /var/www/html/config/locale.config.php
-              subPath: locale.config.php
-            - name: nextcloud-config
-              mountPath: /var/www/html/config/redis.config.php
-              subPath: redis.config.php
-            - name: nextcloud-config
-              mountPath: /var/www/html/config/.htaccess
-              subPath: .htaccess
-            - name: nextcloud-config
-              mountPath: /var/www/html/config/apcu.config.php
-              subPath: apcu.config.php
-            - name: nextcloud-config
-              mountPath: /var/www/html/config/apps.config.php
-              subPath: apps.config.php
-            - name: nextcloud-config
-              mountPath: /var/www/html/config/autoconfig.php
-              subPath: autoconfig.php
-            - name: nextcloud-config
-              mountPath: /var/www/html/config/smtp.config.php
-              subPath: smtp.config.php
-        - name: nextcloud-nginx
-          image: "nginx:alpine"
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              protocol: TCP
-              containerPort: 80
-          livenessProbe:
-            httpGet:
-              path: /status.php
-              port:  80
-              httpHeaders:
-                - name: Host
-                  value: "nextcloud.kube.home"
-            initialDelaySeconds: 10
-            periodSeconds: 10
-            timeoutSeconds: 5
-            successThreshold: 1
-            failureThreshold: 3
-          readinessProbe:
-            httpGet:
-              path: /status.php
-              port:  80
-              httpHeaders:
-                - name: Host
-                  value: "nextcloud.kube.home"
-            initialDelaySeconds: 10
-            periodSeconds: 10
-            timeoutSeconds: 5
-            successThreshold: 1
-            failureThreshold: 3
-
-          resources:
-            {}
-          volumeMounts:
-            - name: nextcloud-main
-              mountPath: /var/www/
-              subPath: root
-            - name: nextcloud-main
-              mountPath: /var/www/html
-              subPath: html
-            - name: nextcloud-main
-              mountPath: /var/www/html/data
-              subPath: data
-            - name: nextcloud-main
-              mountPath: /var/www/html/config
-              subPath: config
-            - name: nextcloud-main
-              mountPath: /var/www/html/custom_apps
-              subPath: custom_apps
-            - name: nextcloud-main
-              mountPath: /var/www/tmp
-              subPath: tmp
-            - name: nextcloud-main
-              mountPath: /var/www/html/themes
-              subPath: themes
-            - name: nextcloud-nginx-config
-              mountPath: /etc/nginx/conf.d/
-      volumes:
-        - name: nextcloud-main
-          persistentVolumeClaim:
-            claimName: nextcloud-nextcloud
-        - name: nextcloud-config
-          configMap:
-            name: nextcloud-config
-        - name: nextcloud-nginx-config
-          configMap:
-            name: nextcloud-nginxconfig
-      securityContext:
-        # Will mount configuration files as www-data (id: 82) for nextcloud
-        fsGroup: 82
-      serviceAccountName: nextcloud-serviceaccount

apps/nextcloud/autoscaling_v1_HorizontalPodAutoscaler_nextcloud.yaml

@@ -1,19 +0,0 @@
-# Source: nextcloud/templates/hpa.yaml
-apiVersion: autoscaling/v1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: nextcloud
-  labels:
-    app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.6.8
-    app.kubernetes.io/instance: nextcloud
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: app
-spec:
-  scaleTargetRef:
-    kind: Deployment
-    apiVersion: apps/v1
-    name: nextcloud
-  minReplicas: 1
-  maxReplicas: 10
-  targetCPUUtilizationPercentage: 60

apps/nextcloud/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:

apps/nextcloud/collabora.tf

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

apps/nextcloud/configs.tf

@@ -68,7 +68,7 @@ resource "kubectl_manifest" "nextcloud-config" {
     metadata:
       name: "${var.component}-${var.instance}-init"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     data: ${jsonencode(local.data-config-init)}
   EOF
 }

apps/nextcloud/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,7 +21,7 @@ locals {
   }, var.storage.volume.class != "" ?{
     "storageClassName" = var.storage.volume.class
   }:{})
-  nextcloud-labels = merge(local.common-labels, {
+  nextcloud-labels = merge(local.common_labels, {
   })
 }
 

apps/nextcloud/middlewares.tf

@@ -5,7 +5,7 @@ kind: Middleware
 metadata:
   name: "${var.instance}-redirectdav"
   namespace: "${var.namespace}"
-  labels: ${jsonencode(local.common-labels)}
+  labels: ${jsonencode(local.common_labels)}
 spec:
   redirectRegex:
     permanent: true
@@ -21,7 +21,7 @@ kind: Middleware
 metadata:
   name: "${var.instance}-redirectindex"
   namespace: "${var.namespace}"
-  labels: ${jsonencode(local.common-labels)}
+  labels: ${jsonencode(local.common_labels)}
 spec:
   redirectRegex:
     permanent: false
@@ -37,7 +37,7 @@ kind: Middleware
 metadata:
   name: "${var.instance}-sslenforce"
   namespace: "${var.namespace}"
-  labels: ${jsonencode(local.common-labels)}
+  labels: ${jsonencode(local.common_labels)}
 spec:
   headers:
     stsSeconds: 15552000

apps/nextcloud/monitoring.coreos.com_v1_ServiceMonitor_nextcloud.yaml

@@ -1,26 +0,0 @@
-# Source: nextcloud/templates/metrics/servicemonitor.yaml
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: nextcloud
-  namespace: "vynil-cloud"
-  labels:
-    app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.6.8
-    app.kubernetes.io/instance: nextcloud
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: metrics
-spec:
-  jobLabel: ""
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: nextcloud
-      app.kubernetes.io/instance: nextcloud
-      app.kubernetes.io/component: metrics
-  namespaceSelector:
-    matchNames:
-      - "vynil-cloud"
-  endpoints:
-    - port: metrics
-      path: "/"
-      interval: 30s

apps/nextcloud/onlyoffice.tf

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

apps/nextcloud/postgresql.tf

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

apps/nextcloud/presentation.tf

@@ -20,7 +20,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       = ["${var.instance}-sslenforce", "${var.instance}-redirectdav", "${var.instance}-redirectindex"]
   services          = [local.service]
@@ -48,7 +48,7 @@ module "oauth2" {
   instance          = var.instance
   namespace         = var.namespace
   domain            = var.domain
-  labels            = local.common-labels
+  labels            = local.common_labels
   dns_name          = local.dns_name
   redirect_path     = "apps/user_oidc/code"
   providers = {

apps/nextcloud/rbac.authorization.k8s.io_v1_RoleBinding_nextcloud-privileged.yaml

@@ -1,14 +0,0 @@
-# Source: nextcloud/templates/rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: nextcloud-privileged
-  namespace: vynil-cloud
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: nextcloud-privileged
-subjects:
-  - kind: ServiceAccount
-    name: nextcloud-serviceaccount
-    namespace: vynil-cloud

apps/nextcloud/rbac.authorization.k8s.io_v1_Role_nextcloud-privileged.yaml

@@ -1,15 +0,0 @@
-# Source: nextcloud/templates/rbac.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: nextcloud-privileged
-  namespace: vynil-cloud
-rules:
-  - apiGroups:
-      - extensions
-    resourceNames:
-      - privileged
-    resources:
-      - podsecuritypolicies
-    verbs:
-      - use

apps/nextcloud/redis.tf

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

apps/nextcloud/secret.tf

@@ -7,7 +7,7 @@ resource "kubectl_manifest" "prj_secret" {
     metadata:
       name: "${var.component}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       forceRegenerate: false
       data:

apps/nextcloud/v1_ConfigMap_nextcloud-config.yaml

@@ -1,111 +0,0 @@
-# Source: nextcloud/templates/config.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: nextcloud-config
-  labels:
-    app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.6.8
-    app.kubernetes.io/instance: nextcloud
-    app.kubernetes.io/managed-by: Helm
-data:
-  locale.config.php: |-
-    <?php
-    $CONFIG = array (
-      'default_language' => 'fr',
-      'default_locale' => 'fr_FR',
-      'default_phone_region' => 'FR',
-      'log_type' => 'errorlog',
-      'loglevel' => 0,
-      'logdateformat' => 'F d, Y H:i:s',
-      'trusted_proxies' => array('10.244.0.0/16','2001:cafe:42::1'),
-      'allow_local_remote_servers' => true,
-    );
-  redis.config.php: |-
-    <?php
-    if (getenv('REDIS_HOST')) {
-      $CONFIG = array (
-        'filelocking.enabled' => true,
-        'memcache.distributed' => '\OC\Memcache\Redis',
-        'memcache.locking' => '\OC\Memcache\Redis',
-        'redis' => array(
-          'host' => getenv('REDIS_HOST'),
-          'port' => getenv('REDIS_HOST_PORT') ?: 6379,
-        ),
-      );
-    }
-  .htaccess: |-
-    # line below if for Apache 2.4
-    <ifModule mod_authz_core.c>
-    Require all denied
-    </ifModule>
-    # line below if for Apache 2.2
-    <ifModule !mod_authz_core.c>
-    deny from all
-    </ifModule>
-    # section for Apache 2.2 and 2.4
-    <ifModule mod_autoindex.c>
-    IndexIgnore *
-    </ifModule>
-  apcu.config.php: |-
-    <?php
-    $CONFIG = array (
-      'memcache.local' => '\OC\Memcache\APCu',
-    );
-  apps.config.php: |-
-    <?php
-    $CONFIG = array (
-      "apps_paths" => array (
-          0 => array (
-                  "path"     => OC::$SERVERROOT."/apps",
-                  "url"      => "/apps",
-                  "writable" => false,
-          ),
-          1 => array (
-                  "path"     => OC::$SERVERROOT."/custom_apps",
-                  "url"      => "/custom_apps",
-                  "writable" => true,
-          ),
-      ),
-    );
-  autoconfig.php: |-
-    <?php
-    $autoconfig_enabled = false;
-    if (getenv('SQLITE_DATABASE')) {
-        $AUTOCONFIG["dbtype"] = "sqlite";
-        $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
-        $autoconfig_enabled = true;
-    } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
-        $AUTOCONFIG["dbtype"] = "mysql";
-        $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
-        $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
-        $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
-        $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
-        $autoconfig_enabled = true;
-    } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
-        $AUTOCONFIG["dbtype"] = "pgsql";
-        $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
-        $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
-        $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
-        $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
-        $autoconfig_enabled = true;
-    }
-    if ($autoconfig_enabled) {
-        $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-    }
-  smtp.config.php: |-
-    <?php
-    if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) {
-      $CONFIG = array (
-        'mail_smtpmode' => 'smtp',
-        'mail_smtphost' => getenv('SMTP_HOST'),
-        'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25),
-        'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '',
-        'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'),
-        'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN',
-        'mail_smtpname' => getenv('SMTP_NAME') ?: '',
-        'mail_smtppassword' => getenv('SMTP_PASSWORD') ?: '',
-        'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
-        'mail_domain' => getenv('MAIL_DOMAIN'),
-      );
-    }

apps/nextcloud/v1_ConfigMap_nextcloud-nginxconfig.yaml

@@ -1,153 +0,0 @@
-# Source: nextcloud/templates/nginx-config.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: nextcloud-nginxconfig
-  labels:
-    app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.6.8
-    app.kubernetes.io/instance: nextcloud
-    app.kubernetes.io/managed-by: Helm
-data:
-  default.conf: |-
-    upstream php-handler {
-        server 127.0.0.1:9000;
-    }
-
-    server {
-        listen 80;
-
-        # HSTS settings
-        # WARNING: Only add the preload option once you read about
-        # the consequences in https://hstspreload.org/. This option
-        # will add the domain to a hardcoded list that is shipped
-        # in all major browsers and getting removed from this list
-        # could take several months.
-        #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
-
-        # set max upload size
-        client_max_body_size 10G;
-        fastcgi_buffers 64 4K;
-
-        # Enable gzip but do not remove ETag headers
-        gzip on;
-        gzip_vary on;
-        gzip_comp_level 4;
-        gzip_min_length 256;
-        gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
-        gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
-
-        # Pagespeed is not supported by Nextcloud, so if your server is built
-        # with the `ngx_pagespeed` module, uncomment this line to disable it.
-        #pagespeed off;
-
-        # HTTP response headers borrowed from Nextcloud `.htaccess`
-        add_header Referrer-Policy                      "no-referrer"       always;
-        add_header X-Content-Type-Options               "nosniff"           always;
-        add_header X-Download-Options                   "noopen"            always;
-        add_header X-Frame-Options                      "SAMEORIGIN"        always;
-        add_header X-Permitted-Cross-Domain-Policies    "none"              always;
-        add_header X-Robots-Tag                         "noindex, nofollow" always;
-        add_header X-XSS-Protection                     "1; mode=block"     always;
-
-        # Remove X-Powered-By, which is an information leak
-        fastcgi_hide_header X-Powered-By;
-
-        # Add .mjs as a file extension for javascript
-        # Either include it in the default mime.types list
-        # or include you can include that list explicitly and add the file extension
-        # only for Nextcloud like below:
-        include mime.types;
-        types {
-            text/javascript js mjs;
-        }        
-
-        # Path to the root of your installation
-        root /var/www/html;
-
-        # Specify how to handle directories -- specifying `/index.php$request_uri`
-        # here as the fallback means that Nginx always exhibits the desired behaviour
-        # when a client requests a path that corresponds to a directory that exists
-        # on the server. In particular, if that directory contains an index.php file,
-        # that file is correctly served; if it doesn't, then the request is passed to
-        # the front-end controller. This consistent behaviour means that we don't need
-        # to specify custom rules for certain paths (e.g. images and other assets,
-        # `/updater`, `/ocm-provider`, `/ocs-provider`), and thus
-        # `try_files $uri $uri/ /index.php$request_uri`
-        # always provides the desired behaviour.
-        index index.php index.html /index.php$request_uri;
-
-        # Rule borrowed from `.htaccess` to handle Microsoft DAV clients
-        location = / {
-            if ( $http_user_agent ~ ^DavClnt ) {
-                return 302 /remote.php/webdav/$is_args$args;
-            }
-        }
-
-        location = /robots.txt {
-            allow all;
-            log_not_found off;
-            access_log off;
-        }
-
-        # Make a regex exception for `/.well-known` so that clients can still
-        # access it despite the existence of the regex rule
-        # `location ~ /(\.|autotest|...)` which would otherwise handle requests
-        # for `/.well-known`.
-        location ^~ /.well-known {
-            # The following 6 rules are borrowed from `.htaccess`
-
-            location = /.well-known/carddav     { return 301 /remote.php/dav/; }
-            location = /.well-known/caldav      { return 301 /remote.php/dav/; }
-            # Anything else is dynamically handled by Nextcloud
-            location ^~ /.well-known            { return 301 /index.php$uri; }
-
-            try_files $uri $uri/ =404;
-        }
-
-        # Rules borrowed from `.htaccess` to hide certain paths from clients
-        location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)  { return 404; }
-        location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console)              { return 404; }
-
-        # Ensure this block, which passes PHP files to the PHP process, is above the blocks
-        # which handle static assets (as seen below). If this block is not declared first,
-        # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php`
-        # to the URI, resulting in a HTTP 500 error response.
-        location ~ \.php(?:$|/) {
-            # Required for legacy support
-            rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri;
-
-            fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-            set $path_info $fastcgi_path_info;
-
-            try_files $fastcgi_script_name =404;
-
-            include fastcgi_params;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            fastcgi_param PATH_INFO $path_info;
-            #fastcgi_param HTTPS on;
-
-            fastcgi_param modHeadersAvailable true;         # Avoid sending the security headers twice
-            fastcgi_param front_controller_active true;     # Enable pretty urls
-            fastcgi_pass php-handler;
-
-            fastcgi_intercept_errors on;
-            fastcgi_request_buffering off;
-        }
-
-        location ~ \.(?:css|js|svg|gif)$ {
-            try_files $uri /index.php$request_uri;
-            expires 6M;         # Cache-Control policy borrowed from `.htaccess`
-            access_log off;     # Optional: Don't log access to assets
-        }
-
-        location ~ \.woff2?$ {
-            try_files $uri /index.php$request_uri;
-            expires 7d;         # Cache-Control policy borrowed from `.htaccess`
-            access_log off;     # Optional: Don't log access to assets
-        }
-
-        location / {
-            try_files $uri $uri/ /index.php$request_uri;
-        }
-    }

apps/nextcloud/v1_PersistentVolumeClaim_nextcloud-nextcloud.yaml

@@ -1,19 +0,0 @@
-# Source: nextcloud/templates/nextcloud-pvc.yaml
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: nextcloud-nextcloud
-  labels:
-    app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.6.8
-    app.kubernetes.io/instance: nextcloud
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: app
-  annotations:
-    helm.sh/resource-policy: keep
-spec:
-  accessModes:
-    - "ReadWriteOnce"
-  resources:
-    requests:
-      storage: "8Gi"

apps/nextcloud/v1_ServiceAccount_nextcloud-serviceaccount.yaml

@@ -1,6 +0,0 @@
----
-# Source: nextcloud/templates/serviceaccount.yaml
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: nextcloud-serviceaccount

apps/nextcloud/v1_Service_nextcloud-metrics.yaml

@@ -1,24 +0,0 @@
-# Source: nextcloud/templates/metrics/service.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: nextcloud-metrics
-  labels:
-    app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.6.8
-    app.kubernetes.io/instance: nextcloud
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: metrics
-  annotations:
-    prometheus.io/port: "9205"
-    prometheus.io/scrape: "true"
-spec:
-  type: ClusterIP
-  ports:
-    - name: metrics
-      port: 9205
-      targetPort: metrics
-  selector:
-    app.kubernetes.io/name: nextcloud
-    app.kubernetes.io/instance: nextcloud
-    app.kubernetes.io/component: metrics

apps/nextcloud/v1_Service_nextcloud.yaml

@@ -1,22 +0,0 @@
-# Source: nextcloud/templates/service.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: nextcloud
-  labels:
-    app.kubernetes.io/name: nextcloud
-    helm.sh/chart: nextcloud-4.6.8
-    app.kubernetes.io/instance: nextcloud
-    app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/component: app
-spec:
-  type: ClusterIP
-  ports:
-    - port: 80
-      targetPort: 80
-      protocol: TCP
-      name: http
-  selector:
-    app.kubernetes.io/name: nextcloud
-    app.kubernetes.io/instance: nextcloud
-    app.kubernetes.io/component: app

apps/okd/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 = []
 }

apps/okd/deploy.tf

@@ -5,14 +5,14 @@ resource "kubectl_manifest" "deploy" {
     metadata:
       name: "${var.instance}-${var.component}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       replicas: 1
       selector:
-        matchLabels: ${jsonencode(local.common-labels)}
+        matchLabels: ${jsonencode(local.common_labels)}
       template:
         metadata:
-          labels: ${jsonencode(local.common-labels)}
+          labels: ${jsonencode(local.common_labels)}
         spec:
           securityContext:
             fsGroup: 1000

apps/okd/presentation.tf

@@ -14,7 +14,7 @@ module "service" {
   component         = var.component
   instance          = var.instance
   namespace         = var.namespace
-  labels            = local.common-labels
+  labels            = local.common_labels
   targets           = ["http"]
   providers = {
     kubectl = kubectl
@@ -28,7 +28,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       = [module.forward.middleware]
   services          = [module.service.default_definition]
@@ -67,7 +67,7 @@ module "forward" {
   domain            = var.domain
   namespace         = var.namespace
   ingress_class     = var.ingress_class
-  labels            = local.common-labels
+  labels            = local.common_labels
   dns_names         = local.dns_names
   service           = module.service.default_definition
   icon              = local.icon

apps/okd/rbac.tf

@@ -8,7 +8,7 @@ resource "kubectl_manifest" "okd_sa" {
     metadata:
       name: "${var.instance}-${var.component}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
   EOF
 }
 
@@ -19,7 +19,7 @@ resource "kubectl_manifest" "okd_crb_admin" {
     kind: ClusterRoleBinding
     metadata:
       name: "${var.namespace}-${var.instance}-${var.component}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     roleRef:
       apiGroup: rbac.authorization.k8s.io
       kind: ClusterRole
@@ -39,7 +39,7 @@ resource "kubectl_manifest" "okd_roles" {
     metadata:
       name: "${var.namespace}-${var.instance}-${var.component}"
       namespace: "${local.sorted-namespaces[count.index]}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     rules:
     - apiGroups: ["*"]
       resources: ["*"]
@@ -55,7 +55,7 @@ resource "kubectl_manifest" "okd_role_bindings" {
     metadata:
       name: "${var.namespace}-${var.instance}-${var.component}"
       namespace: "${local.sorted-namespaces[count.index]}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     subjects:
     - kind: ServiceAccount
       name: "${var.instance}-${var.component}"
@@ -74,7 +74,7 @@ resource "kubectl_manifest" "okd_clusterrole" {
     kind: ClusterRole
     metadata:
       name: "${var.namespace}-${var.instance}-${var.component}-list"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     rules:
     - apiGroups: [""]
       resources: ["namespaces"]
@@ -94,7 +94,7 @@ resource "kubectl_manifest" "okd_clusterrole_bindings" {
     metadata:
       name: "${var.namespace}-${var.instance}-${var.component}-list"
       namespace: "${local.sorted-namespaces[count.index]}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     subjects:
     - kind: ServiceAccount
       name: "${var.instance}-${var.component}"

apps/sonar/apps_v1_StatefulSet_sonar-sonarqube.yaml

@@ -5,7 +5,7 @@ metadata:
   name: sonar-sonarqube
   labels:
     app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
     release: sonar
     heritage: Helm
     app.kubernetes.io/name: sonarqube-sonar-sonarqube
@@ -13,7 +13,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: sonarqube
     app.kubernetes.io/component: sonar-sonarqube
-    app.kubernetes.io/version: "10.4.0-community"
+    app.kubernetes.io/version: "10.5.1-community"
 spec:
   replicas: 1
   revisionHistoryLimit: 10
@@ -28,19 +28,20 @@ spec:
         app: sonarqube
         release: sonar
       annotations:
-        checksum/init-sysctl: a12e75ed1a8c3b06d9caf75f108948bde1e6cf6210bb3035994c8d4fdb9e1f39
+        checksum/init-sysctl: f024654d224568f7d00f522ab1f651e593efb55ee745e9624beec68996a4458d
-        checksum/init-fs: 36564fb78d2715ef7f589fd3df9b29b970835c4f265186a47fbb0f1f8ce35c7e
+        checksum/init-fs: 4c8e59703fd03b0281f452e07eb3f3bdab1150a196f823234e641aaa2afb0253
-        checksum/plugins: db3ffc7959ef0fc65edbd6803efe5cfa5bed57043487c5d29af43708459ce9fd
+        checksum/plugins: 4e5baae46155e41236fcbdf85ea8b9ba3358994284bc26fb45d44a728d2b5c8e
-        checksum/config: ead0105b73e0ab65eebc0f041f2c07af74aab9f4e121ada0b788b5e287bc1132
+        checksum/config: 8dfa24e99816e4a8762c59197f8f41e53f8517b2f62d8839b7464952f77ad240
-        checksum/secret: 14fc9b43c5d5c61345694c7c8a2cab4fdee67d198dfec45498f58eb7a30b283d
+        checksum/secret: 11c9bb7cdad024fc7971937b62d5245054c1091fc798528488974ef4bd5b7255
-        checksum/prometheus-config: 79e17e350acb6b7a07c0204a52a6fe22bcb4c38b9f8339d15757f040698774dc
+        checksum/prometheus-config: 8b558b466ef4f60ab41a25ee83bb1cd6798a7c51aea6c557c75718f8b0527a61
-        checksum/prometheus-ce-config: ef57c8341973db7eb712730278966b61b4aa23721f65f5e0e51a9012a6a7b28b
+        checksum/prometheus-ce-config: 6af690da3580e26dbbfb7d1eea66284f1f52b2cff5db113b8acad5cdb87f4772
-    spec:      
+    spec:
+      automountServiceAccountToken: false      
       securityContext:
         fsGroup: 0
       initContainers:
         - name: "wait-for-db"
-          image: sonarqube:10.4.0-community
+          image: sonarqube:10.5.1-community
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -57,7 +58,7 @@ spec:
           command: ["/bin/bash", "-c"]
           args: ['set -o pipefail;for i in {1..200};do (echo > /dev/tcp/sonar-postgresql/5432) && exit 0; sleep 2;done; exit 1']
         - name: init-sysctl
-          image: sonarqube:10.4.0-community
+          image: sonarqube:10.5.1-community
           imagePullPolicy: IfNotPresent
           securityContext:
             privileged: true
@@ -70,8 +71,15 @@ spec:
           volumeMounts:
             - name: init-sysctl
               mountPath: /tmp/scripts/
+          env:
+            - name: SONAR_WEB_CONTEXT
+              value: /
+            - name: SONAR_WEB_JAVAOPTS
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8000:/opt/sonarqube/conf/prometheus-config.yaml
+            - name: SONAR_CE_JAVAOPTS
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml
         - name: inject-prometheus-exporter
-          image: sonarqube:10.4.0-community
+          image: sonarqube:10.5.1-community
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false
@@ -98,8 +106,14 @@ spec:
               value: 
             - name: no_proxy
               value: 
+            - name: SONAR_WEB_CONTEXT
+              value: /
+            - name: SONAR_WEB_JAVAOPTS
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8000:/opt/sonarqube/conf/prometheus-config.yaml
+            - name: SONAR_CE_JAVAOPTS
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml
         - name: install-plugins
-          image: sonarqube:10.4.0-community
+          image: sonarqube:10.5.1-community
           imagePullPolicy: IfNotPresent
           command: ["sh",
             "-e",
@@ -129,9 +143,15 @@ spec:
               value: 
             - name: no_proxy
               value: 
+            - name: SONAR_WEB_CONTEXT
+              value: /
+            - name: SONAR_WEB_JAVAOPTS
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8000:/opt/sonarqube/conf/prometheus-config.yaml
+            - name: SONAR_CE_JAVAOPTS
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml
       containers:
         - name: sonarqube
-          image: sonarqube:10.4.0-community
+          image: sonarqube:10.5.1-community
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
@@ -146,19 +166,21 @@ spec:
           resources:
             limits:
               cpu: 800m
-              memory: 4Gi
+              ephemeral-storage: 512000M
+              memory: 6144M
             requests:
               cpu: 400m
-              memory: 2Gi
+              ephemeral-storage: 1536M
+              memory: 2048M
           env:
-            - name: SONAR_HELM_CHART_VERSION
-              value: 10.4.0_2288
-            - name: SONAR_WEB_JAVAOPTS
-              value: "-javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8000:/opt/sonarqube/conf/prometheus-config.yaml"
             - name: SONAR_WEB_CONTEXT
               value: /
+            - name: SONAR_WEB_JAVAOPTS
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8000:/opt/sonarqube/conf/prometheus-config.yaml
             - name: SONAR_CE_JAVAOPTS
-              value: "-javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml"
+              value: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml
+            - name: SONAR_HELM_CHART_VERSION
+              value: 10.5.1_2816
             - name: SONAR_JDBC_PASSWORD
               valueFrom:
                 secretKeyRef:
@@ -178,8 +200,7 @@ spec:
               - sh
               - -c
               - |
-                host="$(hostname -i || echo '127.0.0.1')"
+                wget --no-proxy --quiet -O /dev/null --timeout=1 --header="X-Sonar-Passcode: $SONAR_WEB_SYSTEMPASSCODE" "http://localhost:9000/api/system/liveness"
-                wget --no-proxy --quiet -O /dev/null --timeout=1 --header="X-Sonar-Passcode: $SONAR_WEB_SYSTEMPASSCODE" "http://${host}:9000/api/system/liveness"
             initialDelaySeconds: 60
             periodSeconds: 30
             failureThreshold: 6
@@ -193,8 +214,7 @@ spec:
                 #!/bin/bash
                 # A Sonarqube container is considered ready if the status is UP, DB_MIGRATION_NEEDED or DB_MIGRATION_RUNNING
                 # status about migration are added to prevent the node to be kill while sonarqube is upgrading the database.
-                host="$(hostname -i || echo '127.0.0.1')"
+                if wget --no-proxy -qO- http://localhost:9000/api/system/status | grep -q -e '"status":"UP"' -e '"status":"DB_MIGRATION_NEEDED"' -e '"status":"DB_MIGRATION_RUNNING"'; then
-                if wget --no-proxy -qO- http://${host}:9000/api/system/status | grep -q -e '"status":"UP"' -e '"status":"DB_MIGRATION_NEEDED"' -e '"status":"DB_MIGRATION_RUNNING"'; then
                 	exit 0
                 fi
                 exit 1

apps/sonar/index.yaml

@@ -6,33 +6,15 @@ metadata:
   name: sonar
   description: The code quality tool for better code
 options:
-  issuer:
+  domain:
-    default: letsencrypt-prod
+    default: your-company
     examples:
-    - letsencrypt-prod
+    - your-company
     type: string
-  plugins:
+  domain_name:
-    default:
+    default: your_company.com
-    - https://github.com/vaulttec/sonar-auth-oidc/releases/download/v2.1.1/sonar-auth-oidc-plugin-2.1.1.jar
-    - https://github.com/jycr/sonar-l10n-fr/releases/download/9.9.0/sonar-l10n-fr-plugin-9.9.0.jar
-    - https://github.com/sbaudoin/sonar-yaml/releases/download/v1.7.0/sonar-yaml-plugin-1.7.0.jar
-    - https://github.com/sbaudoin/sonar-shellcheck/releases/download/v2.5.0/sonar-shellcheck-plugin-2.5.0.jar
-    - https://github.com/cnescatlab/sonar-hadolint-plugin/releases/download/1.1.0/sonar-hadolint-plugin-1.1.0.jar
-    - https://github.com/sbaudoin/sonar-ansible/releases/download/v2.5.1/sonar-ansible-extras-plugin-2.5.1.jar
     examples:
-    - - https://github.com/vaulttec/sonar-auth-oidc/releases/download/v2.1.1/sonar-auth-oidc-plugin-2.1.1.jar
+    - your_company.com
-      - https://github.com/jycr/sonar-l10n-fr/releases/download/9.9.0/sonar-l10n-fr-plugin-9.9.0.jar
-      - https://github.com/sbaudoin/sonar-yaml/releases/download/v1.7.0/sonar-yaml-plugin-1.7.0.jar
-      - https://github.com/sbaudoin/sonar-shellcheck/releases/download/v2.5.0/sonar-shellcheck-plugin-2.5.0.jar
-      - https://github.com/cnescatlab/sonar-hadolint-plugin/releases/download/1.1.0/sonar-hadolint-plugin-1.1.0.jar
-      - https://github.com/sbaudoin/sonar-ansible/releases/download/v2.5.1/sonar-ansible-extras-plugin-2.5.1.jar
-    items:
-      type: string
-    type: array
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
     type: string
   images:
     default:
@@ -73,21 +55,39 @@ options:
             type: string
         type: object
     type: object
-  domain_name:
+  ingress_class:
-    default: your_company.com
+    default: traefik
     examples:
-    - your_company.com
+    - traefik
     type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  plugins:
+    default:
+    - https://github.com/vaulttec/sonar-auth-oidc/releases/download/v2.1.1/sonar-auth-oidc-plugin-2.1.1.jar
+    - https://github.com/jycr/sonar-l10n-fr/releases/download/9.9.0/sonar-l10n-fr-plugin-9.9.0.jar
+    - https://github.com/sbaudoin/sonar-yaml/releases/download/v1.7.0/sonar-yaml-plugin-1.7.0.jar
+    - https://github.com/sbaudoin/sonar-shellcheck/releases/download/v2.5.0/sonar-shellcheck-plugin-2.5.0.jar
+    - https://github.com/cnescatlab/sonar-hadolint-plugin/releases/download/1.1.0/sonar-hadolint-plugin-1.1.0.jar
+    - https://github.com/sbaudoin/sonar-ansible/releases/download/v2.5.1/sonar-ansible-extras-plugin-2.5.1.jar
+    examples:
+    - - https://github.com/vaulttec/sonar-auth-oidc/releases/download/v2.1.1/sonar-auth-oidc-plugin-2.1.1.jar
+      - https://github.com/jycr/sonar-l10n-fr/releases/download/9.9.0/sonar-l10n-fr-plugin-9.9.0.jar
+      - https://github.com/sbaudoin/sonar-yaml/releases/download/v1.7.0/sonar-yaml-plugin-1.7.0.jar
+      - https://github.com/sbaudoin/sonar-shellcheck/releases/download/v2.5.0/sonar-shellcheck-plugin-2.5.0.jar
+      - https://github.com/cnescatlab/sonar-hadolint-plugin/releases/download/1.1.0/sonar-hadolint-plugin-1.1.0.jar
+      - https://github.com/sbaudoin/sonar-ansible/releases/download/v2.5.1/sonar-ansible-extras-plugin-2.5.1.jar
+    items:
+      type: string
+    type: array
   sub_domain:
     default: sonar
     examples:
     - sonar
     type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
 dependencies: []
 providers:
   kubernetes: true

apps/sonar/v1_ConfigMap_sonar-sonarqube-config.yaml

@@ -5,7 +5,7 @@ metadata:
   name: sonar-sonarqube-config
   labels:
     app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
     release: sonar
     heritage: Helm
 data:

apps/sonar/v1_ConfigMap_sonar-sonarqube-init-fs.yaml

@@ -5,7 +5,7 @@ metadata:
   name: sonar-sonarqube-init-fs
   labels:
     app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
     release: sonar
     heritage: Helm
 data:

apps/sonar/v1_ConfigMap_sonar-sonarqube-init-sysctl.yaml

@@ -5,7 +5,7 @@ metadata:
   name: sonar-sonarqube-init-sysctl
   labels:
     app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
     release: sonar
     heritage: Helm
 data:

apps/sonar/v1_ConfigMap_sonar-sonarqube-install-plugins.yaml

@@ -5,7 +5,7 @@ metadata:
   name: sonar-sonarqube-install-plugins
   labels:
     app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
     release: sonar
     heritage: Helm
 data:

apps/sonar/v1_ConfigMap_sonar-sonarqube-jdbc-config.yaml

@@ -5,7 +5,7 @@ metadata:
   name: sonar-sonarqube-jdbc-config
   labels:
     app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
     release: sonar
     heritage: Helm
 data:

apps/sonar/v1_ConfigMap_sonar-sonarqube-prometheus-ce-config.yaml

@@ -5,7 +5,7 @@ metadata:
   name: sonar-sonarqube-prometheus-ce-config
   labels:
     app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
     release: sonar
     heritage: Helm
 data:

apps/sonar/v1_ConfigMap_sonar-sonarqube-prometheus-config.yaml

@@ -5,7 +5,7 @@ metadata:
   name: sonar-sonarqube-prometheus-config
   labels:
     app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
     release: sonar
     heritage: Helm
 data:

apps/sonar/v1_Secret_sonar-sonarqube-monitoring-passcode.yaml

@@ -4,7 +4,7 @@ metadata:
   name: sonar-sonarqube-monitoring-passcode
   labels:
     app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
     release: sonar
     heritage: Helm
 type: Opaque

apps/sonar/v1_Service_sonar-sonarqube.yaml

@@ -5,7 +5,7 @@ metadata:
   name: sonar-sonarqube
   labels:
     app: sonarqube
-    chart: sonarqube-10.4.0_2288
+    chart: sonarqube-10.5.1_2816
     release: sonar
     heritage: Helm
 

apps/traefik-ui/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 = []
 }

apps/traefik-ui/presentation.tf

@@ -22,7 +22,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       = [module.forward.middleware]
   services          = [local.service]
@@ -61,7 +61,7 @@ module "forward" {
   domain            = var.domain
   namespace         = var.namespace
   ingress_class     = var.ingress_class
-  labels            = local.common-labels
+  labels            = local.common_labels
   dns_names         = local.dns_names
   service           = local.service
   icon              = local.icon

apps/traefik-ui/svc.tf

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

apps/woodpecker/config_server.tf

@@ -5,7 +5,7 @@ resource "kubectl_manifest" "server_config" {
     metadata:
       name: "${var.instance}-${var.component}-server"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     data:
       WOODPECKER_WEBHOOK_HOST: "http://woodpecker-server.${var.namespace}.svc"
       WOODPECKER_METRICS_SERVER_ADDR: ":9001"
@@ -22,7 +22,7 @@ resource "kubectl_manifest" "server_start" {
     metadata:
       name: "${var.instance}-${var.component}-server-start"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     data:
       "start.sh": |-
         #!/bin/ash
@@ -38,7 +38,7 @@ resource "kubectl_manifest" "agent_start" {
     metadata:
       name: "${var.instance}-${var.component}-agent-start"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     data:
       "start.sh": |-
         #!/bin/ash

apps/woodpecker/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
@@ -32,7 +32,7 @@ data "kubernetes_secret_v1" "authentik" {
 
 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 {

apps/woodpecker/presentation.tf

@@ -17,7 +17,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       = []
   services          = [local.service]

apps/woodpecker/secret.tf

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

meta/domain-apps/apps.tf

@@ -57,7 +57,7 @@ resource "kubernetes_namespace_v1" "files-ns" {
   count = var.nextcloud.enable ? 1 : 0
   metadata {
     annotations = merge(local.annotations, local.annotations_default)
-    labels = merge(local.common-labels, local.annotations)
+    labels = merge(local.common_labels, local.annotations)
     name = "${var.namespace}-files"
   }
 }
@@ -71,7 +71,7 @@ resource "kubectl_manifest" "nextcloud" {
     metadata:
       name: "nextcloud"
       namespace: "${kubernetes_namespace_v1.files-ns[0].metadata[0].name}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "apps"

meta/domain-apps/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
+  }
+}

meta/domain-auth/apps.tf

@@ -69,7 +69,7 @@ resource "kubernetes_namespace_v1" "auth-ns" {
   count = var.authentik.enable || var.authentik-ldap.enable || var.authentik-forward.enable ? 1 : 0
   metadata {
     annotations = merge(local.annotations, local.annotations_default)
-    labels = merge(local.common-labels, local.annotations)
+    labels = merge(local.common_labels, local.annotations)
     name = "${var.namespace}-auth"
   }
 }
@@ -83,7 +83,7 @@ resource "kubectl_manifest" "authentik" {
     metadata:
       name: "authentik"
       namespace: "${var.namespace}-auth"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "share"
@@ -101,7 +101,7 @@ resource "kubectl_manifest" "authentik-ldap" {
     metadata:
       name: "authentik-ldap"
       namespace: "${var.namespace}-auth"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "share"
@@ -119,7 +119,7 @@ resource "kubectl_manifest" "authentik-forward" {
     metadata:
       name: "authentik-forward"
       namespace: "${var.namespace}-auth"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "share"

meta/domain-auth/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
+  }
+}

meta/domain-auth/divisions.tf

@@ -46,7 +46,7 @@ resource "kubectl_manifest" "accounts-management" {
     metadata:
       name: "accounts-management"
       namespace: "${var.namespace}-auth"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "share"
@@ -68,7 +68,7 @@ resource "kubectl_manifest" "employes-divisions" {
     metadata:
       name: "employes-${local.sorted-div-employes[count.index].name}"
       namespace: "${var.namespace}-auth"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "share"
@@ -90,7 +90,7 @@ resource "kubectl_manifest" "clients-divisions" {
     metadata:
       name: "clients-${local.sorted-div-clients[count.index].name}"
       namespace: "${var.namespace}-auth"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "share"
@@ -112,7 +112,7 @@ resource "kubectl_manifest" "fournisseurs-divisions" {
     metadata:
       name: "fournisseurs-${local.sorted-div-fournisseurs[count.index].name}"
       namespace: "${var.namespace}-auth"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "share"

meta/domain-ci/apps.tf

@@ -63,7 +63,7 @@ resource "kubernetes_namespace_v1" "ci-ns" {
   count = ( var.gitea.enable )? 1 : 0
   metadata {
     annotations = merge(local.annotations, local.annotations_default)
-    labels = merge(local.common-labels, local.annotations)
+    labels = merge(local.common_labels, local.annotations)
     name = "${var.namespace}-ci"
   }
 }
@@ -77,7 +77,7 @@ resource "kubectl_manifest" "gitea" {
     metadata:
       name: "gitea"
       namespace: "${var.namespace}-ci"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "apps"
@@ -95,7 +95,7 @@ resource "kubectl_manifest" "woodpecker" {
     metadata:
       name: "woodpecker"
       namespace: "${var.namespace}-ci"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "apps"

meta/domain-ci/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
+  }
+}

meta/domain-devspaces/apps.tf

@@ -201,7 +201,7 @@ resource "kubernetes_namespace_v1" "apps-ns" {
   count = (var.apps.dbgate.enable || var.apps.okd.enable || var.apps.gramo.enable) ? 1 : 0
   metadata {
     annotations = merge(local.annotations, local.annotations_default)
-    labels = merge(local.common-labels, local.annotations)
+    labels = merge(local.common_labels, local.annotations)
     name = "${var.namespace}-devapps"
   }
 }
@@ -215,7 +215,7 @@ resource "kubectl_manifest" "okd" {
     metadata:
       name: "dev-okd"
       namespace: "${kubernetes_namespace_v1.apps-ns[0].metadata[0].name}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "apps"
@@ -233,7 +233,7 @@ resource "kubectl_manifest" "gramo" {
     metadata:
       name: "dev-gramo"
       namespace: "${kubernetes_namespace_v1.apps-ns[0].metadata[0].name}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "apps"
@@ -251,7 +251,7 @@ resource "kubectl_manifest" "dbgate" {
     metadata:
       name: "dbgate"
       namespace: "${kubernetes_namespace_v1.apps-ns[0].metadata[0].name}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "apps"

meta/domain-devspaces/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
+  }
+}

meta/domain-devspaces/organisations.tf

@@ -18,7 +18,7 @@ resource "kubectl_manifest" "organisations" {
     metadata:
       name: "org-${local.sorted-organisations[count.index].name}"
       namespace: "${var.namespace}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "share"

meta/domain-devspaces/stations.tf

@@ -34,7 +34,7 @@ resource "kubernetes_namespace_v1" "dev-ns" {
   count = length(local.sorted-stations)
   metadata {
     annotations = local.annotations
-    labels = merge(local.common-labels, local.annotations)
+    labels = merge(local.common_labels, local.annotations)
     name = "${var.domain}-devspaces-${local.sorted-stations[count.index].name}"
   }
 }
@@ -48,7 +48,7 @@ resource "kubectl_manifest" "devstations" {
     metadata:
       name: "${local.sorted-stations[count.index].name}"
       namespace: "${var.domain}-devspaces-${local.sorted-stations[count.index].name}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "apps"
@@ -66,7 +66,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"

meta/domain-erp/apps.tf

@@ -57,7 +57,7 @@ resource "kubernetes_namespace_v1" "erp-ns" {
   count = ( var.dolibarr.enable )? 1 : 0
   metadata {
     annotations = merge(local.annotations, local.annotations_default)
-    labels = merge(local.common-labels, local.annotations)
+    labels = merge(local.common_labels, local.annotations)
     name = "${var.namespace}-erp"
   }
 }
@@ -71,7 +71,7 @@ resource "kubectl_manifest" "dolibarr" {
     metadata:
       name: "dolibarr"
       namespace: "${kubernetes_namespace_v1.erp-ns[0].metadata[0].name}"
-      labels: ${jsonencode(local.common-labels)}
+      labels: ${jsonencode(local.common_labels)}
     spec:
       distrib: "${var.distributions.domain}"
       category: "apps"

meta/domain-erp/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
+  }
+}