From fa4168209345500c4b0a71502b95f9d0ea270b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Wed, 24 Jan 2024 16:50:57 +0100 Subject: [PATCH] fix --- monitor/grafana/datas.tf | 25 ++++++------ monitor/grafana/index.yaml | 80 +++++++++++++++++++------------------- 2 files changed, 53 insertions(+), 52 deletions(-) diff --git a/monitor/grafana/datas.tf b/monitor/grafana/datas.tf index 257b9f2..c2a3b26 100644 --- a/monitor/grafana/datas.tf +++ b/monitor/grafana/datas.tf @@ -86,18 +86,19 @@ data "kustomization_overlay" "data" { name: grafana annotations: configmap.reloader.stakater.com/reload: "grafana" -spec: - template: - spec: - containers: - - name: grafana - volumeMounts: + spec: + template: + spec: + containers: + - name: grafana + volumeMounts: + - name: local-certs + mountPath: "/etc/local-certs" + volumes: - name: local-certs - mountPath: "/etc/local-certs" - volumes: - - name: local-certs - secret: - secretName: "${var.instance}-cert" - defaultMode: 0444 + secret: + secretName: "${var.instance}-cert" + defaultMode: 0444 + EOF } } diff --git a/monitor/grafana/index.yaml b/monitor/grafana/index.yaml index 95e7059..3aa5534 100644 --- a/monitor/grafana/index.yaml +++ b/monitor/grafana/index.yaml @@ -6,50 +6,16 @@ metadata: name: grafana description: null options: - volume: - default: - accessMode: ReadWriteOnce - size: 10Gi + domain-name: + default: your_company.com examples: - - accessMode: ReadWriteOnce - size: 10Gi - properties: - accessMode: - default: ReadWriteOnce - enum: - - ReadWriteOnce - - ReadOnlyMany - - ReadWriteMany - type: string - size: - default: 10Gi - type: string - type: object - app-group: - default: monitor - examples: - - monitor - type: string - sub-domain: - default: grafana - examples: - - grafana - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod + - your_company.com type: string domain: default: your-company examples: - your-company type: string - admin_name: - default: grafana_admin - examples: - - grafana_admin - type: string images: default: busybox: @@ -147,15 +113,49 @@ options: type: string type: object type: object + volume: + default: + accessMode: ReadWriteOnce + size: 10Gi + examples: + - accessMode: ReadWriteOnce + size: 10Gi + properties: + accessMode: + default: ReadWriteOnce + enum: + - ReadWriteOnce + - ReadOnlyMany + - ReadWriteMany + type: string + size: + default: 10Gi + type: string + type: object + app-group: + default: monitor + examples: + - monitor + type: string + admin_name: + default: grafana_admin + examples: + - grafana_admin + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string ingress-class: default: traefik examples: - traefik type: string - domain-name: - default: your_company.com + sub-domain: + default: grafana examples: - - your_company.com + - grafana type: string dependencies: [] providers: