Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: maxUnavailable pdb configuration cannot be used due to default set minAvailable #6087

Merged
merged 7 commits into from Jul 25, 2023
Merged

fix: maxUnavailable pdb configuration cannot be used due to default set minAvailable #6087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
659c95e
Allow maxUnavailable in cainjector pdb
rouke-broersma May 22, 2023
eb2b4d8
Allow maxUnavailable in webhook pdb
rouke-broersma May 22, 2023
773afd3
Allow maxUnavailable in certmanager pdb
rouke-broersma May 22, 2023
5c5b1c6
Fix pdb conditions
rouke-broersma May 25, 2023
29c270c
Fix conditions if maxUnavailable 0
rouke-broersma May 25, 2023
314163d
Document that maxUnavailable takes precedence over minAvailable
rouke-broersma May 25, 2023
a819025
the chart will now disallow you to specify both the minAvailable and …
inteon Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions deploy/charts/cert-manager/templates/cainjector-poddisruptionbudget.yaml
View file
Open in desktop
Expand Up @@ -17,10 +17,13 @@ spec:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/component: "cainjector"

{{- with .Values.cainjector.podDisruptionBudget.minAvailable }}
minAvailable: {{ . }}
{{- if not (or (hasKey .Values.cainjector.podDisruptionBudget "minAvailable") (hasKey .Values.cainjector.podDisruptionBudget "maxUnavailable")) }}
minAvailable: 1 # Default value because minAvailable and maxUnavailable are not set
{{- end }}
{{- with .Values.cainjector.podDisruptionBudget.maxUnavailable }}
maxUnavailable: {{ . }}
{{- if hasKey .Values.cainjector.podDisruptionBudget "minAvailable" }}
minAvailable: {{ .Values.cainjector.podDisruptionBudget.minAvailable }}
{{- end }}
{{- if hasKey .Values.cainjector.podDisruptionBudget "maxUnavailable" }}
maxUnavailable: {{ .Values.cainjector.podDisruptionBudget.maxUnavailable }}
{{- end }}
{{- end }}
11 changes: 7 additions & 4 deletions deploy/charts/cert-manager/templates/poddisruptionbudget.yaml
View file
Open in desktop
Expand Up @@ -17,10 +17,13 @@ spec:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/component: "controller"

{{- with .Values.podDisruptionBudget.minAvailable }}
minAvailable: {{ . }}
{{- if not (or (hasKey .Values.podDisruptionBudget "minAvailable") (hasKey .Values.podDisruptionBudget "maxUnavailable")) }}
minAvailable: 1 # Default value because minAvailable and maxUnavailable are not set
{{- end }}
{{- with .Values.podDisruptionBudget.maxUnavailable }}
maxUnavailable: {{ . }}
{{- if hasKey .Values.podDisruptionBudget "minAvailable" }}
minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
{{- end }}
{{- if hasKey .Values.podDisruptionBudget "maxUnavailable" }}
maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
{{- end }}
{{- end }}
11 changes: 7 additions & 4 deletions deploy/charts/cert-manager/templates/webhook-poddisruptionbudget.yaml
View file
Open in desktop
Expand Up @@ -17,10 +17,13 @@ spec:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/component: "webhook"

{{- with .Values.webhook.podDisruptionBudget.minAvailable }}
minAvailable: {{ . }}
{{- if not (or (hasKey .Values.webhook.podDisruptionBudget "minAvailable") (hasKey .Values.webhook.podDisruptionBudget "maxUnavailable")) }}
minAvailable: 1 # Default value because minAvailable and maxUnavailable are not set
{{- end }}
{{- with .Values.webhook.podDisruptionBudget.maxUnavailable }}
maxUnavailable: {{ . }}
{{- if hasKey .Values.webhook.podDisruptionBudget "minAvailable" }}
minAvailable: {{ .Values.webhook.podDisruptionBudget.minAvailable }}
{{- end }}
{{- if hasKey .Values.webhook.podDisruptionBudget "maxUnavailable" }}
maxUnavailable: {{ .Values.webhook.podDisruptionBudget.maxUnavailable }}
{{- end }}
{{- end }}
18 changes: 9 additions & 9 deletions deploy/charts/cert-manager/values.yaml
View file
Open in desktop
Expand Up @@ -63,11 +63,11 @@ strategy: {}
podDisruptionBudget:
enabled: false

minAvailable: 1
# maxUnavailable: 1

# minAvailable and maxUnavailable can either be set to an integer (e.g. 1)
# or a percentage value (e.g. 25%)
# if neither minAvailable or maxUnavailable is set, we default to `minAvailable: 1`
# minAvailable: 1
# maxUnavailable: 1

# Comma separated list of feature gates that should be enabled on the
# controller pod.
Expand Down Expand Up @@ -305,11 +305,11 @@ webhook:
podDisruptionBudget:
enabled: false

minAvailable: 1
# maxUnavailable: 1

# minAvailable and maxUnavailable can either be set to an integer (e.g. 1)
# or a percentage value (e.g. 25%)
# if neither minAvailable or maxUnavailable is set, we default to `minAvailable: 1`
# minAvailable: 1
# maxUnavailable: 1

# Container Security Context to be set on the webhook component container
# ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
Expand Down Expand Up @@ -490,11 +490,11 @@ cainjector:
podDisruptionBudget:
enabled: false

minAvailable: 1
# maxUnavailable: 1

# minAvailable and maxUnavailable can either be set to an integer (e.g. 1)
# or a percentage value (e.g. 25%)
# if neither minAvailable or maxUnavailable is set, we default to `minAvailable: 1`
# minAvailable: 1
# maxUnavailable: 1

# Container Security Context to be set on the cainjector component container
# ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
Expand Down