Merge pull request #1322 from porter-dev/ym/deepgram_engine_node_grou…

…p_id more node group id updates
porter-dev · Jun 25, 2024 · 9957b72 · 9957b72
2 parents 087648c + cc5d154
commit 9957b72
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/addons/deepgram/templates/deployment.yaml b/addons/deepgram/templates/deployment.yaml
@@ -115,6 +115,21 @@ spec:
       {{- if .Values.engine.tolerations }}
         {{- toYaml .Values.engine.tolerations | nindent 8 }}
       {{- end }}
+      {{- if .Values.engineNodeGroupID }}
+        - key: "porter.run/node-group-id"
+          operator: "Equal"
+          value: {{ .Values.engineNodeGroupID | quote }}
+          effect: "NoSchedule"
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: porter.run/node-group-id
+                    operator: In
+                    values:
+                      - {{ .Values.engineNodeGroupID | quote }}
+      {{- end }}
       initContainers:
       - name: wait-for-model-download
         image: busybox

diff --git a/addons/deepgram/values.yaml b/addons/deepgram/values.yaml
@@ -227,6 +227,8 @@ efsFileSystemId: "this should be the efs file system id created in the clients c
 
 apiNodeGroupID: # the ID of the api node group where the api should run
 
+engineNodeGroupID: # the ID of the node group dedicated to the engine if any
+
 imageCredentials:
   username: deepgram+hash
   secret: secret

diff --git a/addons/hf-llm-models/templates/deployment.yaml b/addons/hf-llm-models/templates/deployment.yaml
@@ -30,14 +30,23 @@ spec:
           operator: "Equal"
           value: "true"
           effect: "NoSchedule"
+      {{- if .Values.tolerations }}
+        {{- toYaml .Values.tolerations | nindent 8 }}
+      {{- end }}
       {{- if .Values.nodeGroupId }}
         - effect: NoSchedule
           key: "porter.run/node-group-id"
           operator: "Equal"
           value: "{{ .Values.nodeGroupId }}"
-      {{- end }}
-      {{- if .Values.tolerations }}
-        {{- toYaml .Values.tolerations | nindent 8 }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: porter.run/node-group-id
+                    operator: In
+                    values:
+                      - {{ .Values.nodeGroupId | quote }}
       {{- end }}
       containers:
       - command: