[bitnami/prometheus] Allow tpl for ingress hostnames and allow ingress annotations to be both map object and string (#33525)

bitnami/prometheus/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
-## 2.0.5 (2025-05-08)
+## 2.0.6 (2025-05-09)
 
-* [bitnami/prometheus] :zap: :arrow_up: Update dependency references ([#33570](https://github.com/bitnami/charts/pull/33570))
+* [bitnami/prometheus] Allow tpl for ingress hostnames and allow ingress annotations to be both map object and string ([#33525](https://github.com/bitnami/charts/pull/33525))
+
+## <small>2.0.5 (2025-05-08)</small>
+
+* [bitnami/prometheus] :zap: :arrow_up: Update dependency references (#33570) ([4e3ea1e](https://github.com/bitnami/charts/commit/4e3ea1ed5d632e3b82904d6a77f672fd50139831)), closes [#33570](https://github.com/bitnami/charts/issues/33570)
 
 ## <small>2.0.4 (2025-05-07)</small>
 

bitnami/prometheus/Chart.yaml

@@ -39,4 +39,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.5
+version: 2.0.6

bitnami/prometheus/templates/alertmanager/ingress.yaml

@@ -24,7 +24,7 @@ spec:
   {{- end }}
   rules:
     {{- if .Values.alertmanager.ingress.hostname }}
-    - host: {{ .Values.alertmanager.ingress.hostname }}
+    - host: {{ tpl .Values.alertmanager.ingress.hostname . | quote }}
       http:
         paths:
           {{- if .Values.alertmanager.ingress.extraPaths }}

bitnami/prometheus/templates/server/ingress.yaml

@@ -22,7 +22,7 @@ spec:
   {{- end }}
   rules:
     {{- if .Values.server.ingress.hostname }}
-    - host: {{ .Values.server.ingress.hostname }}
+    - host: {{ tpl .Values.server.ingress.hostname . | quote }}
       http:
         paths:
           {{- if .Values.server.ingress.extraPaths }}

bitnami/prometheus/templates/server/thanos-ingress.yaml

@@ -23,7 +23,7 @@ spec:
   {{- end }}
   rules:
     {{- if .Values.server.thanos.ingress.hostname }}
-    - host: {{ .Values.server.thanos.ingress.hostname }}
+    - host: {{ tpl .Values.server.thanos.ingress.hostname . | quote }}
       http:
         paths:
           {{- if .Values.server.thanos.ingress.extraPaths }}

bitnami/prometheus/values.schema.json

@@ -626,7 +626,7 @@
                             "default": "/"
                         },
                         "annotations": {
-                            "type": "object",
+                            "type": ["object", "string"],
                             "description": "Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations.",
                             "default": {}
                         },
@@ -1741,7 +1741,7 @@
                                     "default": "/"
                                 },
                                 "annotations": {
-                                    "type": "object",
+                                    "type": ["object", "string"],
                                     "description": "Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations.",
                                     "default": {}
                                 },
@@ -1823,7 +1823,7 @@
                             "default": "/"
                         },
                         "annotations": {
-                            "type": "object",
+                            "type": ["object", "string"],
                             "description": "Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations.",
                             "default": {}
                         },
@@ -2142,4 +2142,4 @@
             }
         }
     }
-}
+}