From 53906be935f0263b5ed2da955bce95badabb61c2 Mon Sep 17 00:00:00 2001 From: Jerod Culpepper Date: Mon, 30 Sep 2024 16:37:34 -0700 Subject: [PATCH 1/5] add optional appProtocol field for metrics service Signed-off-by: Jerod Culpepper --- bitnami/zookeeper/templates/metrics-svc.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bitnami/zookeeper/templates/metrics-svc.yaml b/bitnami/zookeeper/templates/metrics-svc.yaml index 82266d27d9e5a7..ca140d0f96b10b 100644 --- a/bitnami/zookeeper/templates/metrics-svc.yaml +++ b/bitnami/zookeeper/templates/metrics-svc.yaml @@ -21,6 +21,9 @@ spec: - name: tcp-metrics port: {{ .Values.metrics.service.port }} targetPort: metrics + {{- if .Values.metrics.service.appProtocol }} + appProtocol: {{ .Values.metrics.service.appProtocol }} + {{- end }} {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.podLabels .Values.commonLabels ) "context" . ) }} selector: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 4 }} app.kubernetes.io/component: zookeeper From 71d91d2dce837a483d0dd8b339c8dd1e1def5806 Mon Sep 17 00:00:00 2001 From: Jerod Culpepper Date: Tue, 1 Oct 2024 09:27:27 -0700 Subject: [PATCH 2/5] update docs and version Signed-off-by: Jerod Culpepper --- bitnami/zookeeper/Chart.yaml | 2 +- bitnami/zookeeper/README.md | 3 ++- bitnami/zookeeper/values.yaml | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bitnami/zookeeper/Chart.yaml b/bitnami/zookeeper/Chart.yaml index 4ecaafab55cf32..ab8265eb47f418 100644 --- a/bitnami/zookeeper/Chart.yaml +++ b/bitnami/zookeeper/Chart.yaml @@ -28,4 +28,4 @@ maintainers: name: zookeeper sources: - https://github.com/bitnami/charts/tree/main/bitnami/zookeeper -version: 13.4.14 +version: 13.4.15 diff --git a/bitnami/zookeeper/README.md b/bitnami/zookeeper/README.md index 023b7606e0d45e..79076e3879f102 100644 --- a/bitnami/zookeeper/README.md +++ b/bitnami/zookeeper/README.md @@ -363,9 +363,10 @@ As an alternative, you can use any of the preset configurations for pod affinity | Name | Description | Value | | ------------------------------------------ | ------------------------------------------------------------------------------------- | ----------- | -| `metrics.enabled` | Enable Prometheus to access ZooKeeper metrics endpoint | `false` | +| `metrics.enabled` | Enable Prometheus to access ZooKeeper metrics endpoint | `true` | | `metrics.service.type` | ZooKeeper Prometheus Exporter service type | `ClusterIP` | | `metrics.service.port` | ZooKeeper Prometheus Exporter service port | `9141` | +| `metrics.service.appProtocol` | Optionally specify the ZooKeeper Prometheus Exporter service appProtocol | `""` | | `metrics.service.annotations` | Annotations for Prometheus to auto-discover the metrics endpoint | `{}` | | `metrics.serviceMonitor.enabled` | Create ServiceMonitor Resource for scraping metrics using Prometheus Operator | `false` | | `metrics.serviceMonitor.namespace` | Namespace for the ServiceMonitor Resource (defaults to the Release Namespace) | `""` | diff --git a/bitnami/zookeeper/values.yaml b/bitnami/zookeeper/values.yaml index d3625e379103a8..f8896b77d0e3d8 100644 --- a/bitnami/zookeeper/values.yaml +++ b/bitnami/zookeeper/values.yaml @@ -826,6 +826,9 @@ metrics: ## @param metrics.service.port ZooKeeper Prometheus Exporter service port ## port: 9141 + ## @param metrics.service.appProtocol Optionally specify the ZooKeeper Prometheus Exporter service appProtocol + ## + appProtocol: "" ## @param metrics.service.annotations [object] Annotations for Prometheus to auto-discover the metrics endpoint ## annotations: From 56d3e6e76e549c13667b4227601ceb4456c947f7 Mon Sep 17 00:00:00 2001 From: Jerod Culpepper Date: Tue, 1 Oct 2024 10:24:40 -0700 Subject: [PATCH 3/5] add servicemonitor fields Signed-off-by: Jerod Culpepper --- bitnami/zookeeper/README.md | 4 +++- bitnami/zookeeper/templates/servicemonitor.yaml | 6 ++++++ bitnami/zookeeper/values.yaml | 12 ++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/bitnami/zookeeper/README.md b/bitnami/zookeeper/README.md index 79076e3879f102..cd1f553fe31e69 100644 --- a/bitnami/zookeeper/README.md +++ b/bitnami/zookeeper/README.md @@ -363,7 +363,7 @@ As an alternative, you can use any of the preset configurations for pod affinity | Name | Description | Value | | ------------------------------------------ | ------------------------------------------------------------------------------------- | ----------- | -| `metrics.enabled` | Enable Prometheus to access ZooKeeper metrics endpoint | `true` | +| `metrics.enabled` | Enable Prometheus to access ZooKeeper metrics endpoint | `false` | | `metrics.service.type` | ZooKeeper Prometheus Exporter service type | `ClusterIP` | | `metrics.service.port` | ZooKeeper Prometheus Exporter service port | `9141` | | `metrics.service.appProtocol` | Optionally specify the ZooKeeper Prometheus Exporter service appProtocol | `""` | @@ -378,6 +378,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 | `{}` | diff --git a/bitnami/zookeeper/templates/servicemonitor.yaml b/bitnami/zookeeper/templates/servicemonitor.yaml index 849a23397ccbea..59f4e3079a29a2 100644 --- a/bitnami/zookeeper/templates/servicemonitor.yaml +++ b/bitnami/zookeeper/templates/servicemonitor.yaml @@ -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" . }} diff --git a/bitnami/zookeeper/values.yaml b/bitnami/zookeeper/values.yaml index f8896b77d0e3d8..29263938861648 100644 --- a/bitnami/zookeeper/values.yaml +++ b/bitnami/zookeeper/values.yaml @@ -871,6 +871,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: From fdfcb9b53d50562b95ba1a5ec2b849aef02ed6d2 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Tue, 1 Oct 2024 22:42:47 +0000 Subject: [PATCH 4/5] Update CHANGELOG.md Signed-off-by: Bitnami Containers --- bitnami/zookeeper/CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bitnami/zookeeper/CHANGELOG.md b/bitnami/zookeeper/CHANGELOG.md index fa8e23cf8817e9..c113e8b038d6b6 100644 --- a/bitnami/zookeeper/CHANGELOG.md +++ b/bitnami/zookeeper/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 13.4.14 (2024-09-23) +## 13.4.15 (2024-10-01) -* [bitnami/zookeeper] Drop unused `getValueFromSecret` local helper ([#29440](https://github.com/bitnami/charts/pull/29440)) +* [bitnami/zookeeper] Expose appProtocol, scheme, and tlsConfig for Istio compatibility ([#29683](https://github.com/bitnami/charts/pull/29683)) + +## 13.4.14 (2024-09-23) + +* [bitnami/zookeeper] Drop unused `getValueFromSecret` local helper (#29440) ([630e4cb](https://github.com/bitnami/charts/commit/630e4cb5e4af4fda0bc633cd9ffe3930a93f13b3)), closes [#29440](https://github.com/bitnami/charts/issues/29440) ## 13.4.13 (2024-09-17) From 4200b169d0dca7e5fb50e356c31c9f19cd3d2445 Mon Sep 17 00:00:00 2001 From: Bitnami Containers Date: Wed, 2 Oct 2024 19:44:01 +0000 Subject: [PATCH 5/5] Update CHANGELOG.md Signed-off-by: Bitnami Containers --- bitnami/zookeeper/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/zookeeper/CHANGELOG.md b/bitnami/zookeeper/CHANGELOG.md index c113e8b038d6b6..c9994214ce4488 100644 --- a/bitnami/zookeeper/CHANGELOG.md +++ b/bitnami/zookeeper/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 13.4.15 (2024-10-01) +## 13.4.15 (2024-10-02) * [bitnami/zookeeper] Expose appProtocol, scheme, and tlsConfig for Istio compatibility ([#29683](https://github.com/bitnami/charts/pull/29683))