From 3ee19b9e3f506cdf47c2350cff8dcb646f90887e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Tue, 23 Jan 2024 16:38:34 +0100 Subject: [PATCH] fix --- monitor/grafana/datas.tf | 16 +++++++---- monitor/grafana/index.yaml | 56 +++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/monitor/grafana/datas.tf b/monitor/grafana/datas.tf index 0d1f8a8..005f8ff 100644 --- a/monitor/grafana/datas.tf +++ b/monitor/grafana/datas.tf @@ -7,11 +7,6 @@ locals { "app.kubernetes.io/managed-by" = "vynil" "app.kubernetes.io/instance" = var.instance } - rb-patch = <<-EOF - - op: replace - path: /subjects/0/namespace - value: "${var.namespace}" - EOF } data "kustomization_overlay" "data" { @@ -65,4 +60,15 @@ data "kustomization_overlay" "data" { value: "${var.namespace}" EOF } + patches { + target { + kind = "HorizontalPodAutoscaler" + name = "grafana" + } + patch = <<-EOF + - op: replace + path: /apiVersion + value: "autoscaling/v2" + EOF + } } diff --git a/monitor/grafana/index.yaml b/monitor/grafana/index.yaml index fcc277c..d7c68fe 100644 --- a/monitor/grafana/index.yaml +++ b/monitor/grafana/index.yaml @@ -6,40 +6,15 @@ metadata: name: grafana description: null options: - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - domain: - default: your-company - examples: - - your-company - type: string sub-domain: default: grafana examples: - grafana type: string - issuer: - default: letsencrypt-prod + domain-name: + default: your_company.com examples: - - letsencrypt-prod - type: string - admin_name: - default: grafana_admin - examples: - - grafana_admin - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string - app-group: - default: monitor - examples: - - monitor + - your_company.com type: string volume: default: @@ -60,6 +35,21 @@ options: default: 10Gi type: string type: object + app-group: + default: monitor + examples: + - monitor + type: string + ingress-class: + default: traefik + examples: + - traefik + type: string + admin_name: + default: grafana_admin + examples: + - grafana_admin + type: string images: default: busybox: @@ -157,6 +147,16 @@ options: type: string type: object type: object + domain: + default: your-company + examples: + - your-company + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string dependencies: [] providers: kubernetes: true