From 89ca01bbedf5edeb618081b586de99d6b0c0f7c8 Mon Sep 17 00:00:00 2001 From: The Codin' Cowboy Date: Tue, 13 Feb 2024 13:03:20 -0800 Subject: [PATCH 1/5] feat: add nodeSelectors --- .../primary-site/templates/deployments/inbox-listener.yaml | 6 ++++++ .../primary-site/templates/deployments/site-controller.yaml | 6 ++++++ .../primary-site/templates/deployments/stream-service.yaml | 6 ++++++ charts/primary-site/values.yaml | 3 +++ 4 files changed, 21 insertions(+) diff --git a/charts/primary-site/templates/deployments/inbox-listener.yaml b/charts/primary-site/templates/deployments/inbox-listener.yaml index f1c003a..77e3502 100644 --- a/charts/primary-site/templates/deployments/inbox-listener.yaml +++ b/charts/primary-site/templates/deployments/inbox-listener.yaml @@ -105,3 +105,9 @@ spec: {{- if .Values.inboxListener.deployment.serviceAccount.enabled }} serviceAccount: inbox-listener {{- end}} + {{- if ne .Values.inboxListener.deployment.nodeSelectors {} }} + nodeSelector: + {{- range $key, $value := .Values.inboxListener.deployment.nodeSelectors }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end}} \ No newline at end of file diff --git a/charts/primary-site/templates/deployments/site-controller.yaml b/charts/primary-site/templates/deployments/site-controller.yaml index 918142e..81615b0 100644 --- a/charts/primary-site/templates/deployments/site-controller.yaml +++ b/charts/primary-site/templates/deployments/site-controller.yaml @@ -62,3 +62,9 @@ spec: - name: {{ $item.name }} value: {{ $item.value | quote}} {{- end }} + {{- if ne .Values.siteController.deployment.nodeSelectors {} }} + nodeSelector: + {{- range $key, $value := .Values.siteController.deployment.nodeSelectors }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end}} diff --git a/charts/primary-site/templates/deployments/stream-service.yaml b/charts/primary-site/templates/deployments/stream-service.yaml index 02b3fc1..e99f9bf 100644 --- a/charts/primary-site/templates/deployments/stream-service.yaml +++ b/charts/primary-site/templates/deployments/stream-service.yaml @@ -117,3 +117,9 @@ spec: {{- if .Values.streamService.deployment.serviceAccount.enabled }} serviceAccount: stream-service {{- end}} + {{- if ne .Values.streamService.deployment.nodeSelectors {} }} + nodeSelector: + {{- range $key, $value := .Values.streamService.deployment.nodeSelectors }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end}} \ No newline at end of file diff --git a/charts/primary-site/values.yaml b/charts/primary-site/values.yaml index e39035c..863e239 100644 --- a/charts/primary-site/values.yaml +++ b/charts/primary-site/values.yaml @@ -54,6 +54,7 @@ inboxListener: memory: 4Gi podLabels: {} podAnnotations: {} + nodeSelectors: {} metrics: namespace: "" subsystem: "" @@ -97,6 +98,7 @@ streamService: memory: 2Gi podLabels: {} podAnnotations: {} + nodeSelectors: {} metrics: namespace: "" subsystem: "" @@ -122,6 +124,7 @@ siteController: memory: 250Mi podLabels: {} podAnnotations: {} + nodeSelectors: {} metrics: namespace: "" subsystem: "" From db21f00e5f38a28de4673f26226b1fe0b4c54b18 Mon Sep 17 00:00:00 2001 From: The Codin' Cowboy Date: Tue, 13 Feb 2024 13:08:13 -0800 Subject: [PATCH 2/5] feat: add nodeSelectors --- charts/primary-site/templates/deployments/inbox-listener.yaml | 2 +- charts/primary-site/templates/deployments/stream-service.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/primary-site/templates/deployments/inbox-listener.yaml b/charts/primary-site/templates/deployments/inbox-listener.yaml index 77e3502..3742ae6 100644 --- a/charts/primary-site/templates/deployments/inbox-listener.yaml +++ b/charts/primary-site/templates/deployments/inbox-listener.yaml @@ -110,4 +110,4 @@ spec: {{- range $key, $value := .Values.inboxListener.deployment.nodeSelectors }} {{ $key }}: {{ $value | quote }} {{- end }} - {{- end}} \ No newline at end of file + {{- end}} diff --git a/charts/primary-site/templates/deployments/stream-service.yaml b/charts/primary-site/templates/deployments/stream-service.yaml index e99f9bf..0b5f3eb 100644 --- a/charts/primary-site/templates/deployments/stream-service.yaml +++ b/charts/primary-site/templates/deployments/stream-service.yaml @@ -122,4 +122,4 @@ spec: {{- range $key, $value := .Values.streamService.deployment.nodeSelectors }} {{ $key }}: {{ $value | quote }} {{- end }} - {{- end}} \ No newline at end of file + {{- end}} From 6c97714ef5a206c5cb82213bed929347667a32f8 Mon Sep 17 00:00:00 2001 From: The Codin' Cowboy Date: Tue, 13 Feb 2024 14:05:52 -0800 Subject: [PATCH 3/5] feat: enable nodeSelectors --- charts/primary-site/templates/deployments/inbox-listener.yaml | 2 +- charts/primary-site/templates/deployments/site-controller.yaml | 2 +- charts/primary-site/templates/deployments/stream-service.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/primary-site/templates/deployments/inbox-listener.yaml b/charts/primary-site/templates/deployments/inbox-listener.yaml index 3742ae6..7e7d4e4 100644 --- a/charts/primary-site/templates/deployments/inbox-listener.yaml +++ b/charts/primary-site/templates/deployments/inbox-listener.yaml @@ -105,7 +105,7 @@ spec: {{- if .Values.inboxListener.deployment.serviceAccount.enabled }} serviceAccount: inbox-listener {{- end}} - {{- if ne .Values.inboxListener.deployment.nodeSelectors {} }} + {{- if .Values.inboxListener.deployment.nodeSelectors }} nodeSelector: {{- range $key, $value := .Values.inboxListener.deployment.nodeSelectors }} {{ $key }}: {{ $value | quote }} diff --git a/charts/primary-site/templates/deployments/site-controller.yaml b/charts/primary-site/templates/deployments/site-controller.yaml index 81615b0..5ddbe00 100644 --- a/charts/primary-site/templates/deployments/site-controller.yaml +++ b/charts/primary-site/templates/deployments/site-controller.yaml @@ -62,7 +62,7 @@ spec: - name: {{ $item.name }} value: {{ $item.value | quote}} {{- end }} - {{- if ne .Values.siteController.deployment.nodeSelectors {} }} + {{- if .Values.siteController.deployment.nodeSelectors }} nodeSelector: {{- range $key, $value := .Values.siteController.deployment.nodeSelectors }} {{ $key }}: {{ $value | quote }} diff --git a/charts/primary-site/templates/deployments/stream-service.yaml b/charts/primary-site/templates/deployments/stream-service.yaml index 0b5f3eb..670f02c 100644 --- a/charts/primary-site/templates/deployments/stream-service.yaml +++ b/charts/primary-site/templates/deployments/stream-service.yaml @@ -117,7 +117,7 @@ spec: {{- if .Values.streamService.deployment.serviceAccount.enabled }} serviceAccount: stream-service {{- end}} - {{- if ne .Values.streamService.deployment.nodeSelectors {} }} + {{- if .Values.streamService.deployment.nodeSelectors }} nodeSelector: {{- range $key, $value := .Values.streamService.deployment.nodeSelectors }} {{ $key }}: {{ $value | quote }} From 158a092a7c5f9b27c52af3de8796a46fd24bd645 Mon Sep 17 00:00:00 2001 From: The Codin' Cowboy Date: Tue, 13 Feb 2024 15:28:12 -0800 Subject: [PATCH 4/5] feat: garbage collector too --- .../primary-site/templates/cronjobs/garbage-collector.yaml | 5 +++++ charts/primary-site/values.yaml | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/primary-site/templates/cronjobs/garbage-collector.yaml b/charts/primary-site/templates/cronjobs/garbage-collector.yaml index 37c8d52..7585bd7 100644 --- a/charts/primary-site/templates/cronjobs/garbage-collector.yaml +++ b/charts/primary-site/templates/cronjobs/garbage-collector.yaml @@ -75,3 +75,8 @@ spec: {{- if .Values.garbageCollector.deployment.serviceAccount.enabled }} serviceAccount: garbage-collector {{- end}} + nodeSelector: + {{- range $key, $value := .Values.inboxListener.deployment.nodeSelectors }} + {{ $key }}: {{ $value | quote }} + {{- end }} + {{- end}} diff --git a/charts/primary-site/values.yaml b/charts/primary-site/values.yaml index 863e239..4bac0b6 100644 --- a/charts/primary-site/values.yaml +++ b/charts/primary-site/values.yaml @@ -58,7 +58,8 @@ inboxListener: metrics: namespace: "" subsystem: "" - env: [] + env: + [] # AWS_COPY_WORKER_COUNT: adjust the number of concurrent workers for # copying s3 objects (default: 10) # - name: AWS_COPY_WORKER_COUNT @@ -136,6 +137,7 @@ garbageCollector: successfulJobsHistoryLimit: 3 deployment: env: [] + nodeSelectors: {} serviceAccount: enabled: false annotations: {} From cb878efe7ee5419db8fffedcb92a3b399d6042cf Mon Sep 17 00:00:00 2001 From: The Codin' Cowboy Date: Tue, 13 Feb 2024 15:29:17 -0800 Subject: [PATCH 5/5] feat: garbage collector too --- charts/primary-site/templates/cronjobs/garbage-collector.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/primary-site/templates/cronjobs/garbage-collector.yaml b/charts/primary-site/templates/cronjobs/garbage-collector.yaml index 7585bd7..e8b4fb8 100644 --- a/charts/primary-site/templates/cronjobs/garbage-collector.yaml +++ b/charts/primary-site/templates/cronjobs/garbage-collector.yaml @@ -75,8 +75,9 @@ spec: {{- if .Values.garbageCollector.deployment.serviceAccount.enabled }} serviceAccount: garbage-collector {{- end}} + {{- if .Values.garbageCollector.deployment.nodeSelectors }} nodeSelector: - {{- range $key, $value := .Values.inboxListener.deployment.nodeSelectors }} + {{- range $key, $value := .Values.garbageCollector.deployment.nodeSelectors }} {{ $key }}: {{ $value | quote }} {{- end }} {{- end}}