fix

apps/gitea/index.yaml

@@ -156,7 +156,7 @@ options:
         default: 2Gi
         type: string
     type: object
-  ssh-sub-domain:
+  ssh-sub_domain:
     default: git
     examples:
     - git
@@ -185,12 +185,12 @@ options:
         default: 10Gi
         type: string
     type: object
-  app-group:
+  app_group:
     default: dev
     examples:
     - dev
     type: string
-  ingress-class:
+  ingress_class:
     default: traefik
     examples:
     - traefik
@@ -301,7 +301,7 @@ options:
         default: false
         type: boolean
     type: object
-  sub-domain:
+  sub_domain:
     default: git
     examples:
     - git
@@ -351,7 +351,7 @@ options:
         default: false
         type: boolean
     type: object
-  domain-name:
+  domain_name:
     default: your_company.com
     examples:
     - your_company.com

apps/gitea/inline-config.tf

@@ -43,15 +43,15 @@ ROOT=/data/git/gitea-repositories
     EOF
     server = <<-EOF
 APP_DATA_PATH=/data
-DOMAIN=${var.sub-domain}.${var.domain-name}
+DOMAIN=${var.sub_domain}.${var.domain_name}
 ENABLE_PPROF=false
 HTTP_PORT=3000
 PROTOCOL=http
-ROOT_URL=https://${var.sub-domain}.${var.domain-name}
-SSH_DOMAIN=${var.sub-domain}.${var.domain-name}
+ROOT_URL=https://${var.sub_domain}.${var.domain_name}
+SSH_DOMAIN=${var.sub_domain}.${var.domain_name}
 SSH_LISTEN_PORT=2222
 SSH_PORT=${var.ssh-port}
-SSH_DOMAIN=${var.ssh-sub-domain}.${var.domain-name}
+SSH_DOMAIN=${var.ssh-sub_domain}.${var.domain_name}
 START_SSH_SERVER=true
     EOF
     ui = <<-EOF

apps/gitea/presentation.tf

@@ -1,7 +1,7 @@
 locals {
-  dns-name = "${var.sub-domain}.${var.domain-name}"
-  dns-names = [local.dns-name]
-  app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
+  dns_name = "${var.sub_domain}.${var.domain_name}"
+  dns_names = [local.dns_name]
+  app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
   icon              = "assets/img/logo.svg"
   request_headers = {
     "Content-Type"  = "application/json"
@@ -34,9 +34,9 @@ module "ingress" {
   instance          = var.instance
   namespace         = var.namespace
   issuer            = var.issuer
-  ingress-class     = var.ingress-class
+  ingress_class     = var.ingress_class
   labels            = local.common-labels
-  dns-names         = local.dns-names
+  dns_names         = local.dns_names
   middlewares       = []
   service           = local.service
   providers = {
@@ -48,8 +48,8 @@ module "application" {
   source = "/dist/modules/application"
   component         = var.component
   instance          = var.instance
-  app-group         = var.app-group
-  dns-name          = local.dns-name
+  app_group         = var.app_group
+  dns_name          = local.dns_name
   icon              = local.icon
   protocol_provider = module.oauth2.provider-id
   providers = {
@@ -63,7 +63,7 @@ module "oauth2" {
   instance          = var.instance
   namespace         = var.namespace
   labels            = local.common-labels
-  dns-name          = local.dns-name
+  dns_name          = local.dns_name
   redirect-path     = "user/oauth2/vynil/callback"
   providers = {
     kubernetes = kubernetes

apps/gitea/redis.tf

@@ -13,7 +13,7 @@ resource "kubectl_manifest" "prj_redis" {
       labels: ${jsonencode(local.redis-labels)}
     spec:
       kubernetesConfig:
-        image: "${var.redis.image}"
+        image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}"
         imagePullPolicy: "IfNotPresent"
       storage:
         volumeClaimTemplate:
@@ -21,10 +21,10 @@ resource "kubectl_manifest" "prj_redis" {
             accessModes: ["ReadWriteOnce"]
             resources:
               requests:
-                storage: "${var.redis.storage}"
+                storage: "${var.storage.redis}"
       redisExporter:
         enabled: ${var.redis.exporter.enabled}
-        image: "${var.redis.exporter.image}"
+        image: "${var.images.redis_exporter.registry}/${var.images.redis_exporter.repository}:${var.images.redis_exporter.tag}"
       securityContext:
         runAsUser: 1000
         fsGroup: 1000