DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add relabelings in controller-servicemonitor.yaml (#8008)

Browse source 
* Add relabelings above metricRelabelings in controller-servicemonitor.yaml

* Bump chart version to 4.0.13, Add to CHANGELOG

* Rename PR/CHANGELOG
This commit is contained in:
Daniel Sim 2021-12-06 08:50:32 -05:00 committed by GitHub
parent 2b499d9c86
commit f7a5704be8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/ingress-nginx/CHANGELOG.md
View file

@ -2,6 +2,10 @@
This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org). This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
### 4.0.13
- [8008] https://github.com/kubernetes/ingress-nginx/pull/8008 Add relabelings in controller-servicemonitor.yaml
### 4.0.12 ### 4.0.12
- [7978] https://github.com/kubernetes/ingress-nginx/pull/7979 Support custom annotations in admissions Jobs - [7978] https://github.com/kubernetes/ingress-nginx/pull/7979 Support custom annotations in admissions Jobs

2
charts/ingress-nginx/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
name: ingress-nginx name: ingress-nginx
# When the version is modified, make sure the artifacthub.io/changes list is updated # When the version is modified, make sure the artifacthub.io/changes list is updated
# Also update CHANGELOG.md # Also update CHANGELOG.md
version: 4.0.12 version: 4.0.13
appVersion: 1.1.0 appVersion: 1.1.0
home: https://github.com/kubernetes/ingress-nginx home: https://github.com/kubernetes/ingress-nginx
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer

3
charts/ingress-nginx/templates/controller-servicemonitor.yaml
View file

@ -19,6 +19,9 @@ spec:
{{- if .Values.controller.metrics.serviceMonitor.honorLabels }} {{- if .Values.controller.metrics.serviceMonitor.honorLabels }}
honorLabels: true honorLabels: true
{{- end }} {{- end }}
{{- if .Values.controller.metrics.serviceMonitor.relabelings }}
relabelings: {{ toYaml .Values.controller.metrics.serviceMonitor.relabelings | nindent 8 }}
{{- end }}
{{- if .Values.controller.metrics.serviceMonitor.metricRelabelings }} {{- if .Values.controller.metrics.serviceMonitor.metricRelabelings }}
metricRelabelings: {{ toYaml .Values.controller.metrics.serviceMonitor.metricRelabelings | nindent 8 }} metricRelabelings: {{ toYaml .Values.controller.metrics.serviceMonitor.metricRelabelings | nindent 8 }}
{{- end }} {{- end }}

1
charts/ingress-nginx/values.yaml
View file

@ -663,6 +663,7 @@ controller:
scrapeInterval: 30s scrapeInterval: 30s
# honorLabels: true # honorLabels: true
targetLabels: [] targetLabels: []
relabelings: []
metricRelabelings: [] metricRelabelings: []
prometheusRule: prometheusRule: