Add node selectors to job and task config

Signed-off-by: Joshua Benjamin <joshuabnjmn@gmail.com>
lyft · Jun 3, 2019 · a5e5f36 · a5e5f36
1 parent 5aa8a13
commit a5e5f36
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/docs/crd.md b/docs/crd.md
@@ -34,6 +34,9 @@ Below is the list of fields in the custom resource and their description
       A value between 0 and 1 that represents % of container memory dedicated to system / off heap. The
       remaining memory is allocated for heap.
 
+    * **NodeSelector** `type:map[string]string`
+      Configuration for the node selectors used for the task manager
+
   * **JobManagerConfig** `type:JobManagerConfig`
     Configuration for the Flink job manager
 
@@ -52,6 +55,9 @@ Below is the list of fields in the custom resource and their description
       A value between 0 and 1 that represents % of container memory dedicated to system / off heap. The
       remaining memory is allocated for heap.
 
+    * **NodeSelector** `type:map[string]string`
+      Configuration for the node selectors used for the job manager
+
   * **JarName** `type:string required=true`
     Name of the jar file to be run. The application image needs to ensure that the jar file is present at the right location, as
     the operator uses the Web API to submit jobs.

diff --git a/pkg/apis/app/v1alpha1/types.go b/pkg/apis/app/v1alpha1/types.go
@@ -101,13 +101,15 @@ type JobManagerConfig struct {
 	Environment           EnvironmentConfig           `json:"envConfig"`
 	Replicas              *int32                      `json:"replicas,omitempty"`
 	OffHeapMemoryFraction *float64                    `json:"offHeapMemoryFraction,omitempty"`
+	NodeSelector          map[string]string           `json:"nodeSelector"`
 }
 
 type TaskManagerConfig struct {
 	Resources             *apiv1.ResourceRequirements `json:"resources,omitempty"`
 	Environment           EnvironmentConfig           `json:"envConfig"`
 	TaskSlots             *int32                      `json:"taskSlots,omitempty"`
 	OffHeapMemoryFraction *float64                    `json:"offHeapMemoryFraction,omitempty"`
+	NodeSelector          map[string]string           `json:"nodeSelector"`
 }
 
 type EnvironmentConfig struct {

diff --git a/pkg/controller/flink/job_manager_controller.go b/pkg/controller/flink/job_manager_controller.go
@@ -350,6 +350,7 @@ func jobmanagerTemplate(app *v1alpha1.FlinkApplication) *v1.Deployment {
 					},
 					Volumes:          app.Spec.Volumes,
 					ImagePullSecrets: app.Spec.ImagePullSecrets,
+					NodeSelector:     app.Spec.JobManagerConfig.NodeSelector,
 				},
 			},
 		},

diff --git a/pkg/controller/flink/task_manager_controller.go b/pkg/controller/flink/task_manager_controller.go
@@ -238,6 +238,7 @@ func taskmanagerTemplate(app *v1alpha1.FlinkApplication) *v1.Deployment {
 					},
 					Volumes:          app.Spec.Volumes,
 					ImagePullSecrets: app.Spec.ImagePullSecrets,
+					NodeSelector:     app.Spec.TaskManagerConfig.NodeSelector,
 				},
 			},
 		},