瀏覽代碼

fix kubeval (#2505)

* fix kubeval

* fix kubeval

* fix kubeval

* fix issue with hpa

* fix version to 1.24.0

* fix 1.25
Narekmat 2 年之前
父節點
當前提交
df2b2e01de
共有 1 個文件被更改,包括 18 次插入0 次删除
  1. 18 0
      charts/kafka-ui/templates/hpa.yaml

+ 18 - 0
charts/kafka-ui/templates/hpa.yaml

@@ -1,5 +1,11 @@
 {{- if .Values.autoscaling.enabled }}
+{{- $kubeCapabilityVersion := semver .Capabilities.KubeVersion.Version -}}
+{{- $isHigher1p25 := ge (semver "1.25" | $kubeCapabilityVersion.Compare) 0 -}}
+{{- if and ($.Capabilities.APIVersions.Has "autoscaling/v2") $isHigher1p25 -}}
+apiVersion: autoscaling/v2
+{{- else  }}
 apiVersion: autoscaling/v2beta1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "kafka-ui.fullname" . }}
@@ -17,12 +23,24 @@ spec:
     - type: Resource
       resource:
         name: cpu
+  {{- if  $isHigher1p25 }}
+        target:
+         type: Utilization
+         averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+  {{- else  }}        
         targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+  {{- end }}      
   {{- end }}
   {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
+  {{- if  $isHigher1p25 }}     
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+  {{- else  }}   
         targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
   {{- end }}
+  {{- end }}
 {{- end }}