From 2c5b630f2df3999e71d3a45e2cb7b16b95ed27d0 Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Thu, 25 Jul 2024 17:32:08 +0200 Subject: [PATCH] nodeSelector db, elasticsearch, gateway, saml, redis session --- charts/phraseanet/Chart.yaml | 2 +- charts/phraseanet/templates/database.yml | 3 +++ charts/phraseanet/templates/elasticsearch.yml | 3 +++ charts/phraseanet/templates/gateway.yml | 3 +++ charts/phraseanet/templates/phraseanet-saml-sp.yml | 3 +++ charts/phraseanet/templates/redis-session.yaml | 3 +++ 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/charts/phraseanet/Chart.yaml b/charts/phraseanet/Chart.yaml index e8675ac..085b540 100644 --- a/charts/phraseanet/Chart.yaml +++ b/charts/phraseanet/Chart.yaml @@ -14,7 +14,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.43.0 +version: 0.44.0 # This is the version number of the application being deployed. This version number should be diff --git a/charts/phraseanet/templates/database.yml b/charts/phraseanet/templates/database.yml index a62d9b4..f667fc7 100644 --- a/charts/phraseanet/templates/database.yml +++ b/charts/phraseanet/templates/database.yml @@ -17,6 +17,9 @@ spec: app: phraseanet tier: db spec: + {{- if .Values.nodeSelector }} + nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }} + {{- end }} volumes: - name: database persistentVolumeClaim: diff --git a/charts/phraseanet/templates/elasticsearch.yml b/charts/phraseanet/templates/elasticsearch.yml index c23d74a..69b55af 100644 --- a/charts/phraseanet/templates/elasticsearch.yml +++ b/charts/phraseanet/templates/elasticsearch.yml @@ -17,6 +17,9 @@ spec: app: phraseanet tier: elasticsearch spec: + {{- if .Values.nodeSelector }} + nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }} + {{- end }} volumes: - name: elastic-data persistentVolumeClaim: diff --git a/charts/phraseanet/templates/gateway.yml b/charts/phraseanet/templates/gateway.yml index 6bf98ef..3b6e243 100644 --- a/charts/phraseanet/templates/gateway.yml +++ b/charts/phraseanet/templates/gateway.yml @@ -15,6 +15,9 @@ spec: app: phraseanet tier: gateway spec: + {{- if .Values.nodeSelector }} + nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }} + {{- end }} volumes: - name: phraseanet-datas persistentVolumeClaim: diff --git a/charts/phraseanet/templates/phraseanet-saml-sp.yml b/charts/phraseanet/templates/phraseanet-saml-sp.yml index e7e2c89..0c09983 100644 --- a/charts/phraseanet/templates/phraseanet-saml-sp.yml +++ b/charts/phraseanet/templates/phraseanet-saml-sp.yml @@ -16,6 +16,9 @@ spec: tier: saml-sp {{- template "saml.annotations" . }} spec: + {{- if .Values.nodeSelector }} + nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }} + {{- end }} volumes: {{- if eq .Values.saml.saml_configmap.enabled true }} - name: phraseanet-saml-idp-config-dir diff --git a/charts/phraseanet/templates/redis-session.yaml b/charts/phraseanet/templates/redis-session.yaml index 7ccf2bd..3d9b6e5 100644 --- a/charts/phraseanet/templates/redis-session.yaml +++ b/charts/phraseanet/templates/redis-session.yaml @@ -15,6 +15,9 @@ spec: app: phraseanet tier: redis-session spec: + {{- if .Values.nodeSelector }} + nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }} + {{- end }} containers: - name: redis-session image: redis:5.0.5