fix: add support for injecting affinty and nodeSelector

GluuFederation · Mar 21, 2023 · 91be257 · 91be257
1 parent 123b0b1
commit 91be257
Show file tree

Hide file tree

Showing 27 changed files with 203 additions and 8 deletions.
diff --git a/pygluu/kubernetes/templates/gluu_versions.json b/pygluu/kubernetes/templates/gluu_versions.json
@@ -23,7 +23,7 @@
     "OXPASSPORT_IMAGE_NAME": "gluufederation/oxpassport",
     "OXPASSPORT_IMAGE_TAG": "4.5.0-5",
     "OXSHIBBOLETH_IMAGE_NAME": "gluufederation/oxshibboleth",
-    "OXSHIBBOLETH_IMAGE_TAG": "4.5.0-9",
+    "OXSHIBBOLETH_IMAGE_TAG": "4.5.0-10",
     "OXTRUST_IMAGE_NAME": "gluufederation/oxtrust",
     "OXTRUST_IMAGE_TAG": "4.5.0-6",
     "PERSISTENCE_IMAGE_NAME": "gluufederation/persistence",

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/casa/templates/deployment.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/casa/templates/deployment.yaml
@@ -48,6 +48,14 @@ spec:
       topologySpreadConstraints:
         {{- include "casa.topology-spread-constraints" . | indent 8 }}
       {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
       {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/casa/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/casa/values.yaml
@@ -102,3 +102,6 @@ additionalLabels: { }
 additionalAnnotations: { }
 # -- https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
 tolerations: []
+# -- https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
+affinity: {}
+nodeSelector: {}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/load-init-config.yml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/load-init-config.yml
@@ -73,6 +73,14 @@ spec:
           secret:
             secretName: {{ .Release.Name }}-google-sa
         {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
       {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/upgradejob.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/upgradejob.yaml
@@ -68,6 +68,14 @@ spec:
         {{- end }}
         {{- end }}
       restartPolicy: Never
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
       {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/config/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/config/values.yaml
@@ -205,3 +205,6 @@ additionalLabels: { }
 additionalAnnotations: { }
 # -- https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
 tolerations: []
+# -- https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
+affinity: {}
+nodeSelector: {}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/templates/daemonset.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/templates/daemonset.yaml
@@ -36,6 +36,14 @@ spec:
       dnsConfig:
 {{ toYaml . | indent 8 }}
     {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
       {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/cr-rotate/values.yaml
@@ -61,3 +61,6 @@ additionalLabels: { }
 additionalAnnotations: { }
 # -- https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
 tolerations: []
+# -- https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
+affinity: {}
+nodeSelector: {}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/fido2/templates/deployment.yml b/pygluu/kubernetes/templates/helm/gluu/charts/fido2/templates/deployment.yml
@@ -43,6 +43,14 @@ spec:
       topologySpreadConstraints:
         {{- include "fido2.topology-spread-constraints" . | indent 8 }}
       {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
       {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/fido2/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/fido2/values.yaml
@@ -88,3 +88,6 @@ additionalLabels: { }
 additionalAnnotations: { }
 # -- https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
 tolerations: []
+# -- https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
+affinity: {}
+nodeSelector: {}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/templates/statefulset.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/templates/statefulset.yaml
@@ -82,6 +82,14 @@ spec:
             name: {{$values.name}}
             subPath: {{$key}}
         {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
       {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/jackrabbit/values.yaml
@@ -116,3 +116,6 @@ additionalLabels: { }
 additionalAnnotations: { }
 # -- https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
 tolerations: []
+# -- https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
+affinity: {}
+nodeSelector: {}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/opendj/templates/statefulset.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/opendj/templates/statefulset.yaml
@@ -50,6 +50,14 @@ spec:
       topologySpreadConstraints:
         {{- include "opendj.topology-spread-constraints" . | indent 8 }}
       {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
       {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/opendj/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/opendj/values.yaml
@@ -133,4 +133,7 @@ additionalLabels: { }
 # -- Additional annotations that will be added across all resources  in the format of {cert-manager.io/issuer: "letsencrypt-prod"}. key app is taken
 additionalAnnotations: { }
 # -- https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-tolerations: []
+tolerations: []
+# -- https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
+affinity: {}
+nodeSelector: {}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth-key-rotation/templates/cronjobs.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth-key-rotation/templates/cronjobs.yaml
@@ -31,6 +31,14 @@ spec:
           dnsConfig:
 {{ toYaml . | indent 12 }}
         {{- end }}
+          {{- if .Values.nodeSelector }}
+          nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 12 }}
+          {{- end }}
+          {{- if .Values.affinity }}
+          affinity:
+{{- toYaml .Values.affinity | nindent 12 }}
+          {{- end }}
           {{- if .Values.tolerations }}
           tolerations:
           {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/templates/deployment.yml b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/templates/deployment.yml
@@ -43,6 +43,14 @@ spec:
       topologySpreadConstraints:
         {{- include "oxauth.topology-spread-constraints" . | indent 8 }}
       {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
       {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxauth/values.yaml
@@ -90,4 +90,7 @@ additionalLabels: { }
 # -- Additional annotations that will be added across all resources  in the format of {cert-manager.io/issuer: "letsencrypt-prod"}. key app is taken
 additionalAnnotations: { }
 # -- https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-tolerations: []
+tolerations: []
+# -- https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
+affinity: {}
+nodeSelector: {}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/templates/deployment.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxd-server/templates/deployment.yaml
@@ -43,6 +43,14 @@ spec:
       topologySpreadConstraints:
         {{- include "oxd-server.topology-spread-constraints" . | indent 8 }}
       {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
       {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/templates/deployment.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxpassport/templates/deployment.yaml
@@ -43,6 +43,14 @@ spec:
       topologySpreadConstraints:
         {{- include "oxpassport.topology-spread-constraints" . | indent 8 }}
       {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
       {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/templates/statefulset.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxshibboleth/templates/statefulset.yaml
@@ -46,6 +46,14 @@ spec:
       topologySpreadConstraints:
         {{- include "oxshibboleth.topology-spread-constraints" . | indent 8 }}
       {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
       {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/templates/statefulset.yml b/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/templates/statefulset.yml
@@ -44,6 +44,14 @@ spec:
       topologySpreadConstraints:
         {{- include "oxtrust.topology-spread-constraints" . | indent 8 }}
       {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
       {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/oxtrust/values.yaml
@@ -92,4 +92,7 @@ additionalLabels: { }
 # -- Additional annotations that will be added across all resources  in the format of {cert-manager.io/issuer: "letsencrypt-prod"}. key app is taken
 additionalAnnotations: { }
 # -- https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-tolerations: []
+tolerations: []
+# -- https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
+affinity: {}
+nodeSelector: {}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/templates/jobs.yml b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/templates/jobs.yml
@@ -32,6 +32,14 @@ spec:
 {{ toYaml . | indent 8 }}
     {{- end }}
       restartPolicy: Never
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
       {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/persistence/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/persistence/values.yaml
@@ -48,4 +48,7 @@ additionalLabels: { }
 # -- Additional annotations that will be added across all resources  in the format of {cert-manager.io/issuer: "letsencrypt-prod"}. key app is taken
 additionalAnnotations: { }
 # -- https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-tolerations: []
+tolerations: []
+# -- https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
+affinity: {}
+nodeSelector: {}
diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/scim/templates/deployment.yml b/pygluu/kubernetes/templates/helm/gluu/charts/scim/templates/deployment.yml
@@ -43,6 +43,14 @@ spec:
       topologySpreadConstraints:
         {{- include "scim.topology-spread-constraints" . | indent 8 }}
       {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{- toYaml .Values.affinity | nindent 8 }}
+      {{- end }}
       {{- if .Values.tolerations }}
       tolerations:
       {{- with .Values.tolerations }}

diff --git a/pygluu/kubernetes/templates/helm/gluu/charts/scim/values.yaml b/pygluu/kubernetes/templates/helm/gluu/charts/scim/values.yaml
@@ -86,4 +86,7 @@ additionalLabels: { }
 # -- Additional annotations that will be added across all resources  in the format of {cert-manager.io/issuer: "letsencrypt-prod"}. key app is taken
 additionalAnnotations: { }
 # -- https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-tolerations: []
+tolerations: []
+# -- https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
+affinity: {}
+nodeSelector: {}