feat(charts): add pdb and topology spread constrants

GluuFederation · Nov 16, 2022 · 6191c47 · 6191c47
1 parent 0961a55
commit 6191c47
Show file tree

Hide file tree

Showing 33 changed files with 712 additions and 28 deletions.
diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/admin-ui/templates/_helpers.tpl b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/admin-ui/templates/_helpers.tpl
@@ -50,7 +50,7 @@ Create user custom defined  envs
 {{- define "admin-ui.usr-envs"}}
 {{- range $key, $val := .Values.usrEnvs.normal }}
 - name: {{ $key }}
-  value: {{ $val }}
+  value: {{ $val | quote }}
 {{- end }}
 {{- end }}
 
@@ -63,6 +63,36 @@ Create user custom defined secret envs
   valueFrom:
     secretKeyRef:
       name: {{ $.Release.Name }}-{{ $.Chart.Name }}-user-custom-envs
-      key: {{ $key }}
+      key: {{ $key | quote }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create topologySpreadConstraints lists
+*/}}
+{{- define "admin-ui.topology-spread-constraints"}}
+{{- range $key, $val := .Values.topologySpreadConstraints }}
+- maxSkew: {{ $val.maxSkew }}
+  {{- if $val.minDomains }}
+  minDomains: {{ $val.minDomains }} # optional; beta since v1.25
+  {{- end}}
+  {{- if $val.topologyKey }}
+  topologyKey: {{ $val.topologyKey }}
+  {{- end}}
+  {{- if $val.whenUnsatisfiable }}
+  whenUnsatisfiable: {{ $val.whenUnsatisfiable }}
+  {{- end}}
+  labelSelector:
+    matchLabels:
+      app: {{ $.Release.Name }}-{{ include "admin-ui.name" $ }}
+  {{- if $val.matchLabelKeys }}
+  matchLabelKeys: {{ $val.matchLabelKeys }} # optional; alpha since v1.25
+  {{- end}}
+  {{- if $val.nodeAffinityPolicy }}
+  nodeAffinityPolicy: {{ $val.nodeAffinityPolicy }} # optional; alpha since v1.25
+  {{- end}}
+  {{- if $val.nodeTaintsPolicy }}
+  nodeTaintsPolicy: {{ $val.nodeTaintsPolicy }} # optional; alpha since v1.25
+  {{- end}}
+{{- end }}
+{{- end }}
diff --git a/...n-setup/pygluu/kubernetes/templates/helm/gluu/charts/admin-ui/templates/admin-ui-pdb.yaml b/...n-setup/pygluu/kubernetes/templates/helm/gluu/charts/admin-ui/templates/admin-ui-pdb.yaml
@@ -0,0 +1,11 @@
+{{ if .Values.pdb.enabled -}}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "admin-ui.fullname" . }}
+spec:
+  maxUnavailable: {{ .Values.pdb.maxUnavailable }}
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}-{{ include "admin-ui.name" . }}
+{{- end }}
diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/admin-ui/templates/deployment.yml b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/admin-ui/templates/deployment.yml
@@ -37,6 +37,10 @@ spec:
       dnsConfig:
 {{ toYaml . | indent 8 }}
     {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- include "admin-ui.topology-spread-constraints" . | indent 8 }}
+      {{- end }}
       containers:
       - name: {{ include "admin-ui.name" . }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}

diff --git a/...luu/kubernetes/templates/helm/gluu/charts/auth-server-key-rotation/templates/_helpers.tpl b/...luu/kubernetes/templates/helm/gluu/charts/auth-server-key-rotation/templates/_helpers.tpl
@@ -50,7 +50,7 @@ Create user custom defined  envs
 {{- define "auth-server-key-rotation.usr-envs"}}
 {{- range $key, $val := .Values.usrEnvs.normal }}
 - name: {{ $key }}
-  value: {{ $val }}
+  value: {{ $val | quote }}
 {{- end }}
 {{- end }}
 
@@ -63,6 +63,6 @@ Create user custom defined secret envs
   valueFrom:
     secretKeyRef:
       name: {{ $.Release.Name }}-{{ $.Chart.Name }}-user-custom-envs
-      key: {{ $key }}
+      key: {{ $key | quote }}
 {{- end }}
 {{- end }}
