Skip to content

Commit 0a7d61e

Browse files
committed
DOC: metrics: add default-backend-port, prometheus, pprof to the list of available arguments
1 parent 5659ba0 commit 0a7d61e

File tree

3 files changed

+100
-4
lines changed

3 files changed

+100
-4
lines changed

documentation/annotations.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This is autogenerated from [doc.yaml](doc.yaml). Description can be found in [ge
2222
| [clean-certs](#clean-certs) | [bool](#bool) | "true" | |:large_blue_circle:|:white_circle:|:white_circle:|
2323
| [client-ca](#authentication) | string | | ssl-offloading |:large_blue_circle:|:white_circle:|:white_circle:|
2424
| [client-crt-optional](#authentication) | [bool](#bool) | "false" | client-ca |:large_blue_circle:|:white_circle:|:white_circle:|
25-
| [client-strict-sni](#ssl-offloading) | [bool](#bool) | "false" | client-ca |:large_blue_circle:|:white_circle:|:white_circle:|
25+
| [client-strict-sni](#ssl-offloading) :construction:(dev) | [bool](#bool) | "false" | client-ca |:large_blue_circle:|:white_circle:|:white_circle:|
2626
| [cors-enable](#CORS) | [bool](#bool) | "false" | |:large_blue_circle:|:large_blue_circle:|:white_circle:|
2727
| [cors-allow-origin](#CORS) | string | "*" | cors-enable |:large_blue_circle:|:large_blue_circle:|:white_circle:|
2828
| [cors-allow-methods](#CORS) | string | "*" | cors-enable |:large_blue_circle:|:large_blue_circle:|:white_circle:|
@@ -1514,6 +1514,9 @@ src-ip-header: "True-Client-IP"
15141514

15151515
##### `client-strict-sni`
15161516

1517+
1518+
> :construction: this is only available from next version, currently available in dev build
1519+
15171520
If enabled, HAProxy will only accept TLS client connections where the provided SNI matchs an existing certificate.
15181521
If disabled HAProxy will service the default certificate when the provided SNI does not match.
15191522

documentation/controller.md

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ Image can be run with arguments:
1212
| [`--configmap`](#--configmap) | `default/haproxy-configmap` |
1313
| [`--configmap-tcp-services`](#--configmap-tcp-services) | |
1414
| [`--configmap-errorfiles`](#--configmap-errorfiles) | |
15-
| [`--configmap-patternfiles`](#--configmap-patternfiles) | |
15+
| [`--configmap-patternfiles`](#--configmap-patternfiles) :construction:(dev) | |
1616
| [`--default-backend-service`](#--default-backend-service) | |
17+
| [`--default-backend-port`](#--default-backend-port) :construction:(dev) | |
18+
| [`--pprof`](#--pprof) | |
19+
| [`--prometheus`](#--prometheus) :construction:(dev) | |
1720
| [`--default-ssl-certificate`](#--default-ssl-certificate) | |
1821
| [`--ingress.class`](#--ingressclass) | |
1922
| [`--empty-ingress-class`](#--empty-ingress-class) | `false` |
@@ -135,6 +138,9 @@ args:
135138

136139
### `--configmap-patternfiles`
137140

141+
142+
> :construction: this is only available from next version, currently available in dev build
143+
138144
Sets the ConfigMap object that defines pattern files to be used in HAProxy configuration.
139145
Controller will create corresponding files and update them when ConfigMap is updated.
140146
Pattern files are particularly useful for [HAProxy ACLs](https://cbonte.github.io/haproxy-dconv/2.3/configuration.html#7.1) where we can load patterns from file.
@@ -217,6 +223,69 @@ args:
217223

218224
***
219225

226+
### `--default-backend-port`
227+
228+
229+
> :construction: this is only available from next version, currently available in dev build
230+
231+
if default-backend-service is not used with this you can set default port used for same purpose
232+
233+
Possible values:
234+
235+
- port that will be used for default service within controller pod
236+
237+
Example:
238+
239+
```yaml
240+
args:
241+
- --default-backend-port=6060
242+
```
243+
244+
<p align='right'><a href='#haproxy-kubernetes-ingress-controller'>:arrow_up_small: back to top</a></p>
245+
246+
***
247+
248+
### `--pprof`
249+
250+
enable pprof endpoint, if default-backend-port is not used 6060 will be used
251+
252+
Possible values:
253+
254+
- this is boolean flag
255+
256+
Example:
257+
258+
```yaml
259+
args:
260+
- --pprof
261+
```
262+
263+
<p align='right'><a href='#haproxy-kubernetes-ingress-controller'>:arrow_up_small: back to top</a></p>
264+
265+
***
266+
267+
### `--prometheus`
268+
269+
270+
> :construction: this is only available from next version, currently available in dev build
271+
272+
enable prometheus endpoint, if default-backend-port is not used 6060 will be used
273+
274+
Possible values:
275+
276+
- this is boolean flag
277+
278+
Example:
279+
280+
```yaml
281+
args:
282+
- --prometheus
283+
```
284+
285+
<p align='right'><a href='#haproxy-kubernetes-ingress-controller'>:arrow_up_small: back to top</a></p>
286+
287+
***
288+
220289
### `--default-ssl-certificate`
221290

222291
The name of a TLS Secret that contains the certificate to use for SSL/TLS traffic. This can be overridden with the <code>ssl-certificate</code> setting.

documentation/doc.yaml

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ image_arguments:
115115
- In order to use pattern files, the target file **should be prefixed with "patterns/"**
116116
values:
117117
- The name of the ConfigMap in format NS/ConfigMapName
118-
version_min: "1.6"
118+
version_min: "1.8"
119119
example: |-
120120
args:
121121
- --configmap-patternfiles=default/acl-patterns
@@ -127,6 +127,30 @@ image_arguments:
127127
example: |-
128128
args:
129129
- --default-backend-service=default/my-default-service
130+
- argument: --default-backend-port
131+
description: if default-backend-service is not used with this you can set default port used for same purpose
132+
values:
133+
- port that will be used for default service within controller pod
134+
version_min: "1.8"
135+
example: |-
136+
args:
137+
- --default-backend-port=6060
138+
- argument: --pprof
139+
description: enable pprof endpoint, if default-backend-port is not used 6060 will be used
140+
values:
141+
- this is boolean flag
142+
version_min: "1.4"
143+
example: |-
144+
args:
145+
- --pprof
146+
- argument: --prometheus
147+
description: enable prometheus endpoint, if default-backend-port is not used 6060 will be used
148+
values:
149+
- this is boolean flag
150+
version_min: "1.8"
151+
example: |-
152+
args:
153+
- --prometheus
130154
- argument: --default-ssl-certificate
131155
description: The name of a TLS Secret that contains the certificate to use for SSL/TLS traffic. This can be overridden with the <code>ssl-certificate</code> setting.
132156
values:
@@ -639,7 +663,7 @@ annotations:
639663
- "false"
640664
applies_to:
641665
- configmap
642-
version_min: "1.7"
666+
version_min: "1.8"
643667
example:
644668
- "client-strict-sni: true"
645669
- title: cors-enable

0 commit comments

Comments
 (0)