Skip to content

Commit ce575c2

Browse files
moabumoabu
committed
feat(charts): add pdb and topology spread constrants
1 parent 0549879 commit ce575c2

File tree

20 files changed

+342
-19
lines changed

20 files changed

+342
-19
lines changed

‎charts/janssen/charts/auth-server-key-rotation/templates/_helpers.tpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Create user custom defined envs
5050
{{- define "auth-server-key-rotation.usr-envs"}}
5151
{{- range $key, $val := .Values.usrEnvs.normal }}
5252
- name: {{ $key }}
53-
value: {{ $val }}
53+
value: {{ $val | quote }}
5454
{{- end }}
5555
{{- end }}
5656

@@ -63,6 +63,6 @@ Create user custom defined secret envs
6363
valueFrom:
6464
secretKeyRef:
6565
name: {{ $.Release.Name }}-{{ $.Chart.Name }}-user-custom-envs
66-
key: {{ $key }}
66+
key: {{ $key | quote }}
6767
{{- end }}
6868
{{- end }}

‎charts/janssen/charts/auth-server/templates/_helpers.tpl

+32-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Create user custom defined envs
5050
{{- define "auth-server.usr-envs"}}
5151
{{- range $key, $val := .Values.usrEnvs.normal }}
5252
- name: {{ $key }}
53-
value: {{ $val }}
53+
value: {{ $val | quote }}
5454
{{- end }}
5555
{{- end }}
5656

@@ -63,6 +63,36 @@ Create user custom defined secret envs
6363
valueFrom:
6464
secretKeyRef:
6565
name: {{ $.Release.Name }}-{{ $.Chart.Name }}-user-custom-envs
66-
key: {{ $key }}
66+
key: {{ $key | quote }}
6767
{{- end }}
6868
{{- end }}
69+
70+
{{/*
71+
Create topologySpreadConstraints lists
72+
*/}}
73+
{{- define "auth-server.topology-spread-constraints"}}
74+
{{- range $key, $val := .Values.topologySpreadConstraints }}
75+
- maxSkew: {{ $val.maxSkew }}
76+
{{- if $val.minDomains }}
77+
minDomains: {{ $val.minDomains }} # optional; beta since v1.25
78+
{{- end}}
79+
{{- if $val.topologyKey }}
80+
topologyKey: {{ $val.topologyKey }}
81+
{{- end}}
82+
{{- if $val.whenUnsatisfiable }}
83+
whenUnsatisfiable: {{ $val.whenUnsatisfiable }}
84+
{{- end}}
85+
labelSelector:
86+
matchLabels:
87+
app: {{ $.Release.Name }}-{{ include "auth-server.name" $ }}
88+
{{- if $val.matchLabelKeys }}
89+
matchLabelKeys: {{ $val.matchLabelKeys }} # optional; alpha since v1.25
90+
{{- end}}
91+
{{- if $val.nodeAffinityPolicy }}
92+
nodeAffinityPolicy: {{ $val.nodeAffinityPolicy }} # optional; alpha since v1.25
93+
{{- end}}
94+
{{- if $val.nodeTaintsPolicy }}
95+
nodeTaintsPolicy: {{ $val.nodeTaintsPolicy }} # optional; alpha since v1.25
96+
{{- end}}
97+
{{- end }}
98+
{{- end }}

‎charts/janssen/charts/auth-server/templates/auth-server-pdb.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{ if .Values.pdb.enabled -}}
2+
apiVersion: policy/v1
3+
kind: PodDisruptionBudget
4+
metadata:
5+
name: {{ include "auth-server.fullname" . }}
6+
spec:
7+
maxUnavailable: {{ .Values.pdb.maxUnavailable }}
8+
selector:
9+
matchLabels:
10+
app: {{ .Release.Name }}-{{ include "auth-server.name" . }}
11+
{{- end }}

‎charts/janssen/charts/auth-server/templates/deployment.yml

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ spec:
3737
dnsConfig:
3838
{{ toYaml . | indent 8 }}
3939
{{- end }}
40+
{{- if .Values.topologySpreadConstraints }}
41+
topologySpreadConstraints:
42+
{{- include "auth-server.topology-spread-constraints" . | indent 8 }}
43+
{{- end }}
4044
containers:
4145
- name: {{ include "auth-server.name" . }}
4246
imagePullPolicy: {{ .Values.image.pullPolicy }}

