From 73cb4ca90f92582ec93a750ccec60ee1d2fc2bd1 Mon Sep 17 00:00:00 2001 From: Naveed Yahyazadeh Date: Tue, 26 Oct 2021 10:41:59 -0400 Subject: [PATCH] [loki-distributed] Switch metric list order in HPAs Signed-off-by: Naveed Yahyazadeh --- charts/loki-distributed/Chart.yaml | 2 +- charts/loki-distributed/README.md | 2 +- charts/loki-distributed/templates/distributor/hpa.yaml | 8 ++++---- charts/loki-distributed/templates/gateway/hpa.yaml | 8 ++++---- charts/loki-distributed/templates/querier/hpa.yaml | 8 ++++---- charts/loki-distributed/templates/query-frontend/hpa.yaml | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index ebe3904d47..b75674955e 100644 --- a/charts/loki-distributed/Chart.yaml +++ b/charts/loki-distributed/Chart.yaml @@ -3,7 +3,7 @@ name: loki-distributed description: Helm chart for Grafana Loki in microservices mode type: application appVersion: 2.4.1 -version: 0.39.1 +version: 0.39.2 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index dd35e2a100..6c8d04068f 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,6 +1,6 @@ # loki-distributed -![Version: 0.39.1](https://img.shields.io/badge/Version-0.39.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) +![Version: 0.39.2](https://img.shields.io/badge/Version-0.39.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode diff --git a/charts/loki-distributed/templates/distributor/hpa.yaml b/charts/loki-distributed/templates/distributor/hpa.yaml index 23747c3dff..fe9868ce1f 100644 --- a/charts/loki-distributed/templates/distributor/hpa.yaml +++ b/charts/loki-distributed/templates/distributor/hpa.yaml @@ -13,16 +13,16 @@ spec: minReplicas: {{ .Values.distributor.autoscaling.minReplicas }} maxReplicas: {{ .Values.distributor.autoscaling.maxReplicas }} metrics: - {{- with .Values.distributor.autoscaling.targetCPUUtilizationPercentage }} + {{- with .Values.distributor.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: - name: cpu + name: memory targetAverageUtilization: {{ . }} {{- end }} - {{- with .Values.distributor.autoscaling.targetMemoryUtilizationPercentage }} + {{- with .Values.distributor.autoscaling.targetCPUUtilizationPercentage }} - type: Resource resource: - name: memory + name: cpu targetAverageUtilization: {{ . }} {{- end }} {{- end }} diff --git a/charts/loki-distributed/templates/gateway/hpa.yaml b/charts/loki-distributed/templates/gateway/hpa.yaml index ffd31bac87..74a9ea1fbe 100644 --- a/charts/loki-distributed/templates/gateway/hpa.yaml +++ b/charts/loki-distributed/templates/gateway/hpa.yaml @@ -13,16 +13,16 @@ spec: minReplicas: {{ .Values.gateway.autoscaling.minReplicas }} maxReplicas: {{ .Values.gateway.autoscaling.maxReplicas }} metrics: - {{- with .Values.gateway.autoscaling.targetCPUUtilizationPercentage }} + {{- with .Values.gateway.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: - name: cpu + name: memory targetAverageUtilization: {{ . }} {{- end }} - {{- with .Values.gateway.autoscaling.targetMemoryUtilizationPercentage }} + {{- with .Values.gateway.autoscaling.targetCPUUtilizationPercentage }} - type: Resource resource: - name: memory + name: cpu targetAverageUtilization: {{ . }} {{- end }} {{- end }} diff --git a/charts/loki-distributed/templates/querier/hpa.yaml b/charts/loki-distributed/templates/querier/hpa.yaml index cfc84712e4..16d57ef108 100644 --- a/charts/loki-distributed/templates/querier/hpa.yaml +++ b/charts/loki-distributed/templates/querier/hpa.yaml @@ -13,16 +13,16 @@ spec: minReplicas: {{ .Values.querier.autoscaling.minReplicas }} maxReplicas: {{ .Values.querier.autoscaling.maxReplicas }} metrics: - {{- with .Values.querier.autoscaling.targetCPUUtilizationPercentage }} + {{- with .Values.querier.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: - name: cpu + name: memory targetAverageUtilization: {{ . }} {{- end }} - {{- with .Values.querier.autoscaling.targetMemoryUtilizationPercentage }} + {{- with .Values.querier.autoscaling.targetCPUUtilizationPercentage }} - type: Resource resource: - name: memory + name: cpu targetAverageUtilization: {{ . }} {{- end }} {{- end }} diff --git a/charts/loki-distributed/templates/query-frontend/hpa.yaml b/charts/loki-distributed/templates/query-frontend/hpa.yaml index c42231717a..c063f4ba8e 100644 --- a/charts/loki-distributed/templates/query-frontend/hpa.yaml +++ b/charts/loki-distributed/templates/query-frontend/hpa.yaml @@ -13,16 +13,16 @@ spec: minReplicas: {{ .Values.queryFrontend.autoscaling.minReplicas }} maxReplicas: {{ .Values.queryFrontend.autoscaling.maxReplicas }} metrics: - {{- with .Values.queryFrontend.autoscaling.targetCPUUtilizationPercentage }} + {{- with .Values.queryFrontend.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: - name: cpu + name: memory targetAverageUtilization: {{ . }} {{- end }} - {{- with .Values.queryFrontend.autoscaling.targetMemoryUtilizationPercentage }} + {{- with .Values.queryFrontend.autoscaling.targetCPUUtilizationPercentage }} - type: Resource resource: - name: memory + name: cpu targetAverageUtilization: {{ . }} {{- end }} {{- end }}