Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-16 14:57:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/nginx] Service Monitor support tlsConfig (#34109)

Browse Source 
* [bitnami/nginx] Service Monitor support `tlsConfig`

Signed-off-by: tommyluk <tommyluk@hket.com>

* [bitnami/nginx] Changelog and Readme

Signed-off-by: tommyluk <tommyluk@hket.com>

* Update CHANGELOG.md

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>

---------

Signed-off-by: tommyluk <tommyluk@hket.com>
Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
Signed-off-by: Alvaro Neira Ayuso <alvaro.neira@broadcom.com>
Co-authored-by: Bitnami Bot <bitnami.bot@broadcom.com>
Co-authored-by: Alvaro Neira Ayuso <alvaro.neira@broadcom.com>
This commit is contained in:
tommyluk
2025-06-11 00:21:11 +08:00
committed by GitHub
parent 8e61c28f6f
commit 97011dee10
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bitnami/nginx/CHANGELOG.md
View File

@@ -1,8 +1,12 @@
# Changelog # 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))
## <small>20.0.8 (2025-06-09)</small>
* [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)
## <small>20.0.7 (2025-06-06)</small> ## <small>20.0.7 (2025-06-06)</small>

2
bitnami/nginx/Chart.yaml
View File

@@ -37,4 +37,4 @@ maintainers:
name: nginx name: nginx
sources: sources:
- https://github.com/bitnami/charts/tree/main/bitnami/nginx - https://github.com/bitnami/charts/tree/main/bitnami/nginx
version: 20.0.8 version: 20.1.0

3
bitnami/nginx/README.md
View File

@@ -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.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.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.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.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.interval` | Interval at which metrics should be scraped. | `""` |
| `metrics.serviceMonitor.scrapeTimeout` | Timeout after which the scrape is ended | `""` | | `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, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.

4
bitnami/nginx/templates/servicemonitor.yaml
View File

@@ -24,6 +24,10 @@ spec:
endpoints: endpoints:
- port: metrics - port: metrics
path: /metrics path: /metrics
{{- if .Values.metrics.serviceMonitor.tlsConfig }}
scheme: https
tlsConfig: {{- toYaml .Values.metrics.serviceMonitor.tlsConfig | nindent 8 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.interval }} {{- if .Values.metrics.serviceMonitor.interval }}
interval: {{ .Values.metrics.serviceMonitor.interval }} interval: {{ .Values.metrics.serviceMonitor.interval }}
{{- end }} {{- end }}

3
bitnami/nginx/values.yaml
View File

@@ -1038,6 +1038,9 @@ metrics:
## @param metrics.serviceMonitor.namespace Namespace in which Prometheus is running ## @param metrics.serviceMonitor.namespace Namespace in which Prometheus is running
## ##
namespace: "" 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. ## @param metrics.serviceMonitor.jobLabel The name of the label on the target service to use as the job name in prometheus.
## ##
jobLabel: "" jobLabel: ""