‎charts/janssen/charts/config-api/templates/_helpers.tpl

+34-4
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,52 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
4747
{{/*
4848
Create user custom defined envs
4949
*/}}
50-
{{- define "oxauth.usr-envs"}}
50+
{{- define "config-api.usr-envs"}}
5151
{{- range $key, $val := .Values.usrEnvs.normal }}
5252
- name: {{ $key }}
53-
value: {{ $val }}
53+
value: {{ $val | quote }}
5454
{{- end }}
5555
{{- end }}
5656

5757
{{/*
5858
Create user custom defined secret envs
5959
*/}}
60-
{{- define "oxauth.usr-secret-envs"}}
60+
{{- define "config-api.usr-secret-envs"}}
6161
{{- range $key, $val := .Values.usrEnvs.secret }}
6262
- name: {{ $key }}
6363
valueFrom:
6464
secretKeyRef:
6565
name: {{ $.Release.Name }}-{{ $.Chart.Name }}-user-custom-envs
66-
key: {{ $key }}
66+
key: {{ $key | quote }}
6767
{{- end }}
6868
{{- end }}
69+
70+
{{/*
71+
Create topologySpreadConstraints lists
72+
*/}}
73+
{{- define "config-api.topology-spread-constraints"}}
74+
{{- range $key, $val := .Values.topologySpreadConstraints }}
75+
- maxSkew: {{ $val.maxSkew }}
76+
{{- if $val.minDomains }}
77+
minDomains: {{ $val.minDomains }} # optional; beta since v1.25
78+
{{- end}}
79+
{{- if $val.topologyKey }}
80+
topologyKey: {{ $val.topologyKey }}
81+
{{- end}}
82+
{{- if $val.whenUnsatisfiable }}
83+
whenUnsatisfiable: {{ $val.whenUnsatisfiable }}
84+
{{- end}}
85+
labelSelector:
86+
matchLabels:
87+
app: {{ $.Release.Name }}-{{ include "config-api.name" $ }}
88+
{{- if $val.matchLabelKeys }}
89+
matchLabelKeys: {{ $val.matchLabelKeys }} # optional; alpha since v1.25
90+
{{- end}}
91+
{{- if $val.nodeAffinityPolicy }}
92+
nodeAffinityPolicy: {{ $val.nodeAffinityPolicy }} # optional; alpha since v1.25
93+
{{- end}}
94+
{{- if $val.nodeTaintsPolicy }}
95+
nodeTaintsPolicy: {{ $val.nodeTaintsPolicy }} # optional; alpha since v1.25
96+
{{- end}}
97+
{{- end }}
98+
{{- end }}

‎charts/janssen/charts/config-api/templates/config-api-pdb.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{ if .Values.pdb.enabled -}}
2+
apiVersion: policy/v1
3+
kind: PodDisruptionBudget
4+
metadata:
5+
name: {{ include "config-api.fullname" . }}
6+
spec:
7+
maxUnavailable: {{ .Values.pdb.maxUnavailable }}
8+
selector:
9+
matchLabels:
10+
app: {{ .Release.Name }}-{{ include "config-api.name" . }}
11+
{{- end }}

‎charts/janssen/charts/config-api/templates/deployment.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,16 @@ spec:
3737
dnsConfig:
3838
{{ toYaml . | indent 8 }}
3939
{{- end }}
40+
{{- if .Values.topologySpreadConstraints }}
41+
topologySpreadConstraints:
42+
{{- include "config-api.topology-spread-constraints" . | indent 8 }}
43+
{{- end }}
4044
containers:
4145
- name: {{ include "config-api.name" . }}
4246
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
47+
env:
48+
{{- include "config-api.usr-envs" . | indent 12 }}
49+
{{- include "config-api.usr-secret-envs" . | indent 12 }}
4350
securityContext:
4451
runAsUser: 1000
4552
runAsNonRoot: true

