From 97011dee108515c01d6850b2e3ba895352439e6e Mon Sep 17 00:00:00 2001 From: tommyluk <152151547+hket-tommyluk@users.noreply.github.com> Date: Wed, 11 Jun 2025 00:21:11 +0800 Subject: [PATCH] [bitnami/nginx] Service Monitor support tlsConfig (#34109) * [bitnami/nginx] Service Monitor support `tlsConfig` Signed-off-by: tommyluk * [bitnami/nginx] Changelog and Readme Signed-off-by: tommyluk * Update CHANGELOG.md Signed-off-by: Bitnami Bot * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Bot --------- Signed-off-by: tommyluk Signed-off-by: Bitnami Bot Signed-off-by: Alvaro Neira Ayuso Co-authored-by: Bitnami Bot Co-authored-by: Alvaro Neira Ayuso --- bitnami/nginx/CHANGELOG.md | 8 ++++++-- bitnami/nginx/Chart.yaml | 2 +- bitnami/nginx/README.md | 3 ++- bitnami/nginx/templates/servicemonitor.yaml | 4 ++++ bitnami/nginx/values.yaml | 3 +++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/bitnami/nginx/CHANGELOG.md b/bitnami/nginx/CHANGELOG.md index 6c96363e37..122692e6d6 100644 --- a/bitnami/nginx/CHANGELOG.md +++ b/bitnami/nginx/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 20.0.8 (2025-06-09) +## 20.1.0 (2025-06-10) -* [bitnami/nginx] Allow wildcards in ingress.hostname parameter ([#34095](https://github.com/bitnami/charts/pull/34095)) +* [bitnami/nginx] Service Monitor support tlsConfig ([#34109](https://github.com/bitnami/charts/pull/34109)) + +## 20.0.8 (2025-06-09) + +* [bitnami/nginx] Allow wildcards in ingress.hostname parameter (#34095) ([d4deec1](https://github.com/bitnami/charts/commit/d4deec169a66017c17e8f436cc0a992a500781d4)), closes [#34095](https://github.com/bitnami/charts/issues/34095) ## 20.0.7 (2025-06-06) diff --git a/bitnami/nginx/Chart.yaml b/bitnami/nginx/Chart.yaml index 46c7067fd6..af529ab5fc 100644 --- a/bitnami/nginx/Chart.yaml +++ b/bitnami/nginx/Chart.yaml @@ -37,4 +37,4 @@ maintainers: name: nginx sources: - https://github.com/bitnami/charts/tree/main/bitnami/nginx -version: 20.0.8 +version: 20.1.0 diff --git a/bitnami/nginx/README.md b/bitnami/nginx/README.md index dce6e012eb..525a7cdadd 100644 --- a/bitnami/nginx/README.md +++ b/bitnami/nginx/README.md @@ -410,6 +410,7 @@ For annotations, please see [this document](https://github.com/kubernetes/ingres | `metrics.resources` | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}` | | `metrics.serviceMonitor.enabled` | Creates a Prometheus Operator ServiceMonitor (also requires `metrics.enabled` to be `true`) | `false` | | `metrics.serviceMonitor.namespace` | Namespace in which Prometheus is running | `""` | +| `metrics.serviceMonitor.tlsConfig` | TLS configuration used for scrape endpoints used by Prometheus | `{}` | | `metrics.serviceMonitor.jobLabel` | The name of the label on the target service to use as the job name in prometheus. | `""` | | `metrics.serviceMonitor.interval` | Interval at which metrics should be scraped. | `""` | | `metrics.serviceMonitor.scrapeTimeout` | Timeout after which the scrape is ended | `""` | @@ -559,4 +560,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +limitations under the License. diff --git a/bitnami/nginx/templates/servicemonitor.yaml b/bitnami/nginx/templates/servicemonitor.yaml index d597e06be0..ddf171d000 100644 --- a/bitnami/nginx/templates/servicemonitor.yaml +++ b/bitnami/nginx/templates/servicemonitor.yaml @@ -24,6 +24,10 @@ spec: endpoints: - port: metrics path: /metrics + {{- if .Values.metrics.serviceMonitor.tlsConfig }} + scheme: https + tlsConfig: {{- toYaml .Values.metrics.serviceMonitor.tlsConfig | nindent 8 }} + {{- end }} {{- if .Values.metrics.serviceMonitor.interval }} interval: {{ .Values.metrics.serviceMonitor.interval }} {{- end }} diff --git a/bitnami/nginx/values.yaml b/bitnami/nginx/values.yaml index d8f75a6028..8dea3a0b76 100644 --- a/bitnami/nginx/values.yaml +++ b/bitnami/nginx/values.yaml @@ -1038,6 +1038,9 @@ metrics: ## @param metrics.serviceMonitor.namespace Namespace in which Prometheus is running ## namespace: "" + ## @param metrics.serviceMonitor.tlsConfig [object] TLS configuration used for scrape endpoints used by Prometheus + ## + tlsConfig: {} ## @param metrics.serviceMonitor.jobLabel The name of the label on the target service to use as the job name in prometheus. ## jobLabel: ""