Skip to content

Commit bda530f

Browse files
authored
[kube-prometheus-stack] Fix default Kubernetes version assignment logic (#6658)
Signed-off-by: EmyLIEUTAUD <67641786+EmyLIEUTAUD@users.noreply.github.com>
1 parent 0141b96 commit bda530f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

charts/kube-prometheus-stack/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ name: kube-prometheus-stack
2828
sources:
2929
- https://github.com/prometheus-community/helm-charts
3030
- https://github.com/prometheus-operator/kube-prometheus
31-
version: 82.1.0
31+
version: 82.1.1
3232
# renovate: github=prometheus-operator/prometheus-operator
3333
appVersion: v0.89.0
3434
kubeVersion: ">=1.25.0-0"

charts/kube-prometheus-stack/charts/crds/templates/upgrade/job.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ spec:
7575
containers:
7676
- name: kubectl
7777
{{- $kubectlRegistry := .Values.global.imageRegistry | default .Values.upgradeJob.image.kubectl.registry -}}
78-
{{- $defaultKubernetesVersion := regexFind "v\\d+\\.\\d+\\.\\d+" .Capabilities.KubeVersion.Version }}
78+
{{- $defaultKubernetesVersion := (ternary (printf "%s.0" .Capabilities.KubeVersion.Version) (regexFind "v\\d+\\.\\d+\\.\\d+" .Capabilities.KubeVersion.Version) (regexMatch "^v\\d+\\.\\d+$" .Capabilities.KubeVersion.Version)) -}}
7979
{{- if .Values.upgradeJob.image.kubectl.sha }}
8080
image: "{{ $kubectlRegistry }}/{{ .Values.upgradeJob.image.kubectl.repository }}:{{ .Values.upgradeJob.image.kubectl.tag | default $defaultKubernetesVersion }}@sha256:{{ .Values.upgradeJob.image.kubectl.sha }}"
8181
{{- else }}

0 commit comments

Comments
 (0)