‎charts/janssen/charts/config/templates/_helpers.tpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Create user custom defined envs
5050
{{- define "config.usr-envs"}}
5151
{{- range $key, $val := .Values.usrEnvs.normal }}
5252
- name: {{ $key }}
53-
value: {{ $val }}
53+
value: {{ $val | quote }}
5454
{{- end }}
5555
{{- end }}
5656

@@ -63,7 +63,7 @@ Create user custom defined secret envs
6363
valueFrom:
6464
secretKeyRef:
6565
name: {{ $.Release.Name }}-{{ $.Chart.Name }}-user-custom-envs
66-
key: {{ $key }}
66+
key: {{ $key | quote }}
6767
{{- end }}
6868
{{- end }}
6969

‎charts/janssen/charts/config/templates/user-custom-envs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ metadata:
3737
{{- end }}
3838
data:
3939
{{- range $key, $val := .Values.global.usrEnvs.normal }}
40-
{{ $key }}: {{ $val }}
40+
{{ $key }}: {{ $val | quote }}
4141
{{- end}}
4242
{{- end}}
4343
{{ if .Values.usrEnvs.secret }}

‎charts/janssen/charts/fido2/templates/_helpers.tpl

+32-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Create user custom defined envs
5050
{{- define "fido2.usr-envs"}}
5151
{{- range $key, $val := .Values.usrEnvs.normal }}
5252
- name: {{ $key }}
53-
value: {{ $val }}
53+
value: {{ $val | quote }}
5454
{{- end }}
5555
{{- end }}
5656

@@ -63,6 +63,36 @@ Create user custom defined secret envs
6363
valueFrom:
6464
secretKeyRef:
6565
name: {{ $.Release.Name }}-{{ $.Chart.Name }}-user-custom-envs
66-
key: {{ $key }}
66+
key: {{ $key | quote }}
6767
{{- end }}
6868
{{- end }}
69+
70+
{{/*
71+
Create topologySpreadConstraints lists
72+
*/}}
73+
{{- define "fido2.topology-spread-constraints"}}
74+
{{- range $key, $val := .Values.topologySpreadConstraints }}
75+
- maxSkew: {{ $val.maxSkew }}
76+
{{- if $val.minDomains }}
77+
minDomains: {{ $val.minDomains }} # optional; beta since v1.25
78+
{{- end}}
79+
{{- if $val.topologyKey }}
80+
topologyKey: {{ $val.topologyKey }}
81+
{{- end}}
82+
{{- if $val.whenUnsatisfiable }}
83+
whenUnsatisfiable: {{ $val.whenUnsatisfiable }}
84+
{{- end}}
85+
labelSelector:
86+
matchLabels:
87+
app: {{ $.Release.Name }}-{{ include "fido2.name" $ }}
88+
{{- if $val.matchLabelKeys }}
89+
matchLabelKeys: {{ $val.matchLabelKeys }} # optional; alpha since v1.25
90+
{{- end}}
91+
{{- if $val.nodeAffinityPolicy }}
92+
nodeAffinityPolicy: {{ $val.nodeAffinityPolicy }} # optional; alpha since v1.25
93+
{{- end}}
94+
{{- if $val.nodeTaintsPolicy }}
95+
nodeTaintsPolicy: {{ $val.nodeTaintsPolicy }} # optional; alpha since v1.25
96+
{{- end}}
97+
{{- end }}
98+
{{- end }}

‎charts/janssen/charts/fido2/templates/deployment.yml

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ spec:
3737
dnsConfig:
3838
{{ toYaml . | indent 8 }}
3939
{{- end }}
40+
{{- if .Values.topologySpreadConstraints }}
41+
topologySpreadConstraints:
42+
{{- include "fido2.topology-spread-constraints" . | indent 8 }}
43+
{{- end }}
4044
containers:
4145
- name: {{ include "fido2.name" . }}
4246
imagePullPolicy: {{ .Values.image.pullPolicy }}

‎charts/janssen/charts/fido2/templates/fido2-pdb.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{ if .Values.pdb.enabled -}}
2+
apiVersion: policy/v1
3+
kind: PodDisruptionBudget
4+
metadata:
5+
name: {{ include "fido2.fullname" . }}
6+
spec:
7+
maxUnavailable: {{ .Values.pdb.maxUnavailable }}
8+
selector:
9+
matchLabels:
10+
app: {{ .Release.Name }}-{{ include "fido2.name" . }}
11+
{{- end }}

