[bitnami/zookeeper] Rename metrics port and expose scheme, and tlsConfig for Istio compatibility (#29683)

bitnami/zookeeper/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
-## 13.4.15 (2024-10-09)
+## 13.5.0 (2024-10-09)
 
-* [bitnami/zookeeper] Release 13.4.15 ([#29850](https://github.com/bitnami/charts/pull/29850))
+* [bitnami/zookeeper] Rename metrics port and expose scheme, and tlsConfig for Istio compatibility ([#29683](https://github.com/bitnami/charts/pull/29683))
+
+## <small>13.4.15 (2024-10-09)</small>
+
+* [bitnami/zookeeper] Release 13.4.15 (#29850) ([f3af6eb](https://github.com/bitnami/charts/commit/f3af6ebad051648b856f45e54e6c86858265b766)), closes [#29850](https://github.com/bitnami/charts/issues/29850)
 
 ## <small>13.4.14 (2024-09-23)</small>
 

bitnami/zookeeper/Chart.yaml

@@ -28,4 +28,4 @@ maintainers:
 name: zookeeper
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/zookeeper
-version: 13.4.15
+version: 13.5.0

bitnami/zookeeper/README.md

@@ -377,6 +377,8 @@ As an alternative, you can use any of the preset configurations for pod affinity
 | `metrics.serviceMonitor.metricRelabelings` | MetricRelabelConfigs to apply to samples before ingestion                             | `[]`        |
 | `metrics.serviceMonitor.honorLabels`       | Specify honorLabels parameter to add the scrape endpoint                              | `false`     |
 | `metrics.serviceMonitor.jobLabel`          | The name of the label on the target service to use as the job name in prometheus.     | `""`        |
+| `metrics.serviceMonitor.scheme`            | The explicit scheme for metrics scraping.                                             | `""`        |
+| `metrics.serviceMonitor.tlsConfig`         | TLS configuration used for scrape endpoints used by Prometheus                        | `{}`        |
 | `metrics.prometheusRule.enabled`           | Create a PrometheusRule for Prometheus Operator                                       | `false`     |
 | `metrics.prometheusRule.namespace`         | Namespace for the PrometheusRule Resource (defaults to the Release Namespace)         | `""`        |
 | `metrics.prometheusRule.additionalLabels`  | Additional labels that can be used so PrometheusRule will be discovered by Prometheus | `{}`        |

bitnami/zookeeper/templates/metrics-svc.yaml

@@ -18,7 +18,7 @@ metadata:
 spec:
   type: {{ .Values.metrics.service.type }}
   ports:
-    - name: tcp-metrics
+    - name: http-metrics
       port: {{ .Values.metrics.service.port }}
       targetPort: metrics
   {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }}

bitnami/zookeeper/templates/servicemonitor.yaml

@@ -28,7 +28,7 @@ spec:
       {{- end }}
       app.kubernetes.io/component: metrics
   endpoints:
-    - port: tcp-metrics
+    - port: http-metrics
       path: "/metrics"
       {{- if .Values.metrics.serviceMonitor.interval }}
       interval: {{ .Values.metrics.serviceMonitor.interval }}
@@ -45,6 +45,12 @@ spec:
       {{- if .Values.metrics.serviceMonitor.honorLabels }}
       honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }}
       {{- end }}
+      {{- if .Values.metrics.serviceMonitor.scheme }}
+      scheme: {{ .Values.metrics.serviceMonitor.scheme }}
+      {{- end }}
+      {{- if .Values.metrics.serviceMonitor.tlsConfig }}
+      tlsConfig: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.tlsConfig "context" $ ) | nindent 8 }}
+      {{- end }}
   namespaceSelector:
     matchNames:
       - {{ template "zookeeper.namespace" . }}

bitnami/zookeeper/values.yaml

@@ -868,6 +868,18 @@ metrics:
     ## @param metrics.serviceMonitor.jobLabel The name of the label on the target service to use as the job name in prometheus.
     ##
     jobLabel: ""
+    ## @param metrics.serviceMonitor.scheme The explicit scheme for metrics scraping.
+    ##
+    scheme: ""
+    ## @param metrics.serviceMonitor.tlsConfig [object] TLS configuration used for scrape endpoints used by Prometheus
+    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#tlsconfig
+    ## e.g:
+    ## tlsConfig:
+    ##   ca:
+    ##     secret:
+    ##       name: existingSecretName
+    ##
+    tlsConfig: {}
   ## Prometheus Operator PrometheusRule configuration
   ##
   prometheusRule: