Skip to content

Commit 9c0fe4f

Browse files
committed
Fixing HPA for eks 1.27
1 parent 8494587 commit 9c0fe4f

File tree

8 files changed

+30
-24
lines changed

8 files changed

+30
-24
lines changed

helmfile/jumppod/jumppod-values-v1.4.0.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@ replicaCount: 1
22

33
secret:
44
enabled: false
5+
name: ""
6+
mountPath: {}
7+
subPath: {}
8+
readOnly: true
9+
data: {}
510

611
configMap:
712
enabled: true
8-
name: "jumppod-api"
13+
name: "jumppod"
914
mountPath: /app/core/config
1015
readOnly: true
1116
data:
@@ -35,6 +40,7 @@ serviceAccount:
3540
namespace: devops-tools
3641

3742
service:
43+
enabled: true
3844
type: ClusterIP
3945
ports:
4046
- name: http

helmfile/jumppod/jumppod-values.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ secret:
1010

1111
configMap:
1212
enabled: true
13-
name: "jumppod-api"
13+
name: "jumppod"
1414
mountPath: /app/core/config
1515
readOnly: true
1616
data:
@@ -25,9 +25,9 @@ configMap:
2525
}
2626
2727
image:
28-
repository: devopscorner/cicd:alpine
28+
repository: devopscorner/cicd
2929
pullPolicy: Always # IfNotPresent -or- Always
30-
tag: "latest"
30+
tag: "alpine"
3131

3232
imagePullSecrets: []
3333
nameOverride: "jumppod"

template/lab/api/templates/deployment.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ spec:
3939
env:
4040
{{- toYaml .Values.application.env | nindent 12 }}
4141
{{- end }}
42-
{{- if .Values.envFrom.enabled }}
43-
envFrom:
44-
{{- toYaml .Values.envFrom.envFrom | nindent 12 }}
45-
{{- end }}
4642
{{- if .Values.container }}
4743
ports:
4844
{{- with .Values.container.ports }}

template/lab/api/templates/hpa.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if .Values.autoscaling.enabled }}
2-
apiVersion: autoscaling/v2beta1
2+
apiVersion: autoscaling/v1
33
kind: HorizontalPodAutoscaler
44
metadata:
55
name: {{ include "api.fullname" . }}
@@ -18,12 +18,16 @@ spec:
1818
- type: Resource
1919
resource:
2020
name: cpu
21-
targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
21+
target:
22+
type:
23+
averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
2224
{{- end }}
2325
{{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
2426
- type: Resource
2527
resource:
2628
name: memory
27-
targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
29+
target:
30+
type:
31+
averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
2832
{{- end }}
2933
{{- end }}

template/lab/backend/templates/deployment.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ spec:
3939
env:
4040
{{- toYaml .Values.application.env | nindent 12 }}
4141
{{- end }}
42-
{{- if .Values.envFrom.enabled }}
43-
envFrom:
44-
{{- toYaml .Values.envFrom.envFrom | nindent 12 }}
45-
{{- end }}
4642
{{- if .Values.container }}
4743
ports:
4844
{{- with .Values.container.ports }}

template/lab/backend/templates/hpa.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if .Values.autoscaling.enabled }}
2-
apiVersion: autoscaling/v2beta1
2+
apiVersion: autoscaling/v2
33
kind: HorizontalPodAutoscaler
44
metadata:
55
name: {{ include "backend.fullname" . }}
@@ -18,12 +18,16 @@ spec:
1818
- type: Resource
1919
resource:
2020
name: cpu
21-
targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
21+
target:
22+
type:
23+
averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
2224
{{- end }}
2325
{{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
2426
- type: Resource
2527
resource:
2628
name: memory
27-
targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
29+
target:
30+
type:
31+
averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
2832
{{- end }}
2933
{{- end }}

template/lab/frontend/templates/deployment.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ spec:
3838
env:
3939
{{- toYaml .Values.application.env | nindent 12 }}
4040
{{- end }}
41-
{{- if .Values.envFrom.enabled }}
42-
envFrom:
43-
{{- toYaml .Values.envFrom.envFrom | nindent 12 }}
44-
{{- end }}
4541
{{- if .Values.container }}
4642
ports:
4743
{{- with .Values.container.ports }}

template/lab/frontend/templates/hpa.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,16 @@ spec:
1818
- type: Resource
1919
resource:
2020
name: cpu
21-
targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
21+
target:
22+
type:
23+
averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
2224
{{- end }}
2325
{{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
2426
- type: Resource
2527
resource:
2628
name: memory
27-
targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
29+
target:
30+
type:
31+
averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
2832
{{- end }}
2933
{{- end }}

0 commit comments

Comments
 (0)