diff --git a/...-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/auth-server/templates/_helpers.tpl b/...-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/auth-server/templates/_helpers.tpl
@@ -50,7 +50,7 @@ Create user custom defined  envs
 {{- define "auth-server.usr-envs"}}
 {{- range $key, $val := .Values.usrEnvs.normal }}
 - name: {{ $key }}
-  value: {{ $val }}
+  value: {{ $val | quote }}
 {{- end }}
 {{- end }}
 
@@ -63,6 +63,36 @@ Create user custom defined secret envs
   valueFrom:
     secretKeyRef:
       name: {{ $.Release.Name }}-{{ $.Chart.Name }}-user-custom-envs
-      key: {{ $key }}
+      key: {{ $key | quote }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create topologySpreadConstraints lists
+*/}}
+{{- define "auth-server.topology-spread-constraints"}}
+{{- range $key, $val := .Values.topologySpreadConstraints }}
+- maxSkew: {{ $val.maxSkew }}
+  {{- if $val.minDomains }}
+  minDomains: {{ $val.minDomains }} # optional; beta since v1.25
+  {{- end}}
+  {{- if $val.topologyKey }}
+  topologyKey: {{ $val.topologyKey }}
+  {{- end}}
+  {{- if $val.whenUnsatisfiable }}
+  whenUnsatisfiable: {{ $val.whenUnsatisfiable }}
+  {{- end}}
+  labelSelector:
+    matchLabels:
+      app: {{ $.Release.Name }}-{{ include "auth-server.name" $ }}
+  {{- if $val.matchLabelKeys }}
+  matchLabelKeys: {{ $val.matchLabelKeys }} # optional; alpha since v1.25
+  {{- end}}
+  {{- if $val.nodeAffinityPolicy }}
+  nodeAffinityPolicy: {{ $val.nodeAffinityPolicy }} # optional; alpha since v1.25
+  {{- end}}
+  {{- if $val.nodeTaintsPolicy }}
+  nodeTaintsPolicy: {{ $val.nodeTaintsPolicy }} # optional; alpha since v1.25
+  {{- end}}
+{{- end }}
+{{- end }}
diff --git a/...p/pygluu/kubernetes/templates/helm/gluu/charts/auth-server/templates/auth-server-pdb.yaml b/...p/pygluu/kubernetes/templates/helm/gluu/charts/auth-server/templates/auth-server-pdb.yaml
@@ -0,0 +1,11 @@
+{{ if .Values.pdb.enabled -}}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "auth-server.fullname" . }}
+spec:
+  maxUnavailable: {{ .Values.pdb.maxUnavailable }}
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}-{{ include "auth-server.name" . }}
+{{- end }}
diff --git a/...n-setup/pygluu/kubernetes/templates/helm/gluu/charts/auth-server/templates/deployment.yml b/...n-setup/pygluu/kubernetes/templates/helm/gluu/charts/auth-server/templates/deployment.yml
@@ -37,6 +37,10 @@ spec:
       dnsConfig:
 {{ toYaml . | indent 8 }}
     {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- include "auth-server.topology-spread-constraints" . | indent 8 }}
+      {{- end }}
       containers:
       - name: {{ include "auth-server.name" . }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}

diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/casa/templates/_helpers.tpl b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/casa/templates/_helpers.tpl
@@ -61,7 +61,7 @@ Create user custom defined  envs
 {{- define "casa.usr-envs"}}
 {{- range $key, $val := .Values.usrEnvs.normal }}
 - name: {{ $key }}
-  value: {{ $val }}
+  value: {{ $val | quote }}
 {{- end }}
 {{- end }}
 
@@ -74,6 +74,36 @@ Create user custom defined secret envs
   valueFrom:
     secretKeyRef:
       name: {{ $.Release.Name }}-{{ $.Chart.Name }}-user-custom-envs
