Skip to content

Commit aba3d60

Browse files
committed
Fix: Update HorizontalPodAutoscaler to autoscaling/v2
1 parent 55f2f71 commit aba3d60

17 files changed

+30561
-10
lines changed

helm/mail/templates/hpa.yaml

+19
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,24 @@ spec:
2525
minReplicas: {{ .Values.autoscaling.minReplicas }}
2626
maxReplicas: {{ .Values.autoscaling.maxReplicas }}
2727
metrics:
28+
{{- if semverCompare ">=1.23-0" .Capabilities.KubeVersion.GitVersion }}
29+
{{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
30+
- type: Resource
31+
resource:
32+
name: cpu
33+
target:
34+
type: Utilization
35+
averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
36+
{{- end }}
37+
{{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
38+
- type: Resource
39+
resource:
40+
name: memory
41+
target:
42+
type: Utilization
43+
averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
44+
{{- end }}
45+
{{- else }}
2846
{{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
2947
- type: Resource
3048
resource:
@@ -37,4 +55,5 @@ spec:
3755
name: memory
3856
targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
3957
{{- end }}
58+
{{- end }}
4059
{{- end }}

helm/schemas/cached/13b4d175672db1487d49c868bd7c5e3a78eb21f721c1c6af9ca552c4ccd1b558

+377
Large diffs are not rendered by default.

helm/schemas/cached/1505c4e27f41872537d967decd7754b9210f64a1a571b9860bb9b70d1aa37061

+384
Large diffs are not rendered by default.

helm/schemas/cached/3025a0e3a6858bf58105049b9db11ecdd707ffd5fde604811ccc930e43e9eed5

+691
Large diffs are not rendered by default.

helm/schemas/cached/3739df354a8810802b73072e4cec6f80f11c5fdda21f32fed4ed5543f27b40cf

+1,768
Large diffs are not rendered by default.

helm/schemas/cached/48ab9842c577e65cda0f5eb16b08929c1bbdedc01e5aaa49498c63cc068de080

+319
Large diffs are not rendered by default.

helm/schemas/cached/59146e3eacb931d365f82a601832dbb1258b870f74dde74573075d5030783659

+319
Large diffs are not rendered by default.

helm/schemas/cached/641ae711ddc0eab373295be960fed42666470d5465487d922ef3f4a03d4737e7

+326
Large diffs are not rendered by default.

helm/schemas/cached/8db63d5281c3d4a1aa467699ce49359b3ad53daca46c164c1cb25e41f77a20e4

+691
Large diffs are not rendered by default.

helm/schemas/cached/99f9af78423183d5b0f41de6962964f8047f2c374668ef89d61379cd7213bbeb

+11,035
Large diffs are not rendered by default.

helm/schemas/cached/b7f666397daa18dce7f5f567c8a79bb8cf1e7c03803f99f76d51e49fd208f183

+1,350
Large diffs are not rendered by default.

helm/schemas/cached/e900c45a86858dee3e60e3dcbf07211cbb405fa322784c8d888dc88842faa7ba

+10,082
Large diffs are not rendered by default.

helm/schemas/cached/edb1b1375b07ddfb6b128d6b497017a1cab246a77892901ce1a960d1aad8e9b7

+312
Large diffs are not rendered by default.

helm/schemas/master-standalone/horizontalpodautoscaler-autoscaling-v2.json

Whitespace-only changes.

helm/schemas/master-standalone/horizontalpodautoscaler-autoscaling-v2beta1.json

+1,245
Large diffs are not rendered by default.

helm/schemas/master-standalone/horizontalpodautoscaler-autoscaling-v2beta2.json

+1,616
Large diffs are not rendered by default.

helm/tests.sh

+27-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
#!/usr/bin/env bash
22
set -e
33

4+
reset="$(printf '\033[0m')"
5+
green="$(printf '\033[38;5;46m')"
6+
yellow="$(printf '\033[38;5;178m')"
7+
orange="$(printf '\033[38;5;208m')"
8+
orange_emphasis="$(printf '\033[38;5;220m')"
9+
lightblue="$(printf '\033[38;5;147m')"
10+
red="$(printf '\033[91m')"
11+
gray="$(printf '\033[38;5;245m')"
12+
emphasis="$(printf '\033[38;5;111m')"
13+
underline="$(printf '\033[4m')"
14+
415
SCRIPT_DIR="$( pwd; )/$( dirname -- $0; )"
516
cd "${SCRIPT_DIR}"
617
FIND="find"
@@ -12,16 +23,22 @@ if command -v gfind >/dev/null 2>&2; then
1223
fi
1324

1425
do_the_test() {
15-
local i="${1}"
16-
echo "☆☆☆☆☆☆☆☆☆☆ $i ☆☆☆☆☆☆☆☆☆☆"
17-
helm template -f $i --dry-run mail > fixtures/demo.yaml
18-
docker run \
19-
-v "${SCRIPT_DIR}/fixtures:/fixtures" \
20-
-v "${SCRIPT_DIR}/schemas:/schemas" \
21-
garethr/kubeval \
22-
--force-color \
23-
--additional-schema-locations file:///schemas \
24-
fixtures/demo.yaml
26+
local i="${1}" v
27+
printf '%s' "${gray}☆☆☆☆☆☆☆☆☆☆${reset} ${orange_emphasis}$i${reset}: ${gray}☆☆☆☆☆☆☆☆☆☆${reset}"
28+
echo
29+
for v in 1.22.9 1.29.4; do
30+
printf '%s' "${emphasis}${lightblue}k8s v${v}${reset}${lightblue}... ${reset}"
31+
helm template -f "${i}" --kube-version "${v}" --dry-run mail > fixtures/demo.yaml
32+
docker run \
33+
-v "${SCRIPT_DIR}/fixtures:/fixtures" \
34+
-v "${SCRIPT_DIR}/schemas:/schemas" \
35+
ghcr.io/yannh/kubeconform:latest-alpine \
36+
-summary -debug -kubernetes-version "${v}" \
37+
-cache "./schemas/cached" \
38+
-schema-location "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/{{ .NormalizedKubernetesVersion }}-standalone{{ .StrictSuffix }}/{{ .ResourceKind }}{{ .KindSuffix }}.json" \
39+
-schema-location "./schemas/master-standalone/{{ .ResourceKind }}{{ .KindSuffix }}.json" \
40+
fixtures/demo.yaml
41+
done
2542
}
2643

2744

0 commit comments

Comments
 (0)