From 7d7df6ceef66dcef17177b54154c7bad85e3adb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n=20Garc=C3=ADa?= Date: Tue, 6 May 2025 15:58:01 +0200 Subject: [PATCH] [bitnami/prometheus] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references (#33424) --- bitnami/prometheus/CHANGELOG.md | 10 ++++++++-- bitnami/prometheus/Chart.lock | 6 +++--- bitnami/prometheus/Chart.yaml | 2 +- bitnami/prometheus/templates/alertmanager/ingress.yaml | 6 +----- bitnami/prometheus/templates/server/ingress.yaml | 6 +----- .../prometheus/templates/server/thanos-ingress.yaml | 6 +----- 6 files changed, 15 insertions(+), 21 deletions(-) diff --git a/bitnami/prometheus/CHANGELOG.md b/bitnami/prometheus/CHANGELOG.md index 4d455bb4ab..91d7be40dc 100644 --- a/bitnami/prometheus/CHANGELOG.md +++ b/bitnami/prometheus/CHANGELOG.md @@ -1,8 +1,14 @@ # Changelog -## 2.0.2 (2025-05-02) +## 2.0.3 (2025-05-06) -* [bitnami/prometheus] Release 2.0.2 ([#33312](https://github.com/bitnami/charts/pull/33312)) +* [bitnami/prometheus] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references ([#33424](https://github.com/bitnami/charts/pull/33424)) + +## 2.0.2 (2025-05-02) + +* [bitnami/prometheus] Release 2.0.0 (#33240) ([123eb4e](https://github.com/bitnami/charts/commit/123eb4e36bb3852dc166ebfa53738cf0be581058)), closes [#33240](https://github.com/bitnami/charts/issues/33240) +* [bitnami/prometheus] Release 2.0.1 (#33311) ([4e0c474](https://github.com/bitnami/charts/commit/4e0c474059d9f1ee163f9e315df0874978c9768e)), closes [#33311](https://github.com/bitnami/charts/issues/33311) +* [bitnami/prometheus] Release 2.0.2 (#33312) ([a62fc07](https://github.com/bitnami/charts/commit/a62fc075b2e7428c8624cf2725180deeef12099a)), closes [#33312](https://github.com/bitnami/charts/issues/33312) ## 1.4.10 (2025-04-02) diff --git a/bitnami/prometheus/Chart.lock b/bitnami/prometheus/Chart.lock index b5c781bf94..47e329ee12 100644 --- a/bitnami/prometheus/Chart.lock +++ b/bitnami/prometheus/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: oci://registry-1.docker.io/bitnamicharts - version: 2.30.2 -digest: sha256:85748f67a5f7d7b1d8e36608bb0aae580ed522f65e17def2ccc88a5285992445 -generated: "2025-05-02T16:05:05.555757189Z" + version: 2.31.0 +digest: sha256:c4c9af4e0ca23cf2c549e403b2a2bba2c53a3557cee23da09fa4cdf710044c2c +generated: "2025-05-06T10:56:33.808122225+02:00" diff --git a/bitnami/prometheus/Chart.yaml b/bitnami/prometheus/Chart.yaml index 16333a90fd..2cbcae1807 100644 --- a/bitnami/prometheus/Chart.yaml +++ b/bitnami/prometheus/Chart.yaml @@ -37,4 +37,4 @@ sources: - https://github.com/bitnami/containers/tree/main/bitnami/prometheus - https://github.com/prometheus/prometheus - https://github.com/prometheus-community/helm-charts -version: 2.0.2 +version: 2.0.3 diff --git a/bitnami/prometheus/templates/alertmanager/ingress.yaml b/bitnami/prometheus/templates/alertmanager/ingress.yaml index 0845ad9e9c..9061b6dc73 100644 --- a/bitnami/prometheus/templates/alertmanager/ingress.yaml +++ b/bitnami/prometheus/templates/alertmanager/ingress.yaml @@ -19,7 +19,7 @@ metadata: annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: - {{- if and .Values.alertmanager.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }} + {{- if .Values.alertmanager.ingress.ingressClassName }} ingressClassName: {{ .Values.alertmanager.ingress.ingressClassName | quote }} {{- end }} rules: @@ -31,9 +31,7 @@ spec: {{- toYaml .Values.alertmanager.ingress.extraPaths | nindent 10 }} {{- end }} - path: {{ .Values.alertmanager.ingress.path }} - {{- if eq "true" (include "common.ingress.supportsPathType" .) }} pathType: {{ .Values.alertmanager.ingress.pathType }} - {{- end }} backend: {{- include "common.ingress.backend" (dict "serviceName" (include "prometheus.alertmanager.fullname" .) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- range .Values.alertmanager.ingress.extraHosts }} @@ -41,9 +39,7 @@ spec: http: paths: - path: {{ default "/" .path }} - {{- if eq "true" (include "common.ingress.supportsPathType" $) }} pathType: {{ default "ImplementationSpecific" .pathType }} - {{- end }} backend: {{- include "common.ingress.backend" (dict "serviceName" (include "prometheus.alertmanager.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- if .Values.alertmanager.ingress.extraRules }} diff --git a/bitnami/prometheus/templates/server/ingress.yaml b/bitnami/prometheus/templates/server/ingress.yaml index 026ea0b462..c0eee0e501 100644 --- a/bitnami/prometheus/templates/server/ingress.yaml +++ b/bitnami/prometheus/templates/server/ingress.yaml @@ -17,7 +17,7 @@ metadata: annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: - {{- if and .Values.server.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }} + {{- if .Values.server.ingress.ingressClassName }} ingressClassName: {{ .Values.server.ingress.ingressClassName | quote }} {{- end }} rules: @@ -29,9 +29,7 @@ spec: {{- toYaml .Values.server.ingress.extraPaths | nindent 10 }} {{- end }} - path: {{ .Values.server.ingress.path }} - {{- if eq "true" (include "common.ingress.supportsPathType" .) }} pathType: {{ .Values.server.ingress.pathType }} - {{- end }} backend: {{- include "common.ingress.backend" (dict "serviceName" (include "prometheus.server.fullname" .) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- range .Values.server.ingress.extraHosts }} @@ -39,9 +37,7 @@ spec: http: paths: - path: {{ default "/" .path }} - {{- if eq "true" (include "common.ingress.supportsPathType" $) }} pathType: {{ default "ImplementationSpecific" .pathType }} - {{- end }} backend: {{- include "common.ingress.backend" (dict "serviceName" (include "prometheus.server.fullname" $) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- if .Values.server.ingress.extraRules }} diff --git a/bitnami/prometheus/templates/server/thanos-ingress.yaml b/bitnami/prometheus/templates/server/thanos-ingress.yaml index e968301171..47a028801a 100644 --- a/bitnami/prometheus/templates/server/thanos-ingress.yaml +++ b/bitnami/prometheus/templates/server/thanos-ingress.yaml @@ -18,7 +18,7 @@ metadata: annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: - {{- if and .Values.server.thanos.ingress.ingressClassName (include "common.ingress.supportsIngressClassname" .) }} + {{- if .Values.server.thanos.ingress.ingressClassName }} ingressClassName: {{ .Values.server.thanos.ingress.ingressClassName | quote }} {{- end }} rules: @@ -30,9 +30,7 @@ spec: {{- include "common.tplvalues.render" (dict "value" .Values.server.thanos.ingress.extraPaths "context" $) | nindent 10 }} {{- end }} - path: {{ .Values.server.thanos.ingress.path }} - {{- if eq "true" (include "common.ingress.supportsPathType" .) }} pathType: {{ .Values.server.thanos.ingress.pathType }} - {{- end }} backend: {{- include "common.ingress.backend" (dict "serviceName" (include "prometheus.thanos-sidecar.fullname" $) "servicePort" "grpc" "context" $) | nindent 14 }} {{- end }} {{- range .Values.server.thanos.ingress.extraHosts }} @@ -40,9 +38,7 @@ spec: http: paths: - path: {{ default "/" .path }} - {{- if eq "true" (include "common.ingress.supportsPathType" $) }} pathType: {{ default "ImplementationSpecific" .pathType }} - {{- end }} backend: {{- include "common.ingress.backend" (dict "serviceName" (include "prometheus.thanos-sidecar.fullname" $) "servicePort" "grpc" "context" $) | nindent 14 }} {{- end }} {{- if .Values.server.thanos.ingress.extraRules }}