From 2a6f1f3159fd2aa3bc694562fa7adf7dc7e58aad Mon Sep 17 00:00:00 2001
From: Chris Sivanich <csivanich@anyscale.com>
Date: Wed, 20 Nov 2024 19:09:39 -0800
Subject: [PATCH] Updated anyscale-operator (#3)

Co-authored-by: anyscale-helm-bot <support@anyscale.com>
---
 charts/anyscale-operator/Chart.yaml           |  2 +-
 .../templates/configmap_patches.yaml          | 20 +++++++++++++++++++
 charts/anyscale-operator/values.yaml          |  3 +++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/charts/anyscale-operator/Chart.yaml b/charts/anyscale-operator/Chart.yaml
index 2b13b18..47df24a 100644
--- a/charts/anyscale-operator/Chart.yaml
+++ b/charts/anyscale-operator/Chart.yaml
@@ -1,3 +1,3 @@
 apiVersion: v2
 name: anyscale-operator
-version: 0.0.3
+version: 0.1.0
diff --git a/charts/anyscale-operator/templates/configmap_patches.yaml b/charts/anyscale-operator/templates/configmap_patches.yaml
index c72b468..afe31be 100644
--- a/charts/anyscale-operator/templates/configmap_patches.yaml
+++ b/charts/anyscale-operator/templates/configmap_patches.yaml
@@ -154,6 +154,26 @@ data:
     {{- end }}
     {{- end }}
 
+    ########################################
+    # Instance Type Configurations (put these below the other patches so
+    # that instance-type specific patches can override the default patches).
+    ########################################
+    {{- $defaultInstanceTypesCopy := deepCopy (default dict .Values.defaultInstanceTypes) }}
+    {{- $additionalInstanceTypesCopy := deepCopy (default dict .Values.additionalInstanceTypes) }}
+    {{- $instanceTypes := merge $defaultInstanceTypesCopy $additionalInstanceTypesCopy }}
+    {{- range $instanceType, $config := $instanceTypes }}
+      {{- if $config.nodeSelector }}
+    - kind: Pod
+      selector: "anyscale.com/instance-type in ({{ $instanceType }})"
+      patch:
+        {{- range $key, $value := $config.nodeSelector }}
+        - op: add
+          path: /spec/nodeSelector/{{ $key | replace "/" "~1" }}
+          value: "{{ $value }}"
+        {{- end }}
+      {{- end }}
+    {{- end }}
+
     ########################################
     # Additional Patches
     ########################################
diff --git a/charts/anyscale-operator/values.yaml b/charts/anyscale-operator/values.yaml
index 3c665f1..bdbe49e 100644
--- a/charts/anyscale-operator/values.yaml
+++ b/charts/anyscale-operator/values.yaml
@@ -39,6 +39,9 @@ operatorResources:
 
 # defaultInstanceTypes provides a list of default Pod shapes that can be
 # used in Anyscale workloads (abstracted as virtual "instance types").
+#
+# Node selectors that apply specifically to these instance types can be
+# placed directly under each instance type under the `nodeSelector` key.
 defaultInstanceTypes:
   2CPU-8GB:
     resources: