Skip to content

Commit 80e46f7

Browse files
Kellen275Kellen275
authored
fix(helm): Split ingester HPA when zoneAwareReplication is enabled (#14565)
1 parent 52a8ef8 commit 80e46f7

File tree

4 files changed

+166
-1
lines changed

4 files changed

+166
-1
lines changed

‎production/helm/loki/templates/ingester/hpa-zone-a.yaml

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
2+
{{- if and $isDistributed .Values.ingester.autoscaling.enabled .Values.ingester.zoneAwareReplication.enabled }}
3+
{{- $apiVersion := include "loki.hpa.apiVersion" . -}}
4+
apiVersion: {{ $apiVersion }}
5+
kind: HorizontalPodAutoscaler
6+
metadata:
7+
name: {{ include "loki.ingesterFullname" . }}-zone-a
8+
namespace: {{ .Release.Namespace }}
9+
labels:
10+
{{- include "loki.ingesterLabels" . | nindent 4 }}
11+
spec:
12+
scaleTargetRef:
13+
apiVersion: apps/v1
14+
kind: StatefulSet
15+
name: {{ include "loki.ingesterFullname" . }}-zone-a
16+
minReplicas: {{ .Values.ingester.autoscaling.minReplicas }}
17+
maxReplicas: {{ .Values.ingester.autoscaling.maxReplicas }}
18+
metrics:
19+
{{- with .Values.ingester.autoscaling.targetMemoryUtilizationPercentage }}
20+
- type: Resource
21+
resource:
22+
name: memory
23+
{{- if (eq $apiVersion "autoscaling/v2") }}
24+
target:
25+
type: Utilization
26+
averageUtilization: {{ . }}
27+
{{- else }}
28+
targetAverageUtilization: {{ . }}
29+
{{- end }}
30+
{{- end }}
31+
{{- with .Values.ingester.autoscaling.targetCPUUtilizationPercentage }}
32+
- type: Resource
33+
resource:
34+
name: cpu
35+
{{- if (eq $apiVersion "autoscaling/v2") }}
36+
target:
37+
type: Utilization
38+
averageUtilization: {{ . }}
39+
{{- else }}
40+
targetAverageUtilization: {{ . }}
41+
{{- end }}
42+
{{- end }}
43+
{{- with .Values.ingester.autoscaling.customMetrics }}
44+
{{- toYaml . | nindent 4 }}
45+
{{- end }}
46+
{{- if .Values.ingester.autoscaling.behavior.enabled }}
47+
behavior:
48+
{{- with .Values.ingester.autoscaling.behavior.scaleDown }}
49+
scaleDown: {{ toYaml . | nindent 6 }}
50+
{{- end }}
51+
{{- with .Values.ingester.autoscaling.behavior.scaleUp }}
52+
scaleUp: {{ toYaml . | nindent 6 }}
53+
{{- end }}
54+
{{- end }}
55+
{{- end }}

‎production/helm/loki/templates/ingester/hpa-zone-b.yaml

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
2+
{{- if and $isDistributed .Values.ingester.autoscaling.enabled .Values.ingester.zoneAwareReplication.enabled }}
3+
{{- $apiVersion := include "loki.hpa.apiVersion" . -}}
4+
apiVersion: {{ $apiVersion }}
5+
kind: HorizontalPodAutoscaler
6+
metadata:
7+
name: {{ include "loki.ingesterFullname" . }}-zone-b
8+
namespace: {{ .Release.Namespace }}
9+
labels:
10+
{{- include "loki.ingesterLabels" . | nindent 4 }}
11+
spec:
12+
scaleTargetRef:
13+
apiVersion: apps/v1
14+
kind: StatefulSet
15+
name: {{ include "loki.ingesterFullname" . }}-zone-b
16+
minReplicas: {{ .Values.ingester.autoscaling.minReplicas }}
17+
maxReplicas: {{ .Values.ingester.autoscaling.maxReplicas }}
18+
metrics:
19+
{{- with .Values.ingester.autoscaling.targetMemoryUtilizationPercentage }}
20+
- type: Resource
21+
resource:
22+
name: memory
23+
{{- if (eq $apiVersion "autoscaling/v2") }}
24+
target:
25+
type: Utilization
26+
averageUtilization: {{ . }}
27+
{{- else }}
28+
targetAverageUtilization: {{ . }}
29+
{{- end }}
30+
{{- end }}
31+
{{- with .Values.ingester.autoscaling.targetCPUUtilizationPercentage }}
32+
- type: Resource
33+
resource:
34+
name: cpu
35+
{{- if (eq $apiVersion "autoscaling/v2") }}
36+
target:
37+
type: Utilization
38+
averageUtilization: {{ . }}
39+
{{- else }}
40+
targetAverageUtilization: {{ . }}
41+
{{- end }}
42+
{{- end }}
43+
{{- with .Values.ingester.autoscaling.customMetrics }}
44+
{{- toYaml . | nindent 4 }}
45+
{{- end }}
46+
{{- if .Values.ingester.autoscaling.behavior.enabled }}
47+
behavior:
48+
{{- with .Values.ingester.autoscaling.behavior.scaleDown }}
49+
scaleDown: {{ toYaml . | nindent 6 }}
50+
{{- end }}
51+
{{- with .Values.ingester.autoscaling.behavior.scaleUp }}
52+
scaleUp: {{ toYaml . | nindent 6 }}
53+
{{- end }}
54+
{{- end }}
55+
{{- end }}

‎production/helm/loki/templates/ingester/hpa-zone-c.yaml

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
2+
{{- if and $isDistributed .Values.ingester.autoscaling.enabled .Values.ingester.zoneAwareReplication.enabled }}
3+
{{- $apiVersion := include "loki.hpa.apiVersion" . -}}
4+
apiVersion: {{ $apiVersion }}
5+
kind: HorizontalPodAutoscaler
6+
metadata:
7+
name: {{ include "loki.ingesterFullname" . }}-zone-c
8+
namespace: {{ .Release.Namespace }}
9+
labels:
10+
{{- include "loki.ingesterLabels" . | nindent 4 }}
11+
spec:
12+
scaleTargetRef:
13+
apiVersion: apps/v1
14+
kind: StatefulSet
15+
name: {{ include "loki.ingesterFullname" . }}-zone-c
16+
minReplicas: {{ .Values.ingester.autoscaling.minReplicas }}
17+
maxReplicas: {{ .Values.ingester.autoscaling.maxReplicas }}
18+
metrics:
19+
{{- with .Values.ingester.autoscaling.targetMemoryUtilizationPercentage }}
20+
- type: Resource
21+
resource:
22+
name: memory
23+
{{- if (eq $apiVersion "autoscaling/v2") }}
24+
target:
25+
type: Utilization
26+
averageUtilization: {{ . }}
27+
{{- else }}
28+
targetAverageUtilization: {{ . }}
29+
{{- end }}
30+
{{- end }}
31+
{{- with .Values.ingester.autoscaling.targetCPUUtilizationPercentage }}
32+
- type: Resource
33+
resource:
34+
name: cpu
35+
{{- if (eq $apiVersion "autoscaling/v2") }}
36+
target:
37+
type: Utilization
38+
averageUtilization: {{ . }}
39+
{{- else }}
40+
targetAverageUtilization: {{ . }}
41+
{{- end }}
42+
{{- end }}
43+
{{- with .Values.ingester.autoscaling.customMetrics }}
44+
{{- toYaml . | nindent 4 }}
45+
{{- end }}
46+
{{- if .Values.ingester.autoscaling.behavior.enabled }}
47+
behavior:
48+
{{- with .Values.ingester.autoscaling.behavior.scaleDown }}
49+
scaleDown: {{ toYaml . | nindent 6 }}
50+
{{- end }}
51+
{{- with .Values.ingester.autoscaling.behavior.scaleUp }}
52+
scaleUp: {{ toYaml . | nindent 6 }}
53+
{{- end }}
54+
{{- end }}
55+
{{- end }}

‎production/helm/loki/templates/ingester/hpa.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- $isDistributed := eq (include "loki.deployment.isDistributed" .) "true" -}}
2-
{{- if and $isDistributed .Values.ingester.autoscaling.enabled }}
2+
{{- if and $isDistributed .Values.ingester.autoscaling.enabled (or (not .Values.ingester.zoneAwareReplication.enabled) .Values.ingester.zoneAwareReplication.migration.enabled) }}
33
{{- $apiVersion := include "loki.hpa.apiVersion" . -}}
44
apiVersion: {{ $apiVersion }}
55
kind: HorizontalPodAutoscaler

0 commit comments

Comments
 (0)