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

Merge pull request #9046 from anders-swanson/revert-8665-metrics-port-name

Browse source 
Parameterize metrics port name
This commit is contained in:
James Strong 2022-09-30 11:04:00 -04:00 committed by GitHub
commit 8f18c0f973
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
charts/ingress-nginx/README.md
View file

@ -348,6 +348,7 @@ Kubernetes: `>=1.20.0-0`
| controller.maxmindLicenseKey | string | `""` | Maxmind license key to download GeoLite2 Databases. # https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases | | controller.maxmindLicenseKey | string | `""` | Maxmind license key to download GeoLite2 Databases. # https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases |
| controller.metrics.enabled | bool | `false` | | | controller.metrics.enabled | bool | `false` | |
| controller.metrics.port | int | `10254` | | | controller.metrics.port | int | `10254` | |
| controller.metrics.portName | string | `"metrics"` | |
| controller.metrics.prometheusRule.additionalLabels | object | `{}` | | | controller.metrics.prometheusRule.additionalLabels | object | `{}` | |
| controller.metrics.prometheusRule.enabled | bool | `false` | | | controller.metrics.prometheusRule.enabled | bool | `false` | |
| controller.metrics.prometheusRule.rules | list | `[]` | | | controller.metrics.prometheusRule.rules | list | `[]` | |

2
charts/ingress-nginx/templates/controller-daemonset.yaml
View file

@ -114,7 +114,7 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if .Values.controller.metrics.enabled }} {{- if .Values.controller.metrics.enabled }}
- name: http-metrics - name: {{ .Values.controller.metrics.portName }}
containerPort: {{ .Values.controller.metrics.port }} containerPort: {{ .Values.controller.metrics.port }}
protocol: TCP protocol: TCP
{{- end }} {{- end }}

2
charts/ingress-nginx/templates/controller-deployment.yaml
View file

@ -118,7 +118,7 @@ spec:
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if .Values.controller.metrics.enabled }} {{- if .Values.controller.metrics.enabled }}
- name: http-metrics - name: {{ .Values.controller.metrics.portName }}
containerPort: {{ .Values.controller.metrics.port }} containerPort: {{ .Values.controller.metrics.port }}
protocol: TCP protocol: TCP
{{- end }} {{- end }}

4
charts/ingress-nginx/templates/controller-service-metrics.yaml
View file

@ -31,10 +31,10 @@ spec:
externalTrafficPolicy: {{ .Values.controller.metrics.service.externalTrafficPolicy }} externalTrafficPolicy: {{ .Values.controller.metrics.service.externalTrafficPolicy }}
{{- end }} {{- end }}
ports: ports:
- name: http-metrics - name: {{ .Values.controller.metrics.portName }}
port: {{ .Values.controller.metrics.service.servicePort }} port: {{ .Values.controller.metrics.service.servicePort }}
protocol: TCP protocol: TCP
targetPort: http-metrics targetPort: {{ .Values.controller.metrics.portName }}
{{- $setNodePorts := (or (eq .Values.controller.metrics.service.type "NodePort") (eq .Values.controller.metrics.service.type "LoadBalancer")) }} {{- $setNodePorts := (or (eq .Values.controller.metrics.service.type "NodePort") (eq .Values.controller.metrics.service.type "LoadBalancer")) }}
{{- if (and $setNodePorts (not (empty .Values.controller.metrics.service.nodePort))) }} {{- if (and $setNodePorts (not (empty .Values.controller.metrics.service.nodePort))) }}
nodePort: {{ .Values.controller.metrics.service.nodePort }} nodePort: {{ .Values.controller.metrics.service.nodePort }}

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

@ -14,7 +14,7 @@ metadata:
{{- end }} {{- end }}
spec: spec:
endpoints: endpoints:
- port: http-metrics - port: {{ .Values.controller.metrics.portName }}
interval: {{ .Values.controller.metrics.serviceMonitor.scrapeInterval }} interval: {{ .Values.controller.metrics.serviceMonitor.scrapeInterval }}
{{- if .Values.controller.metrics.serviceMonitor.honorLabels }} {{- if .Values.controller.metrics.serviceMonitor.honorLabels }}
honorLabels: true honorLabels: true

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

@ -666,6 +666,7 @@ controller:
metrics: metrics:
port: 10254 port: 10254
portName: metrics
# if this port is changed, change healthz-port: in extraArgs: accordingly # if this port is changed, change healthz-port: in extraArgs: accordingly
enabled: false enabled: false