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

Fix podDisruptionBudget labels #213

Merged
merged 3 commits into from
Nov 14, 2024
Merged

Fix podDisruptionBudget labels #213

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da7863e
Fix match labels for pdb objects
mmorejon Nov 8, 2024
8f974c9
Allow using minAvailable and maxUnavailable values
mmorejon Nov 8, 2024
6e2afb3
avoid breaking chagnes
mmorejon Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions charts/connect/templates/connect-pdb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ metadata:
{{- include "onepassword-connect.labels" . | nindent 4 }}
{{- include "onepassword-connect.extraAnnotations" .Values.connect.pdb }}
spec:
{{- with .Values.connect.pdb.maxUnavailable }}
maxUnavailable: {{ . }}
{{- else }}
{{- if .Values.connect.pdb.minAvailable }}
minAvailable: {{ .Values.connect.pdb.minAvailable }}
{{- end }}
{{- if and .Values.connect.pdb.maxUnavailable (not .Values.connect.pdb.minAvailable)}}
maxUnavailable: {{ .Values.connect.pdb.maxUnavailable }}
{{- end }}
selector:
matchLabels:
app.kubernetes.io/component: connect
{{- include "onepassword-connect.selectorLabels" . | nindent 6 }}
{{- end }}
app: {{ .Values.connect.applicationName }}
{{- end }}
11 changes: 6 additions & 5 deletions charts/connect/templates/operator-pdb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ metadata:
{{- include "onepassword-connect.labels" . | nindent 4 }}
{{- include "onepassword-connect.extraAnnotations" .Values.operator.pdb }}
spec:
{{- with .Values.operator.pdb.maxUnavailable }}
maxUnavailable: {{ . }}
{{- else }}
{{- if .Values.operator.pdb.minAvailable }}
minAvailable: {{ .Values.operator.pdb.minAvailable }}
{{- end }}
{{- if and .Values.operator.pdb.maxUnavailable (not .Values.operator.pdb.minAvailable)}}
maxUnavailable: {{ .Values.operator.pdb.maxUnavailable }}
{{- end }}
mmorejon marked this conversation as resolved.
Show resolved Hide resolved
selector:
matchLabels:
app.kubernetes.io/component: operator
{{- include "onepassword-connect.selectorLabels" . | nindent 6 }}
{{- end }}
name: {{ .Values.connect.applicationName }}
{{- end }}
12 changes: 6 additions & 6 deletions charts/connect/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ connect:
enabled: false
# Additional annotations to be added to the PDB Connect
annotations: {}
# Number of pods that are unavailble after eviction as number or percentage (eg.: 50%)
maxUnavailable: 1
# Number of pods that are available after eviction as number or percentage (eg.: 50%)
minAvailable: 0
# minAvailable: 1
# Number of pods that are unavailble after eviction as number or percentage (eg.: 50%)
# maxUnavailable: 1

# 1Password Connect API and Sync Service
probes:
Expand Down Expand Up @@ -295,10 +295,10 @@ operator:
enabled: false
# Additional annotations to be added to the PDB Operator
annotations: {}
# Number of pods that are unavailble after eviction as number or percentage (eg.: 50%)
maxUnavailable: 1
# Number of pods that are available after eviction as number or percentage (eg.: 50%)
minAvailable: 0
# minAvailable: 1
# Number of pods that are unavailble after eviction as number or percentage (eg.: 50%)
# maxUnavailable: 1
mmorejon marked this conversation as resolved.
Show resolved Hide resolved

# Additional annotations to be added to the Operator pods.
annotations: {}
Expand Down
Loading