‎charts/janssen/charts/opendj/templates/_helpers.tpl

+32-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Create user custom defined envs
5050
{{- define "opendj.usr-envs"}}
5151
{{- range $key, $val := .Values.usrEnvs.normal }}
5252
- name: {{ $key }}
53-
value: {{ $val }}
53+
value: {{ $val | quote }}
5454
{{- end }}
5555
{{- end }}
5656

@@ -63,6 +63,36 @@ Create user custom defined secret envs
6363
valueFrom:
6464
secretKeyRef:
6565
name: {{ $.Release.Name }}-{{ $.Chart.Name }}-user-custom-envs
66-
key: {{ $key }}
66+
key: {{ $key | quote }}
6767
{{- end }}
6868
{{- end }}
69+
70+
{{/*
71+
Create topologySpreadConstraints lists
72+
*/}}
73+
{{- define "opendj.topology-spread-constraints"}}
74+
{{- range $key, $val := .Values.topologySpreadConstraints }}
75+
- maxSkew: {{ $val.maxSkew }}
76+
{{- if $val.minDomains }}
77+
minDomains: {{ $val.minDomains }} # optional; beta since v1.25
78+
{{- end}}
79+
{{- if $val.topologyKey }}
80+
topologyKey: {{ $val.topologyKey }}
81+
{{- end}}
82+
{{- if $val.whenUnsatisfiable }}
83+
whenUnsatisfiable: {{ $val.whenUnsatisfiable }}
84+
{{- end}}
85+
labelSelector:
86+
matchLabels:
87+
app: {{ $.Release.Name }}-{{ include "opendj.name" $ }}
88+
{{- if $val.matchLabelKeys }}
89+
matchLabelKeys: {{ $val.matchLabelKeys }} # optional; alpha since v1.25
90+
{{- end}}
91+
{{- if $val.nodeAffinityPolicy }}
92+
nodeAffinityPolicy: {{ $val.nodeAffinityPolicy }} # optional; alpha since v1.25
93+
{{- end}}
94+
{{- if $val.nodeTaintsPolicy }}
95+
nodeTaintsPolicy: {{ $val.nodeTaintsPolicy }} # optional; alpha since v1.25
96+
{{- end}}
97+
{{- end }}
98+
{{- end }}

‎charts/janssen/charts/opendj/templates/opendj-pdb.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{ if .Values.pdb.enabled -}}
2+
apiVersion: policy/v1
3+
kind: PodDisruptionBudget
4+
metadata:
5+
name: {{ include "opendj.fullname" . }}
6+
spec:
7+
maxUnavailable: {{ .Values.pdb.maxUnavailable }}
8+
selector:
9+
matchLabels:
10+
app: {{ include "opendj.name" $ }}
11+
{{- end }}

‎charts/janssen/charts/opendj/templates/statefulset.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ spec:
4646
configMap:
4747
name: {{ $.Release.Name }}-oxjans
4848
{{- end }}
49+
{{- if .Values.topologySpreadConstraints }}
50+
topologySpreadConstraints:
51+
{{- include "opendj.topology-spread-constraints" . | indent 8 }}
52+
{{- end }}
4953
containers:
5054
- name: {{ include "opendj.name" $ }}
5155
imagePullPolicy: {{ $.Values.image.pullPolicy }}

‎charts/janssen/charts/persistence/templates/_helpers.tpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Create user custom defined envs
6161
{{- define "persistence.usr-envs"}}
6262
{{- range $key, $val := .Values.usrEnvs.normal }}
6363
- name: {{ $key }}
64-
value: {{ $val }}
64+
value: {{ $val | quote }}
6565
{{- end }}
6666
{{- end }}
6767

@@ -74,6 +74,6 @@ Create user custom defined secret envs
7474
valueFrom:
7575
secretKeyRef:
7676
name: {{ $.Release.Name }}-{{ $.Chart.Name }}-user-custom-envs
77-
key: {{ $key }}
77+
key: {{ $key | quote }}
7878
{{- end }}
7979
{{- end }}

0 commit comments

Comments
 (0)