Fix: Update HorizontalPodAutoscaler to autoscaling/v2

bokysan · Apr 21, 2024 · aba3d60 · aba3d60
1 parent 55f2f71
commit aba3d60
Show file tree

Hide file tree

Showing 17 changed files with 30,561 additions and 10 deletions.
diff --git a/helm/mail/templates/hpa.yaml b/helm/mail/templates/hpa.yaml
@@ -25,6 +25,24 @@ spec:
   minReplicas: {{ .Values.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
   metrics:
+  {{- if semverCompare ">=1.23-0" .Capabilities.KubeVersion.GitVersion }}
+  {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+  {{- end }}
+  {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+  {{- end }}
+  {{- else }}
   {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
@@ -37,4 +55,5 @@ spec:
         name: memory
         targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
   {{- end }}
+  {{- end }}
 {{- end }}
diff --git a/helm/schemas/cached/13b4d175672db1487d49c868bd7c5e3a78eb21f721c1c6af9ca552c4ccd1b558 b/helm/schemas/cached/13b4d175672db1487d49c868bd7c5e3a78eb21f721c1c6af9ca552c4ccd1b558
diff --git a/helm/schemas/cached/1505c4e27f41872537d967decd7754b9210f64a1a571b9860bb9b70d1aa37061 b/helm/schemas/cached/1505c4e27f41872537d967decd7754b9210f64a1a571b9860bb9b70d1aa37061
diff --git a/helm/schemas/cached/3025a0e3a6858bf58105049b9db11ecdd707ffd5fde604811ccc930e43e9eed5 b/helm/schemas/cached/3025a0e3a6858bf58105049b9db11ecdd707ffd5fde604811ccc930e43e9eed5
diff --git a/helm/schemas/cached/3739df354a8810802b73072e4cec6f80f11c5fdda21f32fed4ed5543f27b40cf b/helm/schemas/cached/3739df354a8810802b73072e4cec6f80f11c5fdda21f32fed4ed5543f27b40cf
diff --git a/helm/schemas/cached/48ab9842c577e65cda0f5eb16b08929c1bbdedc01e5aaa49498c63cc068de080 b/helm/schemas/cached/48ab9842c577e65cda0f5eb16b08929c1bbdedc01e5aaa49498c63cc068de080
diff --git a/helm/schemas/cached/59146e3eacb931d365f82a601832dbb1258b870f74dde74573075d5030783659 b/helm/schemas/cached/59146e3eacb931d365f82a601832dbb1258b870f74dde74573075d5030783659
diff --git a/helm/schemas/cached/641ae711ddc0eab373295be960fed42666470d5465487d922ef3f4a03d4737e7 b/helm/schemas/cached/641ae711ddc0eab373295be960fed42666470d5465487d922ef3f4a03d4737e7
diff --git a/helm/schemas/cached/8db63d5281c3d4a1aa467699ce49359b3ad53daca46c164c1cb25e41f77a20e4 b/helm/schemas/cached/8db63d5281c3d4a1aa467699ce49359b3ad53daca46c164c1cb25e41f77a20e4
diff --git a/helm/schemas/cached/99f9af78423183d5b0f41de6962964f8047f2c374668ef89d61379cd7213bbeb b/helm/schemas/cached/99f9af78423183d5b0f41de6962964f8047f2c374668ef89d61379cd7213bbeb
diff --git a/helm/schemas/cached/b7f666397daa18dce7f5f567c8a79bb8cf1e7c03803f99f76d51e49fd208f183 b/helm/schemas/cached/b7f666397daa18dce7f5f567c8a79bb8cf1e7c03803f99f76d51e49fd208f183
diff --git a/helm/schemas/cached/e900c45a86858dee3e60e3dcbf07211cbb405fa322784c8d888dc88842faa7ba b/helm/schemas/cached/e900c45a86858dee3e60e3dcbf07211cbb405fa322784c8d888dc88842faa7ba
diff --git a/helm/schemas/cached/edb1b1375b07ddfb6b128d6b497017a1cab246a77892901ce1a960d1aad8e9b7 b/helm/schemas/cached/edb1b1375b07ddfb6b128d6b497017a1cab246a77892901ce1a960d1aad8e9b7
diff --git a/helm/schemas/master-standalone/horizontalpodautoscaler-autoscaling-v2.json b/helm/schemas/master-standalone/horizontalpodautoscaler-autoscaling-v2.json
diff --git a/helm/schemas/master-standalone/horizontalpodautoscaler-autoscaling-v2beta1.json b/helm/schemas/master-standalone/horizontalpodautoscaler-autoscaling-v2beta1.json
diff --git a/helm/schemas/master-standalone/horizontalpodautoscaler-autoscaling-v2beta2.json b/helm/schemas/master-standalone/horizontalpodautoscaler-autoscaling-v2beta2.json
diff --git a/helm/tests.sh b/helm/tests.sh
@@ -1,6 +1,17 @@
 #!/usr/bin/env bash
 set -e
 
+reset="$(printf '\033[0m')"
+green="$(printf '\033[38;5;46m')"
+yellow="$(printf '\033[38;5;178m')"
+orange="$(printf '\033[38;5;208m')"
+orange_emphasis="$(printf '\033[38;5;220m')"
+lightblue="$(printf '\033[38;5;147m')"
+red="$(printf '\033[91m')"
+gray="$(printf '\033[38;5;245m')"
+emphasis="$(printf '\033[38;5;111m')"
+underline="$(printf '\033[4m')"
+
 SCRIPT_DIR="$( pwd; )/$( dirname -- $0; )"
 cd "${SCRIPT_DIR}"
 FIND="find"
@@ -12,16 +23,22 @@ if command -v gfind >/dev/null 2>&2; then
 fi
 
 do_the_test() {
-    local i="${1}"
-    echo "☆☆☆☆☆☆☆☆☆☆ $i ☆☆☆☆☆☆☆☆☆☆"
-    helm template -f $i --dry-run mail > fixtures/demo.yaml
-    docker run \
-        -v "${SCRIPT_DIR}/fixtures:/fixtures" \
-        -v "${SCRIPT_DIR}/schemas:/schemas" \
-        garethr/kubeval \
-            --force-color \
-            --additional-schema-locations file:///schemas \
-            fixtures/demo.yaml
+    local i="${1}" v
+    printf '%s' "${gray}☆☆☆☆☆☆☆☆☆☆${reset} ${orange_emphasis}$i${reset}: ${gray}☆☆☆☆☆☆☆☆☆☆${reset}"
+    echo
+    for v in 1.22.9 1.29.4; do
+        printf '%s' "${emphasis}${lightblue}k8s v${v}${reset}${lightblue}... ${reset}"
+        helm template -f "${i}" --kube-version "${v}" --dry-run mail > fixtures/demo.yaml
+        docker run \
+            -v "${SCRIPT_DIR}/fixtures:/fixtures" \
+            -v "${SCRIPT_DIR}/schemas:/schemas" \
+            ghcr.io/yannh/kubeconform:latest-alpine \
+                -summary -debug -kubernetes-version "${v}" \
+                -cache "./schemas/cached" \
+                -schema-location "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/{{ .NormalizedKubernetesVersion }}-standalone{{ .StrictSuffix }}/{{ .ResourceKind }}{{ .KindSuffix }}.json" \
+                -schema-location "./schemas/master-standalone/{{ .ResourceKind }}{{ .KindSuffix }}.json" \
+                fixtures/demo.yaml
+    done
 }