Metrics: Disable by default. (#12095)
This commit is contained in:
parent
c9aa724f6d
commit
75c77e5dc3
5 changed files with 24 additions and 24 deletions
|
@ -54,7 +54,7 @@
|
||||||
{{- if .Values.controller.watchIngressWithoutClass }}
|
{{- if .Values.controller.watchIngressWithoutClass }}
|
||||||
- --watch-ingress-without-class=true
|
- --watch-ingress-without-class=true
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if not .Values.controller.metrics.enabled }}
|
{{- if .Values.controller.metrics.enabled }}
|
||||||
- --enable-metrics={{ .Values.controller.metrics.enabled }}
|
- --enable-metrics={{ .Values.controller.metrics.enabled }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.controller.enableTopologyAwareRouting }}
|
{{- if .Values.controller.enableTopologyAwareRouting }}
|
||||||
|
|
|
@ -15,23 +15,23 @@ tests:
|
||||||
path: metadata.name
|
path: metadata.name
|
||||||
value: RELEASE-NAME-ingress-nginx-controller
|
value: RELEASE-NAME-ingress-nginx-controller
|
||||||
|
|
||||||
- it: should create a DaemonSet with argument `--enable-metrics=false` if `controller.metrics.enabled` is false
|
- it: should create a DaemonSet with argument `--enable-metrics=true` if `controller.metrics.enabled` is true
|
||||||
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
|
|
||||||
set:
|
set:
|
||||||
controller.kind: DaemonSet
|
controller.kind: DaemonSet
|
||||||
controller.metrics.enabled: true
|
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:
|
asserts:
|
||||||
- notContains:
|
- notContains:
|
||||||
path: spec.template.spec.containers[0].args
|
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"
|
- 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:
|
set:
|
||||||
|
|
|
@ -43,21 +43,21 @@ tests:
|
||||||
- exists:
|
- exists:
|
||||||
path: spec.replicas
|
path: spec.replicas
|
||||||
|
|
||||||
- it: should create a Deployment with argument `--enable-metrics=false` if `controller.metrics.enabled` is false
|
- it: should create a Deployment with argument `--enable-metrics=true` if `controller.metrics.enabled` is true
|
||||||
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
|
|
||||||
set:
|
set:
|
||||||
controller.metrics.enabled: true
|
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:
|
asserts:
|
||||||
- notContains:
|
- notContains:
|
||||||
path: spec.template.spec.containers[0].args
|
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"
|
- 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:
|
set:
|
||||||
|
|
|
@ -24,7 +24,7 @@ They are set in the container spec of the `ingress-nginx-controller` Deployment
|
||||||
| `--dynamic-configuration-retries` | Number of times to retry failed dynamic configuration before failing to sync an ingress. (default 15) |
|
| `--dynamic-configuration-retries` | Number of times to retry failed dynamic configuration before failing to sync an ingress. (default 15) |
|
||||||
| `--election-id` | Election id to use for Ingress status updates. (default "ingress-controller-leader") |
|
| `--election-id` | Election id to use for Ingress status updates. (default "ingress-controller-leader") |
|
||||||
| `--election-ttl` | Duration a leader election is valid before it's getting re-elected, e.g. `15s`, `10m` or `1h`. (Default: 30s) |
|
| `--election-ttl` | Duration a leader election is valid before it's getting re-elected, e.g. `15s`, `10m` or `1h`. (Default: 30s) |
|
||||||
| `--enable-metrics` | Enables the collection of NGINX metrics. (default true) |
|
| `--enable-metrics` | Enables the collection of NGINX metrics. (Default: false) |
|
||||||
| `--enable-ssl-chain-completion` | Autocomplete SSL certificate chains with missing intermediate CA certificates. Certificates uploaded to Kubernetes must have the "Authority Information Access" X.509 v3 extension for this to succeed. (default false)|
|
| `--enable-ssl-chain-completion` | Autocomplete SSL certificate chains with missing intermediate CA certificates. Certificates uploaded to Kubernetes must have the "Authority Information Access" X.509 v3 extension for this to succeed. (default false)|
|
||||||
| `--enable-ssl-passthrough` | Enable SSL Passthrough. (default false) |
|
| `--enable-ssl-passthrough` | Enable SSL Passthrough. (default false) |
|
||||||
| `--disable-leader-election` | Disable Leader Election on Nginx Controller. (default false) |
|
| `--disable-leader-election` | Disable Leader Election on Nginx Controller. (default false) |
|
||||||
|
|
|
@ -174,7 +174,7 @@ extension for this to succeed.`)
|
||||||
`Customized address (or addresses, separated by comma) to set as the load-balancer status of Ingress objects this controller satisfies.
|
`Customized address (or addresses, separated by comma) to set as the load-balancer status of Ingress objects this controller satisfies.
|
||||||
Requires the update-status parameter.`)
|
Requires the update-status parameter.`)
|
||||||
|
|
||||||
enableMetrics = flags.Bool("enable-metrics", true,
|
enableMetrics = flags.Bool("enable-metrics", false,
|
||||||
`Enables the collection of NGINX metrics.`)
|
`Enables the collection of NGINX metrics.`)
|
||||||
metricsPerHost = flags.Bool("metrics-per-host", true,
|
metricsPerHost = flags.Bool("metrics-per-host", true,
|
||||||
`Export metrics per-host.`)
|
`Export metrics per-host.`)
|
||||||
|
|
Loading…
Reference in a new issue