Skip to content

Commit f5b8f7b

Browse files
fe80fe80
authored
feat(hpa): add behavior support for hpa v2 (#1855)
Signed-off-by: fe80 <[email protected]>
1 parent b1ba5b3 commit f5b8f7b

File tree

11 files changed

+197
-117
lines changed

11 files changed

+197
-117
lines changed

‎charts/sentry/templates/relay/hpa-relay.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,10 @@ spec:
3535
type: Utilization
3636
averageUtilization: {{ .Values.relay.autoscaling.targetCPUUtilizationPercentage }}
3737
{{- end }}
38+
{{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v2" }}
39+
{{- with .Values.relay.autoscaling.behavior }}
40+
behavior:
41+
{{- toYaml . | nindent 4 }}
42+
{{- end }}
43+
{{- end }}
3844
{{- end }}

‎charts/sentry/templates/sentry/ingest/attachments/hpa-ingest-consumer-attachments.yaml‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,26 @@ spec:
1414
targetCPUUtilizationPercentage: {{ .Values.sentry.ingestConsumerAttachments.autoscaling.targetCPUUtilizationPercentage }}
1515
{{- else if semverCompare ">=1.27-0" .Capabilities.KubeVersion.GitVersion }}
1616
metrics:
17-
- type: ContainerResource
18-
containerResource:
19-
container: {{ .Chart.Name }}-ingest-consumer-attachments
20-
name: cpu
21-
target:
22-
type: Utilization
23-
averageUtilization: {{ .Values.sentry.ingestConsumerAttachments.autoscaling.targetCPUUtilizationPercentage }}
17+
- type: ContainerResource
18+
containerResource:
19+
container: {{ .Chart.Name }}-ingest-consumer-attachments
20+
name: cpu
21+
target:
22+
type: Utilization
23+
averageUtilization: {{ .Values.sentry.ingestConsumerAttachments.autoscaling.targetCPUUtilizationPercentage }}
2424
{{- else }}
2525
metrics:
26-
- type: Resource
27-
resource:
28-
name: cpu
29-
target:
30-
type: Utilization
31-
averageUtilization: {{ .Values.sentry.ingestConsumerAttachments.autoscaling.targetCPUUtilizationPercentage }}
26+
- type: Resource
27+
resource:
28+
name: cpu
29+
target:
30+
type: Utilization
31+
averageUtilization: {{ .Values.sentry.ingestConsumerAttachments.autoscaling.targetCPUUtilizationPercentage }}
32+
{{- end }}
33+
{{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v2" }}
34+
{{- with .Values.sentry.ingestConsumerAttachments.autoscaling.behavior }}
35+
behavior:
36+
{{- toYaml . | nindent 4 }}
37+
{{- end }}
3238
{{- end }}
3339
{{- end }}

‎charts/sentry/templates/sentry/ingest/events/hpa-ingest-consumer-events.yaml‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,26 @@ spec:
1414
targetCPUUtilizationPercentage: {{ .Values.sentry.ingestConsumerEvents.autoscaling.targetCPUUtilizationPercentage }}
1515
{{- else if semverCompare ">=1.27-0" .Capabilities.KubeVersion.GitVersion }}
1616
metrics:
17-
- type: ContainerResource
18-
containerResource:
19-
container: {{ .Chart.Name }}-ingest-consumer-events
20-
name: cpu
21-
target:
22-
type: Utilization
23-
averageUtilization: {{ .Values.sentry.ingestConsumerEvents.autoscaling.targetCPUUtilizationPercentage }}
17+
- type: ContainerResource
18+
containerResource:
19+
container: {{ .Chart.Name }}-ingest-consumer-events
20+
name: cpu
21+
target:
22+
type: Utilization
23+
averageUtilization: {{ .Values.sentry.ingestConsumerEvents.autoscaling.targetCPUUtilizationPercentage }}
2424
{{- else }}
2525
metrics:
26-
- type: Resource
27-
resource:
28-
name: cpu
29-
target:
30-
type: Utilization
31-
averageUtilization: {{ .Values.sentry.ingestConsumerEvents.autoscaling.targetCPUUtilizationPercentage }}
26+
- type: Resource
27+
resource:
28+
name: cpu
29+
target:
30+
type: Utilization
31+
averageUtilization: {{ .Values.sentry.ingestConsumerEvents.autoscaling.targetCPUUtilizationPercentage }}
32+
{{- end }}
33+
{{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v2" }}
34+
{{- with .Values.sentry.ingestConsumerEvents.autoscaling.behavior }}
35+
behavior:
36+
{{- toYaml . | nindent 4 }}
37+
{{- end }}
3238
{{- end }}
3339
{{- end }}

‎charts/sentry/templates/sentry/ingest/transactions/hpa-ingest-consumer-transactions.yaml‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,27 @@ spec:
1515
targetCPUUtilizationPercentage: {{ .Values.sentry.ingestConsumerTransactions.autoscaling.targetCPUUtilizationPercentage }}
1616
{{- else if semverCompare ">=1.27-0" .Capabilities.KubeVersion.GitVersion }}
1717
metrics:
18-
- type: ContainerResource
19-
containerResource:
20-
container: {{ .Chart.Name }}-ingest-consumer-transactions
21-
name: cpu
22-
target:
23-
type: Utilization
24-
averageUtilization: {{ .Values.sentry.ingestConsumerTransactions.autoscaling.targetCPUUtilizationPercentage }}
18+
- type: ContainerResource
19+
containerResource:
20+
container: {{ .Chart.Name }}-ingest-consumer-transactions
21+
name: cpu
22+
target:
23+
type: Utilization
24+
averageUtilization: {{ .Values.sentry.ingestConsumerTransactions.autoscaling.targetCPUUtilizationPercentage }}
2525
{{- else }}
2626
metrics:
27-
- type: Resource
28-
resource:
29-
name: cpu
30-
target:
31-
type: Utilization
32-
averageUtilization: {{ .Values.sentry.ingestConsumerTransactions.autoscaling.targetCPUUtilizationPercentage }}
27+
- type: Resource
28+
resource:
29+
name: cpu
30+
target:
31+
type: Utilization
32+
averageUtilization: {{ .Values.sentry.ingestConsumerTransactions.autoscaling.targetCPUUtilizationPercentage }}
33+
{{- end }}
34+
{{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v2" }}
35+
{{- with .Values.sentry.ingestConsumerTransactions.autoscaling.behavior }}
36+
behavior:
37+
{{- toYaml . | nindent 4 }}
38+
{{- end }}
3339
{{- end }}
3440
{{- end }}
3541
{{- end }}

‎charts/sentry/templates/sentry/vroom/hpa-vroom.yaml‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,27 @@ spec:
1515
targetCPUUtilizationPercentage: {{ .Values.vroom.autoscaling.targetCPUUtilizationPercentage }}
1616
{{- else if semverCompare ">=1.27-0" .Capabilities.KubeVersion.GitVersion }}
1717
metrics:
18-
- type: ContainerResource
19-
containerResource:
20-
container: {{ .Chart.Name }}-vroom
21-
name: cpu
22-
target:
23-
type: Utilization
24-
averageUtilization: {{ .Values.vroom.autoscaling.targetCPUUtilizationPercentage }}
18+
- type: ContainerResource
19+
containerResource:
20+
container: {{ .Chart.Name }}-vroom
21+
name: cpu
22+
target:
23+
type: Utilization
24+
averageUtilization: {{ .Values.vroom.autoscaling.targetCPUUtilizationPercentage }}
2525
{{- else }}
2626
metrics:
27-
- type: Resource
28-
resource:
29-
name: cpu
30-
target:
31-
type: Utilization
32-
averageUtilization: {{ .Values.vroom.autoscaling.targetCPUUtilizationPercentage }}
27+
- type: Resource
28+
resource:
29+
name: cpu
30+
target:
31+
type: Utilization
32+
averageUtilization: {{ .Values.vroom.autoscaling.targetCPUUtilizationPercentage }}
33+
{{- end }}
34+
{{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v2" }}
35+
{{- with .Values.vroom.autoscaling.behavior }}
36+
behavior:
37+
{{- toYaml . | nindent 4 }}
38+
{{- end }}
3339
{{- end }}
3440
{{- end }}
3541
{{- end }}

‎charts/sentry/templates/sentry/web/hpa-web.yaml‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,26 @@ spec:
1414
targetCPUUtilizationPercentage: {{ .Values.sentry.web.autoscaling.targetCPUUtilizationPercentage }}
1515
{{- else if semverCompare ">=1.27-0" .Capabilities.KubeVersion.GitVersion }}
1616
metrics:
17-
- type: ContainerResource
18-
containerResource:
19-
container: {{ .Chart.Name }}-web
20-
name: cpu
21-
target:
22-
type: Utilization
23-
averageUtilization: {{ .Values.sentry.web.autoscaling.targetCPUUtilizationPercentage }}
17+
- type: ContainerResource
18+
containerResource:
19+
container: {{ .Chart.Name }}-web
20+
name: cpu
21+
target:
22+
type: Utilization
23+
averageUtilization: {{ .Values.sentry.web.autoscaling.targetCPUUtilizationPercentage }}
2424
{{- else }}
2525
metrics:
26-
- type: Resource
27-
resource:
28-
name: cpu
29-
target:
30-
type: Utilization
31-
averageUtilization: {{ .Values.sentry.web.autoscaling.targetCPUUtilizationPercentage }}
26+
- type: Resource
27+
resource:
28+
name: cpu
29+
target:
30+
type: Utilization
31+
averageUtilization: {{ .Values.sentry.web.autoscaling.targetCPUUtilizationPercentage }}
32+
{{- end }}
33+
{{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v2" }}
34+
{{- with .Values.sentry.web.autoscaling.behavior }}
35+
behavior:
36+
{{- toYaml . | nindent 4 }}
37+
{{- end }}
3238
{{- end }}
3339
{{- end }}

‎charts/sentry/templates/sentry/worker/hpa-worker-events.yaml‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,26 @@ spec:
1414
targetCPUUtilizationPercentage: {{ .Values.sentry.workerEvents.autoscaling.targetCPUUtilizationPercentage }}
1515
{{- else if semverCompare ">=1.27-0" .Capabilities.KubeVersion.GitVersion }}
1616
metrics:
17-
- type: ContainerResource
18-
containerResource:
19-
container: {{ .Chart.Name }}-worker
20-
name: cpu
21-
target:
22-
type: Utilization
23-
averageUtilization: {{ .Values.sentry.workerEvents.autoscaling.targetCPUUtilizationPercentage }}
17+
- type: ContainerResource
18+
containerResource:
19+
container: {{ .Chart.Name }}-worker
20+
name: cpu
21+
target:
22+
type: Utilization
23+
averageUtilization: {{ .Values.sentry.workerEvents.autoscaling.targetCPUUtilizationPercentage }}
2424
{{- else }}
2525
metrics:
26-
- type: Resource
27-
resource:
28-
name: cpu
29-
target:
30-
type: Utilization
31-
averageUtilization: {{ .Values.sentry.workerEvents.autoscaling.targetCPUUtilizationPercentage }}
26+
- type: Resource
27+
resource:
28+
name: cpu
29+
target:
30+
type: Utilization
31+
averageUtilization: {{ .Values.sentry.workerEvents.autoscaling.targetCPUUtilizationPercentage }}
32+
{{- end }}
33+
{{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v2" }}
34+
{{- with .Values.sentry.workerEvents.autoscaling.behavior }}
35+
behavior:
36+
{{- toYaml . | nindent 4 }}
37+
{{- end }}
3238
{{- end }}
3339
{{- end }}

‎charts/sentry/templates/sentry/worker/hpa-worker-transactions.yaml‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,26 @@ spec:
1414
targetCPUUtilizationPercentage: {{ .Values.sentry.workerTransactions.autoscaling.targetCPUUtilizationPercentage }}
1515
{{- else if semverCompare ">=1.27-0" .Capabilities.KubeVersion.GitVersion }}
1616
metrics:
17-
- type: ContainerResource
18-
containerResource:
19-
container: {{ .Chart.Name }}-worker
20-
name: cpu
21-
target:
22-
type: Utilization
23-
averageUtilization: {{ .Values.sentry.workerTransactions.autoscaling.targetCPUUtilizationPercentage }}
17+
- type: ContainerResource
18+
containerResource:
19+
container: {{ .Chart.Name }}-worker
20+
name: cpu
21+
target:
22+
type: Utilization
23+
averageUtilization: {{ .Values.sentry.workerTransactions.autoscaling.targetCPUUtilizationPercentage }}
2424
{{- else }}
2525
metrics:
26-
- type: Resource
27-
resource:
28-
name: cpu
29-
target:
30-
type: Utilization
31-
averageUtilization: {{ .Values.sentry.workerTransactions.autoscaling.targetCPUUtilizationPercentage }}
26+
- type: Resource
27+
resource:
28+
name: cpu
29+
target:
30+
type: Utilization
31+
averageUtilization: {{ .Values.sentry.workerTransactions.autoscaling.targetCPUUtilizationPercentage }}
32+
{{- end }}
33+
{{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v2" }}
34+
{{- with .Values.sentry.workerTransactions.autoscaling.behavior }}
35+
behavior:
36+
{{- toYaml . | nindent 4 }}
37+
{{- end }}
3238
{{- end }}
3339
{{- end }}

‎charts/sentry/templates/sentry/worker/hpa-worker.yaml‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,26 @@ spec:
1414
targetCPUUtilizationPercentage: {{ .Values.sentry.worker.autoscaling.targetCPUUtilizationPercentage }}
1515
{{- else if semverCompare ">=1.27-0" .Capabilities.KubeVersion.GitVersion }}
1616
metrics:
17-
- type: ContainerResource
18-
containerResource:
19-
container: {{ .Chart.Name }}-worker
20-
name: cpu
21-
target:
22-
type: Utilization
23-
averageUtilization: {{ .Values.sentry.worker.autoscaling.targetCPUUtilizationPercentage }}
17+
- type: ContainerResource
18+
containerResource:
19+
container: {{ .Chart.Name }}-worker
20+
name: cpu
21+
target:
22+
type: Utilization
23+
averageUtilization: {{ .Values.sentry.worker.autoscaling.targetCPUUtilizationPercentage }}
2424
{{- else }}
2525
metrics:
26-
- type: Resource
27-
resource:
28-
name: cpu
29-
target:
30-
type: Utilization
31-
averageUtilization: {{ .Values.sentry.worker.autoscaling.targetCPUUtilizationPercentage }}
26+
- type: Resource
27+
resource:
28+
name: cpu
29+
target:
30+
type: Utilization
31+
averageUtilization: {{ .Values.sentry.worker.autoscaling.targetCPUUtilizationPercentage }}
32+
{{- end }}
33+
{{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v2" }}
34+
{{- with .Values.sentry.worker.autoscaling.behavior }}
35+
behavior:
36+
{{- toYaml . | nindent 4 }}
37+
{{- end }}
3238
{{- end }}
3339
{{- end }}

‎charts/sentry/templates/snuba/hpa-snuba-api.yaml‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,26 @@ spec:
1414
targetCPUUtilizationPercentage: {{ .Values.snuba.api.autoscaling.targetCPUUtilizationPercentage }}
1515
{{- else if semverCompare ">=1.27-0" .Capabilities.KubeVersion.GitVersion }}
1616
metrics:
17-
- type: ContainerResource
18-
containerResource:
19-
container: {{ .Chart.Name }}-snuba
20-
name: cpu
21-
target:
22-
type: Utilization
23-
averageUtilization: {{ .Values.snuba.api.autoscaling.targetCPUUtilizationPercentage }}
17+
- type: ContainerResource
18+
containerResource:
19+
container: {{ .Chart.Name }}-snuba
20+
name: cpu
21+
target:
22+
type: Utilization
23+
averageUtilization: {{ .Values.snuba.api.autoscaling.targetCPUUtilizationPercentage }}
2424
{{- else }}
2525
metrics:
26-
- type: Resource
27-
resource:
28-
name: cpu
29-
target:
30-
type: Utilization
31-
averageUtilization: {{ .Values.snuba.api.autoscaling.targetCPUUtilizationPercentage }}
26+
- type: Resource
27+
resource:
28+
name: cpu
29+
target:
30+
type: Utilization
31+
averageUtilization: {{ .Values.snuba.api.autoscaling.targetCPUUtilizationPercentage }}
32+
{{- end }}
33+
{{- if eq (include "sentry.autoscaling.apiVersion" .) "autoscaling/v2" }}
34+
{{- with .Values.snuba.api.autoscaling.behavior }}
35+
behavior:
36+
{{- toYaml . | nindent 4 }}
37+
{{- end }}
3238
{{- end }}
3339
{{- end }}

0 commit comments

Comments
 (0)