-      key: {{ $key }}
+      key: {{ $key | quote }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create topologySpreadConstraints lists
+*/}}
+{{- define "casa.topology-spread-constraints"}}
+{{- range $key, $val := .Values.topologySpreadConstraints }}
+- maxSkew: {{ $val.maxSkew }}
+  {{- if $val.minDomains }}
+  minDomains: {{ $val.minDomains }} # optional; beta since v1.25
+  {{- end}}
+  {{- if $val.topologyKey }}
+  topologyKey: {{ $val.topologyKey }}
+  {{- end}}
+  {{- if $val.whenUnsatisfiable }}
+  whenUnsatisfiable: {{ $val.whenUnsatisfiable }}
+  {{- end}}
+  labelSelector:
+    matchLabels:
+      app: {{ $.Release.Name }}-{{ include "casa.name" $ }}
+  {{- if $val.matchLabelKeys }}
+  matchLabelKeys: {{ $val.matchLabelKeys }} # optional; alpha since v1.25
+  {{- end}}
+  {{- if $val.nodeAffinityPolicy }}
+  nodeAffinityPolicy: {{ $val.nodeAffinityPolicy }} # optional; alpha since v1.25
+  {{- end}}
+  {{- if $val.nodeTaintsPolicy }}
+  nodeTaintsPolicy: {{ $val.nodeTaintsPolicy }} # optional; alpha since v1.25
+  {{- end}}
+{{- end }}
+{{- end }}
diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/casa/templates/casa-pdb.yaml b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/casa/templates/casa-pdb.yaml
@@ -0,0 +1,11 @@
+{{ if .Values.pdb.enabled -}}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "casa.fullname" . }}
+spec:
+  maxUnavailable: {{ .Values.pdb.maxUnavailable }}
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}-{{ include "casa.name" . }}
+{{- end }}
diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/casa/templates/deployment.yaml b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/casa/templates/deployment.yaml
@@ -42,6 +42,10 @@ spec:
     {{- end }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- include "casa.topology-spread-constraints" . | indent 8 }}
+      {{- end }}
       containers:
         - name: {{ include "casa.name" . }}
           securityContext:

diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/config-api/templates/_helpers.tpl b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/config-api/templates/_helpers.tpl
@@ -47,22 +47,52 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Create user custom defined  envs
 */}}
-{{- define "oxauth.usr-envs"}}
+{{- define "config-api.usr-envs"}}
 {{- range $key, $val := .Values.usrEnvs.normal }}
 - name: {{ $key }}
-  value: {{ $val }}
+  value: {{ $val | quote }}
 {{- end }}
 {{- end }}
 
 {{/*
 Create user custom defined secret envs
 */}}
-{{- define "oxauth.usr-secret-envs"}}
+{{- define "config-api.usr-secret-envs"}}
 {{- range $key, $val := .Values.usrEnvs.secret }}
 - name: {{ $key }}
   valueFrom:
     secretKeyRef:
       name: {{ $.Release.Name }}-{{ $.Chart.Name }}-user-custom-envs
-      key: {{ $key }}
+      key: {{ $key | quote }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create topologySpreadConstraints lists
+*/}}
+{{- define "config-api.topology-spread-constraints"}}
+{{- range $key, $val := .Values.topologySpreadConstraints }}
+- maxSkew: {{ $val.maxSkew }}
+  {{- if $val.minDomains }}
+  minDomains: {{ $val.minDomains }} # optional; beta since v1.25
+  {{- end}}
+  {{- if $val.topologyKey }}
+  topologyKey: {{ $val.topologyKey }}
+  {{- end}}
+  {{- if $val.whenUnsatisfiable }}
+  whenUnsatisfiable: {{ $val.whenUnsatisfiable }}
+  {{- end}}
+  labelSelector:
+    matchLabels:
+      app: {{ $.Release.Name }}-{{ include "config-api.name" $ }}
+  {{- if $val.matchLabelKeys }}
+  matchLabelKeys: {{ $val.matchLabelKeys }} # optional; alpha since v1.25
+  {{- end}}
+  {{- if $val.nodeAffinityPolicy }}
+  nodeAffinityPolicy: {{ $val.nodeAffinityPolicy }} # optional; alpha since v1.25
+  {{- end}}
+  {{- if $val.nodeTaintsPolicy }}
+  nodeTaintsPolicy: {{ $val.nodeTaintsPolicy }} # optional; alpha since v1.25
+  {{- end}}
+{{- end }}
+{{- end }}
diff --git a/...tup/pygluu/kubernetes/templates/helm/gluu/charts/config-api/templates/config-api-pdb.yaml b/...tup/pygluu/kubernetes/templates/helm/gluu/charts/config-api/templates/config-api-pdb.yaml
@@ -0,0 +1,11 @@
+{{ if .Values.pdb.enabled -}}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "config-api.fullname" . }}
+spec:
+  maxUnavailable: {{ .Values.pdb.maxUnavailable }}
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}-{{ include "config-api.name" . }}
+{{- end }}
diff --git a/...n-setup/pygluu/kubernetes/templates/helm/gluu/charts/config-api/templates/deployment.yaml b/...n-setup/pygluu/kubernetes/templates/helm/gluu/charts/config-api/templates/deployment.yaml
@@ -37,9 +37,16 @@ spec:
       dnsConfig:
 {{ toYaml . | indent 8 }}
     {{- end }}
