From 15e8bb4dd0ffb39b24941775c5df5bb5d3fba740 Mon Sep 17 00:00:00 2001 From: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> Date: Thu, 21 Dec 2023 10:12:57 +0100 Subject: [PATCH] add missing vol types Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> --- .../default/observatorium-metrics-ruler-default-template.yaml | 4 ++-- .../rhobs/observatorium-metrics-alertmanager-template.yaml | 2 +- .../rhobs/rhel/observatorium-metrics-ruler-rhel-template.yaml | 4 ++-- .../observatorium-metrics-ruler-telemeter-template.yaml | 4 ++-- .../default/observatorium-metrics-ruler-default-template.yaml | 4 ++-- .../rhobs/observatorium-metrics-alertmanager-template.yaml | 2 +- .../rhobs/rhel/observatorium-metrics-ruler-rhel-template.yaml | 4 ++-- .../observatorium-metrics-ruler-telemeter-template.yaml | 4 ++-- services_go/observatorium/metrics.go | 3 +++ 9 files changed, 17 insertions(+), 14 deletions(-) diff --git a/resources/services/app-sre-stage-01/rhobs/default/observatorium-metrics-ruler-default-template.yaml b/resources/services/app-sre-stage-01/rhobs/default/observatorium-metrics-ruler-default-template.yaml index f318845cb5d..7a5e3932a5c 100755 --- a/resources/services/app-sre-stage-01/rhobs/default/observatorium-metrics-ruler-default-template.yaml +++ b/resources/services/app-sre-stage-01/rhobs/default/observatorium-metrics-ruler-default-template.yaml @@ -414,8 +414,8 @@ objects: - ReadWriteOnce resources: requests: - storage: 50Gi - storageClassName: "" + storage: 10Gi + storageClassName: gp2 parameters: - from: '[a-zA-Z0-9]{40}' generate: expression diff --git a/resources/services/app-sre-stage-01/rhobs/observatorium-metrics-alertmanager-template.yaml b/resources/services/app-sre-stage-01/rhobs/observatorium-metrics-alertmanager-template.yaml index 0cbbcbea7bb..60f7ed3c5d9 100755 --- a/resources/services/app-sre-stage-01/rhobs/observatorium-metrics-alertmanager-template.yaml +++ b/resources/services/app-sre-stage-01/rhobs/observatorium-metrics-alertmanager-template.yaml @@ -283,7 +283,7 @@ objects: resources: requests: storage: 10Gi - storageClassName: "" + storageClassName: gp2 parameters: - name: ALERTMGR_CPU_REQUEST value: 100m diff --git a/resources/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-ruler-rhel-template.yaml b/resources/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-ruler-rhel-template.yaml index 3a11b7f9a21..fabc139a5c3 100755 --- a/resources/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-ruler-rhel-template.yaml +++ b/resources/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-ruler-rhel-template.yaml @@ -414,8 +414,8 @@ objects: - ReadWriteOnce resources: requests: - storage: 50Gi - storageClassName: "" + storage: 10Gi + storageClassName: gp2 parameters: - from: '[a-zA-Z0-9]{40}' generate: expression diff --git a/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml b/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml index 96271ac7209..c9c0ff6d6e0 100755 --- a/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml +++ b/resources/services/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml @@ -552,8 +552,8 @@ objects: - ReadWriteOnce resources: requests: - storage: 50Gi - storageClassName: "" + storage: 10Gi + storageClassName: gp2 parameters: - from: '[a-zA-Z0-9]{40}' generate: expression diff --git a/resources/services/telemeter-prod-01/rhobs/default/observatorium-metrics-ruler-default-template.yaml b/resources/services/telemeter-prod-01/rhobs/default/observatorium-metrics-ruler-default-template.yaml index 87189ebdedf..253cbe4d257 100755 --- a/resources/services/telemeter-prod-01/rhobs/default/observatorium-metrics-ruler-default-template.yaml +++ b/resources/services/telemeter-prod-01/rhobs/default/observatorium-metrics-ruler-default-template.yaml @@ -414,8 +414,8 @@ objects: - ReadWriteOnce resources: requests: - storage: 50Gi - storageClassName: "" + storage: 10Gi + storageClassName: gp2 parameters: - from: '[a-zA-Z0-9]{40}' generate: expression diff --git a/resources/services/telemeter-prod-01/rhobs/observatorium-metrics-alertmanager-template.yaml b/resources/services/telemeter-prod-01/rhobs/observatorium-metrics-alertmanager-template.yaml index 0cbbcbea7bb..60f7ed3c5d9 100755 --- a/resources/services/telemeter-prod-01/rhobs/observatorium-metrics-alertmanager-template.yaml +++ b/resources/services/telemeter-prod-01/rhobs/observatorium-metrics-alertmanager-template.yaml @@ -283,7 +283,7 @@ objects: resources: requests: storage: 10Gi - storageClassName: "" + storageClassName: gp2 parameters: - name: ALERTMGR_CPU_REQUEST value: 100m diff --git a/resources/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-ruler-rhel-template.yaml b/resources/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-ruler-rhel-template.yaml index 0817aae25e9..e5fc72ee6b3 100755 --- a/resources/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-ruler-rhel-template.yaml +++ b/resources/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-ruler-rhel-template.yaml @@ -414,8 +414,8 @@ objects: - ReadWriteOnce resources: requests: - storage: 50Gi - storageClassName: "" + storage: 10Gi + storageClassName: gp2 parameters: - from: '[a-zA-Z0-9]{40}' generate: expression diff --git a/resources/services/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml b/resources/services/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml index 83ebd73e3bd..21438b98682 100755 --- a/resources/services/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml +++ b/resources/services/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml @@ -414,8 +414,8 @@ objects: - ReadWriteOnce resources: requests: - storage: 50Gi - storageClassName: "" + storage: 10Gi + storageClassName: gp2 parameters: - from: '[a-zA-Z0-9]{40}' generate: expression diff --git a/services_go/observatorium/metrics.go b/services_go/observatorium/metrics.go index a8945d04629..073022e82b4 100644 --- a/services_go/observatorium/metrics.go +++ b/services_go/observatorium/metrics.go @@ -139,6 +139,7 @@ func (o *ObservatoriumMetrics) makeAlertManager() encoding.Encoder { alertmanSts.Image = alertManagerImage alertmanSts.Replicas = 2 alertmanSts.Name = alertManagerName + alertmanSts.VolumeType = "gp2" delete(alertmanSts.PodResources.Limits, corev1.ResourceCPU) alertmanSts.PodResources.Requests[corev1.ResourceCPU] = resource.MustParse("100m") alertmanSts.PodResources.Requests[corev1.ResourceMemory] = resource.MustParse("256Mi") @@ -225,6 +226,8 @@ func (o *ObservatoriumMetrics) makeRuler(instanceCfg *ObservatoriumMetricsInstan rulerStatefulset.ImageTag = o.ThanosImageTag rulerStatefulset.Namespace = o.Namespace rulerStatefulset.Replicas = 1 + rulerStatefulset.VolumeType = "gp2" + rulerStatefulset.VolumeSize = "10Gi" delete(rulerStatefulset.PodResources.Limits, corev1.ResourceCPU) rulerStatefulset.PodResources.Requests[corev1.ResourceCPU] = resource.MustParse("100m") rulerStatefulset.PodResources.Requests[corev1.ResourceMemory] = resource.MustParse("256Mi")