From 0c1c530082678e9dfa4e298d84cd08250960b769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Wed, 24 Jan 2024 15:09:36 +0100
Subject: [PATCH] fix

---
 monitor/grafana/index.yaml      | 40 ++++++++++++++++-----------------
 monitor/grafana/presentation.tf |  1 +
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/monitor/grafana/index.yaml b/monitor/grafana/index.yaml
index 9f59bd4..5c9e0e5 100644
--- a/monitor/grafana/index.yaml
+++ b/monitor/grafana/index.yaml
@@ -6,11 +6,31 @@ metadata:
   name: grafana
   description: null
 options:
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
   app-group:
     default: monitor
     examples:
     - monitor
     type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   sub-domain:
     default: grafana
     examples:
@@ -113,11 +133,6 @@ options:
             type: string
         type: object
     type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
   volume:
     default:
       accessMode: ReadWriteOnce
@@ -137,26 +152,11 @@ options:
         default: 10Gi
         type: string
     type: object
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
   admin_name:
     default: grafana_admin
     examples:
     - grafana_admin
     type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
 dependencies: []
 providers:
   kubernetes: true
diff --git a/monitor/grafana/presentation.tf b/monitor/grafana/presentation.tf
index 5889258..3d151e0 100644
--- a/monitor/grafana/presentation.tf
+++ b/monitor/grafana/presentation.tf
@@ -49,6 +49,7 @@ module "oauth2" {
   component         = var.component
   instance          = var.instance
   namespace         = var.namespace
+  domain            = var.domain
   labels            = local.common-labels
   dns_name          = local.dns-name
   redirect_path     = "login/generic_oauth"