Merge pull request camilb#46 from camilb/fix-memory-requests

Fix memory request propagation to statefulsets.
sachinmsft · Dec 29, 2017 · 75cb828 · 75cb828
2 parents cef6143 + 2489a4a
commit 75cb828
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/manifests/prometheus/prometheus-k8s.yaml b/manifests/prometheus/prometheus-k8s.yaml
@@ -27,6 +27,8 @@ spec:
       role: prometheus-rulefiles
       prometheus: k8s
   resources:
+    requests:
+      memory: PROMETHEUS_MEMORY_REQUEST
   retention: PROMETHEUS_STORAGE_RETENTION
   storage:
     volumeClaimTemplate:
@@ -38,8 +40,6 @@ spec:
         resources:
           requests:
             storage: PROMETHEUS_STORAGE_VOLUME_SIZE
-    requests:
-      memory: PROMETHEUS_MEMORY_REQUEST
   alerting:
     alertmanagers:
     - namespace: monitoring