OPSEXP-933: Add node selector for deployments on ACS Helm Chart (#673)

* Add nodeSelectors to deployments * Seperate NodeSelector values per pod * add default to alfresco-insight-zeppelin * rebase * Move nodeSelector value from ooi to ooiservice and add comment
Alfresco · Mar 23, 2022 · 0972b2c · 0972b2c
1 parent 51b4a6f
commit 0972b2c
Show file tree

Hide file tree

Showing 26 changed files with 96 additions and 10 deletions.
diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md
diff --git a/helm/alfresco-content-services/charts/activemq/README.md b/helm/alfresco-content-services/charts/activemq/README.md
@@ -29,6 +29,7 @@ A Helm chart Providing Apache ActiveMQ.
 | livenessProbe.initialDelaySeconds | int | `130` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
 | livenessProbe.timeoutSeconds | int | `10` |  |
+| nodeSelector | object | `{}` |  |
 | persistence.chownWithDynamicProvisioning | bool | `false` |  |
 | persistence.existingClaim | string | `"alfresco-volume-claim"` |  |
 | persistence.mountPath | string | `"/opt/activemq/data"` |  |

diff --git a/helm/alfresco-content-services/charts/activemq/templates/deployment-activemq.yaml b/helm/alfresco-content-services/charts/activemq/templates/deployment-activemq.yaml
@@ -20,6 +20,9 @@ spec:
         app: {{ template "activemq.fullname" . }}
         release: {{ .Release.Name }}
     spec:
+    {{- if .Values.nodeSelector }}
+      nodeSelector: {{- .Values.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       containers:
       - name: activemq
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

diff --git a/helm/alfresco-content-services/charts/activemq/values.yaml b/helm/alfresco-content-services/charts/activemq/values.yaml
@@ -1,6 +1,7 @@
 # Leave this to true to deploy the chart
 enabled: true
 replicaCount: 1
+nodeSelector: {}
 image:
   repository: alfresco/alfresco-activemq
   tag: 5.16.4-jre11-centos7
@@ -55,7 +56,6 @@ livenessProbe:
   periodSeconds: 20
   timeoutSeconds: 10
   failureThreshold: 1
-
 persistence:
   existingClaim: "alfresco-volume-claim"
   mountPath: "/opt/activemq/data"

diff --git a/helm/alfresco-content-services/charts/alfresco-search/README.md b/helm/alfresco-content-services/charts/alfresco-search/README.md
@@ -43,6 +43,7 @@ A Helm chart for deploying Alfresco Search
 | livenessProbe.initialDelaySeconds | int | `130` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
 | livenessProbe.timeoutSeconds | int | `10` |  |
+| nodeSelector | object | `{}` |  |
 | persistence | object | `{"EbsPvConfiguration":{"fsType":"ext4"},"VolumeSizeRequest":"10Gi","chownWithDynamicProvisioning":false,"enabled":true,"search":{"data":{"mountPath":"/opt/alfresco-search-services/data","subPath":"alfresco-content-services/solr-data"}}}` | Defines the mounting points for the persistence required by the apps in the cluster the solr data folder containing the indexes for the alfresco-search-services is mapped to alfresco-content-services/solr-data |
 | persistence.VolumeSizeRequest | string | `"10Gi"` | Only define if you have a specific claim already created existingClaim: "search-master-claim" |
 | readinessProbe.initialDelaySeconds | int | `60` |  |

diff --git a/...tent-services/charts/alfresco-search/charts/alfresco-insight-zeppelin/README.md b/...tent-services/charts/alfresco-search/charts/alfresco-insight-zeppelin/README.md
@@ -30,6 +30,7 @@ A Helm chart for deploying Alfresco Insight Zeppelin
 | livenessProbe.initialDelaySeconds | int | `130` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
 | livenessProbe.timeoutSeconds | int | `10` |  |
+| nodeSelector | object | `{}` |  |
 | readinessProbe.initialDelaySeconds | int | `60` |  |
 | readinessProbe.periodSeconds | int | `20` |  |
 | readinessProbe.timeoutSeconds | int | `10` |  |

diff --git a/...ervices/charts/alfresco-search/charts/alfresco-insight-zeppelin/templates/deployment.yaml b/...ervices/charts/alfresco-search/charts/alfresco-insight-zeppelin/templates/deployment.yaml
@@ -28,6 +28,9 @@ spec:
         app: {{ template "alfresco-insight-zeppelin.fullName" . }}
         release: {{ .Release.Name }}
     spec:
+    {{- if .Values.nodeSelector }}
+      nodeSelector: {{- .Values.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       {{- if .Values.global.alfrescoRegistryPullSecrets }}
       # only set this secret if a private docker registry variable is defined
       imagePullSecrets:

diff --git a/...esco-content-services/charts/alfresco-search/charts/alfresco-insight-zeppelin/values.yaml b/...esco-content-services/charts/alfresco-search/charts/alfresco-insight-zeppelin/values.yaml
@@ -5,6 +5,7 @@
 # -- Define the alfresco-insight-zeppelin properties to use in the k8s cluster
 # This is chart will be installed as part of Alfresco Insight Engine
 replicaCount: 1
+nodeSelector: {}
 insightzeppelin:
   enabled: false
 image:

diff --git a/helm/alfresco-content-services/charts/alfresco-search/templates/deployment.yaml b/helm/alfresco-content-services/charts/alfresco-search/templates/deployment.yaml
@@ -34,6 +34,9 @@ spec:
     {{- with .Values.tolerations }}
       tolerations:
 {{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- if .Values.nodeSelector }}
+      nodeSelector: {{- .Values.nodeSelector | toYaml | nindent 8 }}
     {{- end }}
       {{- if .Values.global.alfrescoRegistryPullSecrets }}
       # only set this secret if a private docker registry variable is defined

diff --git a/helm/alfresco-content-services/charts/alfresco-search/values.yaml b/helm/alfresco-content-services/charts/alfresco-search/values.yaml
@@ -5,6 +5,7 @@
 # -- Define the alfresco-search properties to use in the k8s cluster
 # This is the search provider used by alfresco-content-repository
 replicaCount: 1
+nodeSelector: {}
 # -- Define the type of Alfresco Search to use. The default is Alfresco Search Services.
 # The type can be set to use Insight Engine with --set alfresco-search.type="insight-engine",alfresco-search.global.alfrescoRegistryPullSecrets="quay-registry-secret",alfresco-insight-zeppelin.enabled="true"
 # As the Docker Image for Insight Engine is not publicly available the alfrescoRegistryPullSecrets has to be set

diff --git a/helm/alfresco-content-services/charts/alfresco-sync-service/README.md b/helm/alfresco-content-services/charts/alfresco-sync-service/README.md
@@ -41,6 +41,7 @@ Alfresco Sync Service
 | initContainers.postgres.image.tag | string | `"1.35.0"` |  |
 | initContainers.postgres.resources.limits.memory | string | `"10Mi"` |  |
 | initContainers.postgres.resources.requests.memory | string | `"5Mi"` |  |
+| nodeSelector | object | `{}` |  |
 | postgresql-syncservice.enabled | bool | `true` |  |
 | postgresql-syncservice.image.pullPolicy | string | `"IfNotPresent"` |  |
 | postgresql-syncservice.image.tag | string | `"11.7.0"` |  |

diff --git a/...resco-content-services/charts/alfresco-sync-service/templates/deployment-syncservice.yaml b/...resco-content-services/charts/alfresco-sync-service/templates/deployment-syncservice.yaml
@@ -27,6 +27,9 @@ spec:
         checksum/config: {{ include (print $.Template.BasePath "/config-syncservice.yaml") . | sha256sum }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret-database.yaml") . | sha256sum }}
     spec:
+    {{- if .Values.nodeSelector }}
+      nodeSelector: {{- .Values.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       imagePullSecrets:
         - name: {{ .Values.global.alfrescoRegistryPullSecrets }}
       initContainers:

diff --git a/helm/alfresco-content-services/charts/alfresco-sync-service/values.yaml b/helm/alfresco-content-services/charts/alfresco-sync-service/values.yaml
@@ -1,4 +1,5 @@
 replicaCount: 1
+nodeSelector: {}
 
 # -- Global definition of Docker registry pull secret which can be overridden from parent ACS Helm chart(s)
 global:

diff --git a/helm/alfresco-content-services/templates/deployment-ai-transformer.yaml b/helm/alfresco-content-services/templates/deployment-ai-transformer.yaml
@@ -23,6 +23,9 @@ spec:
       labels:
         {{- include "ai-transformer.selectorLabels" . | nindent 8 }}
     spec:
+    {{- if .Values.aiTransformer.nodeSelector }}
+      nodeSelector: {{- .Values.aiTransformer.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       {{- if .Values.global.alfrescoRegistryPullSecrets }}
       # only set this secret if a private docker registry variable is defined
       imagePullSecrets:

diff --git a/helm/alfresco-content-services/templates/deployment-filestore.yaml b/helm/alfresco-content-services/templates/deployment-filestore.yaml
@@ -23,6 +23,9 @@ spec:
       labels:
         {{- include "filestore.selectorLabels" . | nindent 8 }}
     spec:
+    {{- if .Values.filestore.nodeSelector }}
+      nodeSelector: {{- .Values.filestore.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       {{- if .Values.global.alfrescoRegistryPullSecrets }}
       # only set this secret if a private docker registry variable is defined
       imagePullSecrets:

diff --git a/helm/alfresco-content-services/templates/deployment-imagemagick.yaml b/helm/alfresco-content-services/templates/deployment-imagemagick.yaml
@@ -22,6 +22,9 @@ spec:
       labels:
         {{- include "imagemagick.selectorLabels" . | nindent 8 }}
     spec:
+    {{- if .Values.imagemagick.nodeSelector }}
+      nodeSelector: {{- .Values.imagemagick.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       {{- if .Values.global.alfrescoRegistryPullSecrets }}
       # only set this secret if a private docker registry variable is defined
       imagePullSecrets:

diff --git a/helm/alfresco-content-services/templates/deployment-libreoffice.yaml b/helm/alfresco-content-services/templates/deployment-libreoffice.yaml
@@ -22,6 +22,9 @@ spec:
       labels:
         {{- include "libreoffice.selectorLabels" . | nindent 8 }}
     spec:
+    {{- if .Values.libreoffice.nodeSelector }}
+      nodeSelector: {{- .Values.libreoffice.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       {{- if .Values.global.alfrescoRegistryPullSecrets }}
       # only set this secret if a private docker registry variable is defined
       imagePullSecrets:

diff --git a/helm/alfresco-content-services/templates/deployment-ms-teams-service.yaml b/helm/alfresco-content-services/templates/deployment-ms-teams-service.yaml
@@ -23,6 +23,9 @@ spec:
       labels:
         {{- include "ms-teams-service.selectorLabels" . | nindent 8 }}
     spec:
+    {{- if .Values.msTeamsService.nodeSelector }}
+      nodeSelector: {{- .Values.msTeamsService.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       {{- if .Values.global.alfrescoRegistryPullSecrets }}
       # only set this secret if a private docker registry variable is defined
       imagePullSecrets:

diff --git a/helm/alfresco-content-services/templates/deployment-ooi-service.yaml b/helm/alfresco-content-services/templates/deployment-ooi-service.yaml
@@ -24,6 +24,9 @@ spec:
       labels:
         {{- include "ooi-service.selectorLabels" . | nindent 8 }}
     spec:
+    {{- if .Values.ooiService.nodeSelector }}
+      nodeSelector: {{- .Values.ooiService.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       {{- if .Values.global.alfrescoRegistryPullSecrets }}
       # only set this secret if a private docker registry variable is defined
       imagePullSecrets:

diff --git a/helm/alfresco-content-services/templates/deployment-pdfrenderer.yaml b/helm/alfresco-content-services/templates/deployment-pdfrenderer.yaml
@@ -22,6 +22,9 @@ spec:
       labels:
         {{- include "pdfrenderer.selectorLabels" . | nindent 8 }}
     spec:
+    {{- if .Values.pdfrenderer.nodeSelector }}
+      nodeSelector: {{- .Values.pdfrenderer.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       {{- if .Values.global.alfrescoRegistryPullSecrets }}
       # only set this secret if a private docker registry variable is defined
       imagePullSecrets:

diff --git a/helm/alfresco-content-services/templates/deployment-repository.yaml b/helm/alfresco-content-services/templates/deployment-repository.yaml
@@ -28,6 +28,9 @@ spec:
       labels:
         {{- include "repository.selectorLabels" . | nindent 8 }}
     spec:
+    {{- if .Values.repository.nodeSelector }}
+      nodeSelector: {{- .Values.repository.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       {{- if .Values.global.alfrescoRegistryPullSecrets }}
       # only set this secret if a private docker registry variable is defined
       imagePullSecrets:

diff --git a/helm/alfresco-content-services/templates/deployment-share.yaml b/helm/alfresco-content-services/templates/deployment-share.yaml
@@ -21,6 +21,9 @@ spec:
       labels:
         {{- include "share.selectorLabels" . | nindent 8 }}
     spec:
+    {{- if .Values.share.nodeSelector }}
+      nodeSelector: {{- .Values.share.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       {{- if .Values.global.alfrescoRegistryPullSecrets }}
       # only set this secret if a private docker registry variable is defined
       imagePullSecrets:

diff --git a/helm/alfresco-content-services/templates/deployment-tika.yaml b/helm/alfresco-content-services/templates/deployment-tika.yaml
@@ -22,6 +22,9 @@ spec:
       labels:
         {{- include "tika.selectorLabels" . | nindent 8 }}
     spec:
+    {{- if .Values.tika.nodeSelector }}
+      nodeSelector: {{- .Values.tika.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       {{- if .Values.global.alfrescoRegistryPullSecrets }}
       # only set this secret if a private docker registry variable is defined
       imagePullSecrets:

diff --git a/helm/alfresco-content-services/templates/deployment-transform-misc.yaml b/helm/alfresco-content-services/templates/deployment-transform-misc.yaml
@@ -23,6 +23,9 @@ spec:
       labels:
         {{- include "transform-misc.selectorLabels" . | nindent 8 }}
     spec:
+    {{- if .Values.transformmisc.nodeSelector }}
+      nodeSelector: {{- .Values.transformmisc.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       {{- if .Values.global.alfrescoRegistryPullSecrets }}
       # only set this secret if a private docker registry variable is defined
       imagePullSecrets:

diff --git a/helm/alfresco-content-services/templates/deployment-transform-router.yaml b/helm/alfresco-content-services/templates/deployment-transform-router.yaml
@@ -22,6 +22,9 @@ spec:
       labels:
         {{- include "transform-router.selectorLabels" . | nindent 8 }}
     spec:
+    {{- if .Values.transformrouter.nodeSelector }}
+      nodeSelector: {{- .Values.transformrouter.nodeSelector | toYaml | nindent 8 }}
+    {{- end }}
       # only set this secret if a private docker registry variable is defined
       imagePullSecrets:
         - name: {{ .Values.global.alfrescoRegistryPullSecrets }}

diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml
@@ -18,6 +18,7 @@ repository:
   licenseSecret: null
   edition: Enterprise
   replicaCount: 2
+  nodeSelector: {}
   strategy:
     type: Recreate
   image:
@@ -108,6 +109,7 @@ apiexplorer:
 
 ooiService:
   replicaCount: 2
+  nodeSelector: {}
   image:
     repository: quay.io/alfresco/alfresco-ooi-service
     tag: 1.1.1
@@ -145,6 +147,7 @@ msTeams:
 
 msTeamsService:
   replicaCount: 2
+  nodeSelector: {}
   image:
     repository: quay.io/alfresco/alfresco-ms-teams-service
     tag: 1.0.0
@@ -191,6 +194,7 @@ msTeamsService:
 
 transformrouter:
   replicaCount: 2
+  nodeSelector: {}
   image:
     repository: quay.io/alfresco/alfresco-transform-router
     tag: 1.5.2
@@ -220,6 +224,7 @@ transformrouter:
 # to transform pdf files
 pdfrenderer:
   replicaCount: 2
+  nodeSelector: {}
   image:
     repository: alfresco/alfresco-pdf-renderer
     tag: 2.5.7
@@ -253,6 +258,7 @@ pdfrenderer:
 # to transform image files
 imagemagick:
   replicaCount: 2
+  nodeSelector: {}
   image:
     repository: alfresco/alfresco-imagemagick
     tag: 2.5.7
@@ -286,6 +292,7 @@ imagemagick:
 # to transform office files
 libreoffice:
   replicaCount: 2
+  nodeSelector: {}
   image:
     repository: alfresco/alfresco-libreoffice
     tag: 2.5.7
@@ -319,6 +326,7 @@ libreoffice:
 # to transform office files
 tika:
   replicaCount: 2
+  nodeSelector: {}
   image:
     repository: alfresco/alfresco-tika
     tag: 2.5.7
@@ -353,6 +361,7 @@ tika:
 transformmisc:
   enabled: true
   replicaCount: 2
+  nodeSelector: {}
   image:
     repository: alfresco/alfresco-transform-misc
     tag: 2.5.7
@@ -384,6 +393,7 @@ transformmisc:
 
 aiTransformer:
   replicaCount: 2
+  nodeSelector: {}
   image:
     repository: quay.io/alfresco/alfresco-ai-docker-engine
     tag: 1.4.2
@@ -417,6 +427,7 @@ aiTransformer:
 # and transform service
 filestore:
   replicaCount: 1
+  nodeSelector: {}
   image:
     repository: quay.io/alfresco/alfresco-shared-file-store
     tag: 0.16.1
@@ -460,6 +471,7 @@ filestore:
 # This is the default presentation layer(UI) of Alfresco Content Services
 share:
   replicaCount: 1
+  nodeSelector: {}
   image:
     repository: quay.io/alfresco/alfresco-share
     tag: 7.2.0
@@ -532,9 +544,12 @@ persistence:
       subPath: "alfresco-content-services/filestore-data"
 
 activemq:
-    enabled: true
+  enabled: true
+  # --Possibility to choose Node for pod, key-value pair label of a desired node e.g {"kubernetes.io/hostname": multinode-demo-m02}
+  nodeSelector: {}
 
 alfresco-search:
+  nodeSelector: {}
   type: "search-services"
   enabled: true
 # If enabled is set to false, then external host and port need to point to the external instance of SOLR6, and in this case:
@@ -572,6 +587,7 @@ alfresco-search:
     #      - chart-example.local
 
 alfresco-digital-workspace:
+  nodeSelector: {}
   enabled: true
   nameOverride: "alfresco-dw"
   service:
@@ -649,6 +665,8 @@ postgresql:
   postgresqlExtendedConf:
     max_connections: 300
     log_min_messages: LOG
+  primary:
+    nodeSelector: {}
   persistence:
     existingClaim: "alfresco-volume-claim"
     subPath: "alfresco-content-services/database-data"
@@ -678,6 +696,8 @@ postgresql-syncservice:
     log_min_messages: LOG
   service:
     port: 5432
+  primary:
+    nodeSelector: {}
   resources:
     requests:
       memory: "1500Mi"
@@ -794,6 +814,7 @@ metadataKeystore:
   defaultKeyPassword: "oKIWzVdEdA"
 
 alfresco-sync-service:
+  nodeSelector: {}
   syncservice:
     enabled : true
   image: