Adding NodeSelector field to Jobs

According to att-comdev#101 Signed-off-by: DTadrzak <daniel.tadrzak@intel.com>
Ciello89 · Jan 11, 2017 · 6f124d5 · 6f124d5
1 parent 2f87853
commit 6f124d5
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 0 deletions.
diff --git a/cinder/templates/job-db-init.yaml b/cinder/templates/job-db-init.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: cinder-db-init
           image: {{ .Values.images.db_init | quote }}

diff --git a/cinder/templates/job-db-sync.yaml b/cinder/templates/job-db-sync.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: cinder-db-sync
           image: {{ .Values.images.db_sync }}

diff --git a/cinder/templates/job-ks-endpoints.yaml.yaml b/cinder/templates/job-ks-endpoints.yaml.yaml
@@ -31,6 +31,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
 {{- range $key1, $osServiceType := tuple "volume" "volumev2" "volumev3" }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}

diff --git a/cinder/templates/job-ks-service.yaml b/cinder/templates/job-ks-service.yaml
@@ -31,6 +31,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
 {{- range $key1, $osServiceType := tuple "volume" "volumev2" "volumev3" }}
         - name: {{ $osServiceType }}-ks-service-registration

diff --git a/cinder/templates/job-ks-user.yaml b/cinder/templates/job-ks-user.yaml
@@ -31,6 +31,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: cinder-ks-user
           image: {{ .Values.images.ks_user }}

diff --git a/glance/templates/db-sync.yaml b/glance/templates/db-sync.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: glance-db-sync
           image: {{ .Values.images.db_sync }}

diff --git a/glance/templates/init.yaml b/glance/templates/init.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: glance-init
           image: {{ .Values.images.init }}

diff --git a/heat/templates/job-db-init.yaml b/heat/templates/job-db-init.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: heat-db-init
           image: {{ .Values.images.db_init | quote }}

diff --git a/heat/templates/job-db-sync.yaml b/heat/templates/job-db-sync.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: heat-db-sync
           image: {{ .Values.images.db_sync }}

diff --git a/heat/templates/job-ks-endpoints.yaml.yaml b/heat/templates/job-ks-endpoints.yaml.yaml
@@ -31,6 +31,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
 {{- range $key1, $osServiceName := tuple "heat" "heat-cfn" }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}

diff --git a/heat/templates/job-ks-service.yaml b/heat/templates/job-ks-service.yaml
@@ -31,6 +31,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
 {{- range $key1, $osServiceName := tuple "heat" "heat-cfn" }}
         - name: {{ $osServiceName }}-ks-service-registration

diff --git a/heat/templates/job-ks-user.yaml b/heat/templates/job-ks-user.yaml
@@ -34,6 +34,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: heat-ks-user
           image: {{ .Values.images.ks_user }}

diff --git a/keystone/templates/job-db-sync.yaml b/keystone/templates/job-db-sync.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: keystone-db-sync
           image: {{ .Values.images.db_sync }}

diff --git a/keystone/templates/job-init.yaml b/keystone/templates/job-init.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: keystone-init
           image: {{ .Values.images.init }}

diff --git a/mariadb/templates/job-seed.yaml b/mariadb/templates/job-seed.yaml
@@ -10,6 +10,8 @@ spec:
         app: mariadb
     spec:
       restartPolicy: Never
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: mariadb-init
           image: {{ .Values.images.mariadb }}

diff --git a/neutron/templates/job-db-sync.yaml b/neutron/templates/job-db-sync.yaml
@@ -6,6 +6,8 @@ spec:
   template:
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: neutron-db-sync
           image: {{ .Values.images.db_sync }}

diff --git a/neutron/templates/job-init.yaml b/neutron/templates/job-init.yaml
@@ -6,6 +6,8 @@ spec:
   template:
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: neutron-init
           image: {{ .Values.images.init }}

diff --git a/neutron/templates/job-post.yaml b/neutron/templates/job-post.yaml
@@ -6,6 +6,8 @@ spec:
   template:
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: neutron-post
           image: {{ .Values.images.post }}

diff --git a/nova/templates/job-db-sync.yaml b/nova/templates/job-db-sync.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: nova-db-sync
           image: {{ .Values.image.db_sync }}

diff --git a/nova/templates/job-init.yaml b/nova/templates/job-init.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: nova-init
           image: {{ .Values.image.init }}

diff --git a/nova/templates/job-post.yaml b/nova/templates/job-post.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: nova-post
           image: {{ .Values.image.post }}