add missing vol types (#665)

Signed-off-by: Thibault Mange <[email protected]>
rhobs · Dec 21, 2023 · 0ca84f1 · 0ca84f1
1 parent ebb3f60
commit 0ca84f1
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 14 deletions.
diff --git a/...services/app-sre-stage-01/rhobs/default/observatorium-metrics-ruler-default-template.yaml b/...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
@@ -283,7 +283,7 @@ objects:
         resources:
           requests:
             storage: 10Gi
-        storageClassName: ""
+        storageClassName: gp2
 parameters:
 - name: ALERTMGR_CPU_REQUEST
   value: 100m

diff --git a/...urces/services/app-sre-stage-01/rhobs/rhel/observatorium-metrics-ruler-rhel-template.yaml b/...urces/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/...ices/app-sre-stage-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml b/...ices/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/...ervices/telemeter-prod-01/rhobs/default/observatorium-metrics-ruler-default-template.yaml b/...ervices/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
@@ -283,7 +283,7 @@ objects:
         resources:
           requests:
             storage: 10Gi
-        storageClassName: ""
+        storageClassName: gp2
 parameters:
 - name: ALERTMGR_CPU_REQUEST
   value: 100m

diff --git a/...rces/services/telemeter-prod-01/rhobs/rhel/observatorium-metrics-ruler-rhel-template.yaml b/...rces/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/...ces/telemeter-prod-01/rhobs/telemeter/observatorium-metrics-ruler-telemeter-template.yaml b/...ces/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
@@ -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")