From 69f5d02d1d57861beb2e11f54e0ab80e4ede14c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Osb=C3=A4ck?= Date: Mon, 9 Feb 2026 12:49:21 +0100 Subject: [PATCH] [bitnami/clickhouse] Fix clickhouse VPA apiVersion and template (#36442) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: correct context reference for custom labels in VerticalPodAutoscaler metadata Fixes #36439 fix: update apiVersion for Vertical Pod Autoscaler to use autoscaling.k8s.io/v1 Fixes #36303 chore: bump ClickHouse chart version to 9.4.6 chore: bump version to 2.31.8 in Chart.yaml Signed-off-by: Per Osbäck * Apply suggestion from @jotamartos Signed-off-by: Juan José Martos * Remove old VPA apiVersion reference Removed outdated Vertical Pod Autoscaler apiVersion handling. Signed-off-by: Juan José Martos --------- Signed-off-by: Per Osbäck Signed-off-by: Juan José Martos Co-authored-by: Juan José Martos --- bitnami/clickhouse/Chart.yaml | 2 +- bitnami/clickhouse/templates/vpa.yaml | 2 +- bitnami/common/Chart.yaml | 2 +- bitnami/common/templates/_capabilities.tpl | 7 +------ 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/bitnami/clickhouse/Chart.yaml b/bitnami/clickhouse/Chart.yaml index 6dab38c460..ef58e3848d 100644 --- a/bitnami/clickhouse/Chart.yaml +++ b/bitnami/clickhouse/Chart.yaml @@ -33,4 +33,4 @@ maintainers: name: clickhouse sources: - https://github.com/bitnami/charts/tree/main/bitnami/clickhouse -version: 9.4.5 +version: 9.4.6 diff --git a/bitnami/clickhouse/templates/vpa.yaml b/bitnami/clickhouse/templates/vpa.yaml index 235eea30b4..3691b66741 100644 --- a/bitnami/clickhouse/templates/vpa.yaml +++ b/bitnami/clickhouse/templates/vpa.yaml @@ -11,7 +11,7 @@ kind: VerticalPodAutoscaler metadata: name: {{ printf "%s-shard%d" (include "common.names.fullname" $ ) $i }} namespace: {{ include "common.names.namespace" $ | quote }} - labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" .) | nindent 4 }} + labels: {{- include "common.labels.standard" (dict "customLabels" $.Values.commonLabels "context" $) | nindent 4 }} app.kubernetes.io/component: clickhouse app.kubernetes.io/part-of: clickhouse {{- if or $.Values.autoscaling.vpa.annotations $.Values.commonAnnotations }} diff --git a/bitnami/common/Chart.yaml b/bitnami/common/Chart.yaml index e13f7121fe..32b767085d 100644 --- a/bitnami/common/Chart.yaml +++ b/bitnami/common/Chart.yaml @@ -22,4 +22,4 @@ name: common sources: - https://github.com/bitnami/charts/tree/main/bitnami/common type: library -version: 2.31.7 +version: 2.31.8 diff --git a/bitnami/common/templates/_capabilities.tpl b/bitnami/common/templates/_capabilities.tpl index 58f58c1c10..64ca3da1e1 100644 --- a/bitnami/common/templates/_capabilities.tpl +++ b/bitnami/common/templates/_capabilities.tpl @@ -115,12 +115,7 @@ Return the appropriate apiVersion for Horizontal Pod Autoscaler. Return the appropriate apiVersion for Vertical Pod Autoscaler. */}} {{- define "common.capabilities.vpa.apiVersion" -}} -{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}} -{{- if and (not (empty $kubeVersion)) (semverCompare "<1.25-0" $kubeVersion) -}} -{{- print "autoscaling/v1beta2" -}} -{{- else -}} -{{- print "autoscaling/v1" -}} -{{- end -}} +{{- print "autoscaling.k8s.io/v1" -}} {{- end -}} {{/*