add nodeSelector work (#1219)

ansible · Feb 6, 2023 · 50ef8ac · 50ef8ac
1 parent 682f522
commit 50ef8ac
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/config/crd/bases/awx.ansible.com_awxs.yaml b/config/crd/bases/awx.ansible.com_awxs.yaml
@@ -157,6 +157,12 @@ spec:
               node_selector:
                 description: nodeSelector for the pods
                 type: string
+              web_node_selector:
+                description: nodeSelector for the web pods
+                type: string
+              task_node_selector:
+                description: nodeSelector for the task pods
+                type: string
               topology_spread_constraints:
                 description: topology rule(s) for the pods
                 type: string

diff --git a/roles/installer/defaults/main.yml b/roles/installer/defaults/main.yml
@@ -70,6 +70,22 @@ hostname: ''
 #   kubernetes.io/os: linux
 node_selector: ''
 
+# Add a nodeSelector for the AWX pods. It must match a node's labels for the pod
+# to be scheduled on that node. Specify as literal block. E.g.:
+# node_selector: |
+#   disktype: ssd
+#   kubernetes.io/arch: amd64
+#   kubernetes.io/os: linux
+web_node_selector: ''
+
+# Add a nodeSelector for the AWX pods. It must match a node's labels for the pod
+# to be scheduled on that node. Specify as literal block. E.g.:
+# node_selector: |
+#   disktype: ssd
+#   kubernetes.io/arch: amd64
+#   kubernetes.io/os: linux
+task_node_selector: ''
+
 # Add a topologySpreadConstraints for the AWX pods.
 # Specify as literal block. E.g.:
 # topology_spread_constraints: |

diff --git a/roles/installer/templates/deployments/task.yaml.j2 b/roles/installer/templates/deployments/task.yaml.j2
@@ -301,7 +301,10 @@ spec:
             - name: AWX_KUBE_DEVEL
               value: "1"
 {% endif %}
-{% if node_selector %}
+{% if task_node_selector %}
+      nodeSelector:
+        {{ task_node_selector | indent(width=8) }}
+{% elif node_selector %}
       nodeSelector:
         {{ node_selector | indent(width=8) }}
 {% endif %}

diff --git a/roles/installer/templates/deployments/web.yaml.j2 b/roles/installer/templates/deployments/web.yaml.j2
@@ -223,6 +223,13 @@ spec:
             - name: AWX_KUBE_DEVEL
               value: "1"
 {% endif %}
+{% if web_node_selector %}
+      nodeSelector:
+        {{ web_node_selector | indent(width=8) }}
+{% elif node_selector %}
+      nodeSelector:
+        {{ node_selector | indent(width=8) }}
+{% endif %}
 {% if web_tolerations %}
       tolerations:
         {{ web_tolerations| indent(width=8) }}