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

Metrics: Disable by default. (#12095)

Browse source
This commit is contained in:
Marco Ebert 2024-10-07 21:34:22 +02:00 • committed by GitHub
parent c9aa724f6d
commit 75c77e5dc3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
charts/ingress-nginx/templates/_params.tpl
View file

@ -54,7 +54,7 @@
{{- if .Values.controller.watchIngressWithoutClass }}
- --watch-ingress-without-class=true
{{- end }}
{{- if not .Values.controller.metrics.enabled }}
{{- if .Values.controller.metrics.enabled }}
- --enable-metrics={{ .Values.controller.metrics.enabled }}
{{- end }}
{{- if .Values.controller.enableTopologyAwareRouting }}

22
charts/ingress-nginx/tests/controller-daemonset_test.yaml
View file

@ -15,23 +15,23 @@ tests:
path: metadata.name
value: RELEASE-NAME-ingress-nginx-controller
- it: should create a DaemonSet with argument `--enable-metrics=false` if `controller.metrics.enabled` is false
set:
controller.kind: DaemonSet
controller.metrics.enabled: false
asserts:
- contains:
path: spec.template.spec.containers[0].args
content: --enable-metrics=false
- it: should create a DaemonSet without argument `--enable-metrics=false` if `controller.metrics.enabled` is true
- it: should create a DaemonSet with argument `--enable-metrics=true` if `controller.metrics.enabled` is true
set:
controller.kind: DaemonSet
controller.metrics.enabled: true
asserts:
- contains:
path: spec.template.spec.containers[0].args
content: --enable-metrics=true
- it: should create a DaemonSet without argument `--enable-metrics=true` if `controller.metrics.enabled` is false
set:
controller.kind: DaemonSet
controller.metrics.enabled: false
asserts:
- notContains:
path: spec.template.spec.containers[0].args
content: --enable-metrics=false
content: --enable-metrics=true
- it: should create a DaemonSet with argument `--controller-class=k8s.io/ingress-nginx-internal` if `controller.ingressClassResource.controllerValue` is "k8s.io/ingress-nginx-internal"
set:

20
charts/ingress-nginx/tests/controller-deployment_test.yaml
View file

@ -43,21 +43,21 @@ tests:
- exists:
path: spec.replicas
- it: should create a Deployment with argument `--enable-metrics=false` if `controller.metrics.enabled` is false
set:
controller.metrics.enabled: false
asserts:
- contains:
path: spec.template.spec.containers[0].args
content: --enable-metrics=false
- it: should create a Deployment without argument `--enable-metrics=false` if `controller.metrics.enabled` is true
- it: should create a Deployment with argument `--enable-metrics=true` if `controller.metrics.enabled` is true
set:
controller.metrics.enabled: true
asserts:
- contains:
path: spec.template.spec.containers[0].args
content: --enable-metrics=true
- it: should create a Deployment without argument `--enable-metrics=true` if `controller.metrics.enabled` is false
set:
controller.metrics.enabled: false
asserts:
- notContains:
path: spec.template.spec.containers[0].args
content: --enable-metrics=false
content: --enable-metrics=true
- it: should create a Deployment with argument `--controller-class=k8s.io/ingress-nginx-internal` if `controller.ingressClassResource.controllerValue` is "k8s.io/ingress-nginx-internal"
set: