From 99b0ca744ed3c716fbae9a665328628a6328b357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Tue, 23 Jan 2024 16:39:29 +0100 Subject: [PATCH] fix --- .../grafana/apps_v1_Deployment_grafana.yaml | 1 + ...beta1_HorizontalPodAutoscaler_grafana.yaml | 23 ---------- monitor/grafana/datas.tf | 11 ----- monitor/grafana/index.yaml | 42 +++++++++---------- 4 files changed, 22 insertions(+), 55 deletions(-) delete mode 100644 monitor/grafana/autoscaling_v2beta1_HorizontalPodAutoscaler_grafana.yaml diff --git a/monitor/grafana/apps_v1_Deployment_grafana.yaml b/monitor/grafana/apps_v1_Deployment_grafana.yaml index c800a25..9023121 100644 --- a/monitor/grafana/apps_v1_Deployment_grafana.yaml +++ b/monitor/grafana/apps_v1_Deployment_grafana.yaml @@ -11,6 +11,7 @@ metadata: app.kubernetes.io/version: "10.2.3" app.kubernetes.io/managed-by: Helm spec: + replicas: 1 revisionHistoryLimit: 10 selector: matchLabels: diff --git a/monitor/grafana/autoscaling_v2beta1_HorizontalPodAutoscaler_grafana.yaml b/monitor/grafana/autoscaling_v2beta1_HorizontalPodAutoscaler_grafana.yaml deleted file mode 100644 index ca75402..0000000 --- a/monitor/grafana/autoscaling_v2beta1_HorizontalPodAutoscaler_grafana.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# Source: grafana/templates/hpa.yaml -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: grafana - namespace: vynil-monitor - labels: - app.kubernetes.io/name: grafana - helm.sh/chart: grafana-7.2.4 - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/instance: grafana -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: grafana - minReplicas: 1 - maxReplicas: 5 - metrics: - - type: Resource - resource: - name: cpu - targetAverageUtilization: 60 \ No newline at end of file diff --git a/monitor/grafana/datas.tf b/monitor/grafana/datas.tf index 005f8ff..869ccc2 100644 --- a/monitor/grafana/datas.tf +++ b/monitor/grafana/datas.tf @@ -60,15 +60,4 @@ 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 d7c68fe..e3822fe 100644 --- a/monitor/grafana/index.yaml +++ b/monitor/grafana/index.yaml @@ -6,15 +6,10 @@ metadata: name: grafana description: null options: - sub-domain: - default: grafana + app-group: + default: monitor examples: - - grafana - type: string - domain-name: - default: your_company.com - examples: - - your_company.com + - monitor type: string volume: default: @@ -35,21 +30,21 @@ options: default: 10Gi type: string type: object - app-group: - default: monitor + sub-domain: + default: grafana examples: - - monitor + - grafana + type: string + domain-name: + default: your_company.com + examples: + - your_company.com type: string ingress-class: default: traefik examples: - traefik type: string - admin_name: - default: grafana_admin - examples: - - grafana_admin - type: string images: default: busybox: @@ -147,16 +142,21 @@ 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 + admin_name: + default: grafana_admin + examples: + - grafana_admin + type: string + domain: + default: your-company + examples: + - your-company + type: string dependencies: [] providers: kubernetes: true