mirror of
https://github.com/bitnami/charts.git
synced 2026-03-27 15:27:10 +08:00
[bitnami/clickhouse] Fix clickhouse VPA apiVersion and template (#36442)
* 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 <per@osbeck.com> * Apply suggestion from @jotamartos Signed-off-by: Juan José Martos <jota.martos@broadcom.com> * Remove old VPA apiVersion reference Removed outdated Vertical Pod Autoscaler apiVersion handling. Signed-off-by: Juan José Martos <jota.martos@broadcom.com> --------- Signed-off-by: Per Osbäck <per@osbeck.com> Signed-off-by: Juan José Martos <jota.martos@broadcom.com> Co-authored-by: Juan José Martos <jota.martos@broadcom.com>
This commit is contained in:
@@ -33,4 +33,4 @@ maintainers:
|
|||||||
name: clickhouse
|
name: clickhouse
|
||||||
sources:
|
sources:
|
||||||
- https://github.com/bitnami/charts/tree/main/bitnami/clickhouse
|
- https://github.com/bitnami/charts/tree/main/bitnami/clickhouse
|
||||||
version: 9.4.5
|
version: 9.4.6
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ kind: VerticalPodAutoscaler
|
|||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-shard%d" (include "common.names.fullname" $ ) $i }}
|
name: {{ printf "%s-shard%d" (include "common.names.fullname" $ ) $i }}
|
||||||
namespace: {{ include "common.names.namespace" $ | quote }}
|
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/component: clickhouse
|
||||||
app.kubernetes.io/part-of: clickhouse
|
app.kubernetes.io/part-of: clickhouse
|
||||||
{{- if or $.Values.autoscaling.vpa.annotations $.Values.commonAnnotations }}
|
{{- if or $.Values.autoscaling.vpa.annotations $.Values.commonAnnotations }}
|
||||||
|
|||||||
@@ -22,4 +22,4 @@ name: common
|
|||||||
sources:
|
sources:
|
||||||
- https://github.com/bitnami/charts/tree/main/bitnami/common
|
- https://github.com/bitnami/charts/tree/main/bitnami/common
|
||||||
type: library
|
type: library
|
||||||
version: 2.31.7
|
version: 2.31.8
|
||||||
|
|||||||
@@ -115,12 +115,7 @@ Return the appropriate apiVersion for Horizontal Pod Autoscaler.
|
|||||||
Return the appropriate apiVersion for Vertical Pod Autoscaler.
|
Return the appropriate apiVersion for Vertical Pod Autoscaler.
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "common.capabilities.vpa.apiVersion" -}}
|
{{- define "common.capabilities.vpa.apiVersion" -}}
|
||||||
{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
|
{{- print "autoscaling.k8s.io/v1" -}}
|
||||||
{{- if and (not (empty $kubeVersion)) (semverCompare "<1.25-0" $kubeVersion) -}}
|
|
||||||
{{- print "autoscaling/v1beta2" -}}
|
|
||||||
{{- else -}}
|
|
||||||
{{- print "autoscaling/v1" -}}
|
|
||||||
{{- end -}}
|
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
|
|||||||
Reference in New Issue
Block a user