diff --git a/bitnami/spark/Chart.lock b/bitnami/spark/Chart.lock index 29967cdf5..ac0208e9f 100644 --- a/bitnami/spark/Chart.lock +++ b/bitnami/spark/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: https://charts.bitnami.com/bitnami - version: 1.13.1 -digest: sha256:1056dac8da880ed967a191e8d9eaf04766f77bda66a5715456d5dd4494a4a942 -generated: "2022-04-26T19:18:36.327873456Z" + version: 1.14.0 +digest: sha256:965d4465e4039d36637175307a8edfc13a53414d3bb698c0d26c8acc1cf3ec3d +generated: "2022-05-13T15:15:26.091606+02:00" diff --git a/bitnami/spark/Chart.yaml b/bitnami/spark/Chart.yaml index 167c196e4..59095ca86 100644 --- a/bitnami/spark/Chart.yaml +++ b/bitnami/spark/Chart.yaml @@ -22,4 +22,4 @@ name: spark sources: - https://github.com/bitnami/bitnami-docker-spark - https://spark.apache.org/ -version: 6.0.2 +version: 6.0.3 diff --git a/bitnami/spark/templates/hpa-worker.yaml b/bitnami/spark/templates/hpa-worker.yaml index a0393fa2e..d99a9726c 100644 --- a/bitnami/spark/templates/hpa-worker.yaml +++ b/bitnami/spark/templates/hpa-worker.yaml @@ -1,5 +1,5 @@ {{- if .Values.worker.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: {{ include "common.capabilities.hpa.apiVersion" . }} kind: HorizontalPodAutoscaler metadata: name: {{ printf "%s-autoscaler" (include "common.names.fullname" .) }} @@ -24,12 +24,24 @@ spec: - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.worker.autoscaling.targetMemory }} + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} + targetAverageUtilization: {{ .Values.worker.autoscaling.targetMemory }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.worker.autoscaling.targetMemory }} + {{- end }} {{- end }} {{- if .Values.worker.autoscaling.targetCPU }} - type: Resource resource: name: cpu + {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} targetAverageUtilization: {{ .Values.worker.autoscaling.targetCPU }} + {{- else }} + target: + type: Utilization + averageUtilization: {{ .Values.worker.autoscaling.targetCPU }} + {{- end }} {{- end }} {{- end }}