Set autoscaler imagePullPolicy to IfNotPresent. Provide override. (ra…

…y-project#297) This PR exposes the autoscaler container pull policy in the Ray CRD for testing purposes.
lowang-bh · Jun 8, 2022 · 5f6b21a · 5f6b21a
1 parent ec4bf83
commit 5f6b21a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/ray-operator/apis/ray/v1alpha1/raycluster_types.go b/ray-operator/apis/ray/v1alpha1/raycluster_types.go
@@ -71,6 +71,8 @@ type AutoscalerOptions struct {
 	Resources *v1.ResourceRequirements `json:"resources,omitempty"`
 	// Image optionally overrides the autoscaler's container image. This override is for provided for autoscaler testing and development.
 	Image *string `json:"image,omitempty"`
+	// ImagePullPolicy optionally overrides the autoscaler container's image pull policy. This override is for provided for autoscaler testing and development.
+	ImagePullPolicy *v1.PullPolicy `json:"imagePullPolicy,omitempty"`
 	// IdleTimeoutSeconds is the number of seconds to wait before scaling down a worker pod which is not using Ray resources.
 	// Defaults to 300 (five minutes).
 	IdleTimeoutSeconds *int32 `json:"idleTimeoutSeconds,omitempty"`

diff --git a/ray-operator/apis/ray/v1alpha1/zz_generated.deepcopy.go b/ray-operator/apis/ray/v1alpha1/zz_generated.deepcopy.go
diff --git a/ray-operator/config/crd/bases/ray.io_rayclusters.yaml b/ray-operator/config/crd/bases/ray.io_rayclusters.yaml
@@ -47,6 +47,10 @@ spec:
                     description: Image optionally overrides the autoscaler's container
                       image.
                     type: string
+                  imagePullPolicy:
+                    description: ImagePullPolicy optionally overrides the autoscaler
+                      container's image pull policy.
+                    type: string
                   resources:
                     description: Resources specifies resource requests and limits
                       for the autoscaler container.

diff --git a/ray-operator/controllers/ray/common/pod.go b/ray-operator/controllers/ray/common/pod.go
@@ -223,6 +223,9 @@ func mergeAutoscalerOverrides(autoscalerContainer *v1.Container, autoscalerOptio
 		if autoscalerOptions.Image != nil {
 			autoscalerContainer.Image = *autoscalerOptions.Image
 		}
+		if autoscalerOptions.ImagePullPolicy != nil {
+			autoscalerContainer.ImagePullPolicy = *autoscalerOptions.ImagePullPolicy
+		}
 	}
 }
 

diff --git a/ray-operator/controllers/ray/common/pod_test.go b/ray-operator/controllers/ray/common/pod_test.go
@@ -344,8 +344,9 @@ func TestBuildPodWithAutoscalerOptions(t *testing.T) {
 	svcName := utils.GenerateServiceName(cluster.Name)
 
 	customAutoscalerImage := "custom-autoscaler-xxx"
+	customPullPolicy := v1.PullIfNotPresent
 	customTimeout := int32(100)
-	customUpscaling := "Aggressive"
+	customUpscaling := rayiov1alpha1.UpscalingMode("Aggressive")
 	customResources := v1.ResourceRequirements{
 		Requests: v1.ResourceList{
 			v1.ResourceCPU:    resource.MustParse("1"),
@@ -358,15 +359,17 @@ func TestBuildPodWithAutoscalerOptions(t *testing.T) {
 	}
 
 	cluster.Spec.AutoscalerOptions = &rayiov1alpha1.AutoscalerOptions{
-		UpscalingMode:      (*rayiov1alpha1.UpscalingMode)(&customUpscaling),
+		UpscalingMode:      &customUpscaling,
 		IdleTimeoutSeconds: &customTimeout,
 		Image:              &customAutoscalerImage,
+		ImagePullPolicy:    &customPullPolicy,
 		Resources:          &customResources,
 	}
 	podTemplateSpec := DefaultHeadPodTemplate(*cluster, cluster.Spec.HeadGroupSpec, podName, svcName)
 	pod := BuildPod(podTemplateSpec, rayiov1alpha1.HeadNode, cluster.Spec.HeadGroupSpec.RayStartParams, svcName, &trueFlag)
 	expectedContainer := *autoscalerContainer.DeepCopy()
 	expectedContainer.Image = customAutoscalerImage
+	expectedContainer.ImagePullPolicy = customPullPolicy
 	expectedContainer.Resources = customResources
 	index := getAutoscalerContainerIndex(pod)
 	actualContainer := pod.Spec.Containers[index]