+      {{- if .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- include "config-api.topology-spread-constraints" . | indent 8 }}
+      {{- end }}
       containers:
         - name: {{ include "config-api.name" . }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          env:
+            {{- include "config-api.usr-envs" . | indent 12 }}
+            {{- include "config-api.usr-secret-envs" . | indent 12 }}
           securityContext:
             runAsUser: 1000
             runAsNonRoot: true

diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/_helpers.tpl b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/_helpers.tpl
@@ -50,7 +50,7 @@ Create user custom defined  envs
 {{- define "config.usr-envs"}}
 {{- range $key, $val := .Values.usrEnvs.normal }}
 - name: {{ $key }}
-  value: {{ $val }}
+  value: {{ $val | quote }}
 {{- end }}
 {{- end }}
 
@@ -63,7 +63,7 @@ Create user custom defined secret envs
   valueFrom:
     secretKeyRef:
       name: {{ $.Release.Name }}-{{ $.Chart.Name }}-user-custom-envs
-      key: {{ $key }}
+      key: {{ $key | quote }}
 {{- end }}
 {{- end }}
 

diff --git a/...setup/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/user-custom-envs.yaml b/...setup/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/user-custom-envs.yaml
@@ -37,7 +37,7 @@ metadata:
 {{- end }}
 data:
   {{- range $key, $val := .Values.global.usrEnvs.normal }}
-  {{ $key }}: {{ $val }}
+  {{ $key }}: {{ $val | quote }}
   {{- end}}
 {{- end}}
 {{ if .Values.usrEnvs.secret }}

diff --git a/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/fido2/templates/_helpers.tpl b/flex-cn-setup/pygluu/kubernetes/templates/helm/gluu/charts/fido2/templates/_helpers.tpl
@@ -50,7 +50,7 @@ Create user custom defined  envs
 {{- define "fido2.usr-envs"}}
 {{- range $key, $val := .Values.usrEnvs.normal }}
 - name: {{ $key }}
-  value: {{ $val }}
+  value: {{ $val | quote }}
 {{- end }}
 {{- end }}
 
@@ -63,6 +63,36 @@ Create user custom defined secret envs
   valueFrom:
     secretKeyRef:
       name: {{ $.Release.Name }}-{{ $.Chart.Name }}-user-custom-envs
-      key: {{ $key }}
+      key: {{ $key | quote }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create topologySpreadConstraints lists
+*/}}
+{{- define "fido2.topology-spread-constraints"}}
+{{- range $key, $val := .Values.topologySpreadConstraints }}
+- maxSkew: {{ $val.maxSkew }}
+  {{- if $val.minDomains }}
+  minDomains: {{ $val.minDomains }} # optional; beta since v1.25
+  {{- end}}
+  {{- if $val.topologyKey }}
+  topologyKey: {{ $val.topologyKey }}
+  {{- end}}
+  {{- if $val.whenUnsatisfiable }}
+  whenUnsatisfiable: {{ $val.whenUnsatisfiable }}
+  {{- end}}
+  labelSelector:
+    matchLabels:
+      app: {{ $.Release.Name }}-{{ include "fido2.name" $ }}
+  {{- if $val.matchLabelKeys }}
+  matchLabelKeys: {{ $val.matchLabelKeys }} # optional; alpha since v1.25
+  {{- end}}
+  {{- if $val.nodeAffinityPolicy }}
+  nodeAffinityPolicy: {{ $val.nodeAffinityPolicy }} # optional; alpha since v1.25
+  {{- end}}
+  {{- if $val.nodeTaintsPolicy }}
+  nodeTaintsPolicy: {{ $val.nodeTaintsPolicy }} # optional; alpha since v1.25
+  {{- end}}
+{{- end }}
+{{- end }}