Re-ordered HPA specification to have memory as the first item in the spec.metrics list. (grafana#290)

RyanW8 · web-flow · commit 9ae9740ff2cd · 2021-12-15T20:10:14.000+01:00
Signed-off-by: Ryan Woods &lt;n4monitoring@node4.co.uk&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## master / unreleased
 * [CHANGE] Use port number for prometheus port annotations. #288
 * [CHANGE] Disable ingester startup probes by default. #286
+* [CHANGE] Moved HPA memory specification to be the first item in the list. #284
 * [FEATURE] Optionally manage cortex config as configmap. #280
 * [ENHANCEMENT] Upgrade to Cortex v1.11.0 #272
 
diff --git a/templates/distributor/distributor-hpa.yaml b/templates/distributor/distributor-hpa.yaml
@@ -15,18 +15,18 @@ spec:
   minReplicas: {{ .minReplicas }}
   maxReplicas: {{ .maxReplicas }}
   metrics:
-  {{- with .targetCPUUtilizationPercentage }}
+  {{- with .targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
-        name: cpu
+        name: memory
         target:
           type: Utilization
           averageUtilization: {{ . }}
   {{- end }}
-  {{- with .targetMemoryUtilizationPercentage }}
+  {{- with .targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
-        name: memory
+        name: cpu
         target:
           type: Utilization
           averageUtilization: {{ . }}
diff --git a/templates/nginx/nginx-hpa.yaml b/templates/nginx/nginx-hpa.yaml
@@ -15,18 +15,18 @@ spec:
   minReplicas: {{ .minReplicas }}
   maxReplicas: {{ .maxReplicas }}
   metrics:
-  {{- with .targetCPUUtilizationPercentage }}
+  {{- with .targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
-        name: cpu
+        name: memory
         target:
           type: Utilization
           averageUtilization: {{ . }}
   {{- end }}
-  {{- with .targetMemoryUtilizationPercentage }}
+  {{- with .targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
-        name: memory
+        name: cpu
         target:
           type: Utilization
           averageUtilization: {{ . }}
diff --git a/templates/querier/querier-hpa.yaml b/templates/querier/querier-hpa.yaml
@@ -15,18 +15,18 @@ spec:
   minReplicas: {{ .minReplicas }}
   maxReplicas: {{ .maxReplicas }}
   metrics:
-  {{- with .targetCPUUtilizationPercentage }}
+  {{- with .targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
-        name: cpu
+        name: memory
         target:
           type: Utilization
           averageUtilization: {{ . }}
   {{- end }}
-  {{- with .targetMemoryUtilizationPercentage }}
+  {{- with .targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
-        name: memory
+        name: cpu
         target:
           type: Utilization
           averageUtilization: {{ . }}
