Chart: Add defaultBackend.maxUnavailable
. (#11995)
This commit is contained in:
parent
b2bc9618d3
commit
43a7d8d5fe
4 changed files with 26 additions and 1 deletions
|
@ -516,7 +516,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
|
||||||
| defaultBackend.livenessProbe.periodSeconds | int | `10` | |
|
| defaultBackend.livenessProbe.periodSeconds | int | `10` | |
|
||||||
| defaultBackend.livenessProbe.successThreshold | int | `1` | |
|
| defaultBackend.livenessProbe.successThreshold | int | `1` | |
|
||||||
| defaultBackend.livenessProbe.timeoutSeconds | int | `5` | |
|
| defaultBackend.livenessProbe.timeoutSeconds | int | `5` | |
|
||||||
| defaultBackend.minAvailable | int | `1` | Minimum available pods set in PodDisruptionBudget. |
|
| defaultBackend.minAvailable | int | `1` | Minimum available pods set in PodDisruptionBudget. Define either 'minAvailable' or 'maxUnavailable', never both. |
|
||||||
| defaultBackend.minReadySeconds | int | `0` | `minReadySeconds` to avoid killing pods before we are ready # |
|
| defaultBackend.minReadySeconds | int | `0` | `minReadySeconds` to avoid killing pods before we are ready # |
|
||||||
| defaultBackend.name | string | `"defaultbackend"` | |
|
| defaultBackend.name | string | `"defaultbackend"` | |
|
||||||
| defaultBackend.networkPolicy.enabled | bool | `false` | Enable 'networkPolicy' or not |
|
| defaultBackend.networkPolicy.enabled | bool | `false` | Enable 'networkPolicy' or not |
|
||||||
|
|
|
@ -20,6 +20,10 @@ spec:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
{{- include "ingress-nginx.selectorLabels" . | nindent 6 }}
|
{{- include "ingress-nginx.selectorLabels" . | nindent 6 }}
|
||||||
app.kubernetes.io/component: default-backend
|
app.kubernetes.io/component: default-backend
|
||||||
|
{{- if and .Values.defaultBackend.minAvailable (not (hasKey .Values.defaultBackend "maxUnavailable")) }}
|
||||||
minAvailable: {{ .Values.defaultBackend.minAvailable }}
|
minAvailable: {{ .Values.defaultBackend.minAvailable }}
|
||||||
|
{{- else if .Values.defaultBackend.maxUnavailable }}
|
||||||
|
maxUnavailable: {{ .Values.defaultBackend.maxUnavailable }}
|
||||||
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
@ -46,3 +46,20 @@ tests:
|
||||||
asserts:
|
asserts:
|
||||||
- hasDocuments:
|
- hasDocuments:
|
||||||
count: 0
|
count: 0
|
||||||
|
|
||||||
|
- it: should create a PodDisruptionBudget without `minAvailable` and with `maxUnavailable` if `defaultBackend.minAvailable` and `defaultBackend.maxUnavailable` are set
|
||||||
|
set:
|
||||||
|
defaultBackend.enabled: true
|
||||||
|
defaultBackend.replicaCount: 2
|
||||||
|
defaultBackend.minAvailable: 1
|
||||||
|
defaultBackend.maxUnavailable: 1
|
||||||
|
asserts:
|
||||||
|
- hasDocuments:
|
||||||
|
count: 1
|
||||||
|
- isKind:
|
||||||
|
of: PodDisruptionBudget
|
||||||
|
- notExists:
|
||||||
|
path: spec.minAvailable
|
||||||
|
- equal:
|
||||||
|
path: spec.maxUnavailable
|
||||||
|
value: 1
|
||||||
|
|
|
@ -1097,7 +1097,11 @@ defaultBackend:
|
||||||
podAnnotations: {}
|
podAnnotations: {}
|
||||||
replicaCount: 1
|
replicaCount: 1
|
||||||
# -- Minimum available pods set in PodDisruptionBudget.
|
# -- Minimum available pods set in PodDisruptionBudget.
|
||||||
|
# Define either 'minAvailable' or 'maxUnavailable', never both.
|
||||||
minAvailable: 1
|
minAvailable: 1
|
||||||
|
# -- Maximum unavailable pods set in PodDisruptionBudget. If set, 'minAvailable' is ignored.
|
||||||
|
# maxUnavailable: 1
|
||||||
|
|
||||||
resources: {}
|
resources: {}
|
||||||
# limits:
|
# limits:
|
||||||
# cpu: 10m
|
# cpu: 10m
|
||||||
|
|
Loading…
Reference in a new issue