Ensure container ports without names are also included in the head no…

…de service (#891)

Container ports without names will not be ignored.

ray-operator/controllers/ray/common/service.go

@@ -1,6 +1,8 @@
 package common
 
 import (
+	"fmt"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -181,6 +183,9 @@ func getPortsFromCluster(cluster rayiov1alpha1.RayCluster) (map[string]int32, er
 	index := utils.FindRayContainerIndex(cluster.Spec.HeadGroupSpec.Template.Spec)
 	cPorts := cluster.Spec.HeadGroupSpec.Template.Spec.Containers[index].Ports
 	for _, port := range cPorts {
+		if port.Name == "" {
+			port.Name = fmt.Sprint(port.ContainerPort) + "-port"
+		}
 		svcPorts[port.Name] = port.ContainerPort
 	}
 

ray-operator/controllers/ray/common/service_test.go

@@ -1,10 +1,12 @@
 package common
 
 import (
+	"fmt"
 	"reflect"
 	"testing"
 
 	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/apis/ray/v1alpha1"
+	"github.com/ray-project/kuberay/ray-operator/controllers/ray/utils"
 
 	"github.com/stretchr/testify/assert"
 
@@ -40,8 +42,17 @@ var instanceWithWrongSvc = &rayiov1alpha1.RayCluster{
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{
 						{
-							Name:    "ray-head",
-							Image:   "rayproject/autoscaler",
+							Name:  "ray-head",
+							Image: "rayproject/autoscaler",
+							Ports: []corev1.ContainerPort{
+								{
+									ContainerPort: 6379,
+									Name:          "gcs",
+								},
+								{
+									ContainerPort: 8265,
+								},
+							},
 							Command: []string{"python"},
 							Args:    []string{"/opt/code.py"},
 							Env: []corev1.EnvVar{
@@ -126,3 +137,31 @@ func TestBuildServiceForHeadPodWithAnnotations(t *testing.T) {
 		t.Fatalf("Expected `%v` but got `%v`", annotations, svc.ObjectMeta.Annotations)
 	}
 }
+
+func TestGetPortsFromCluster(t *testing.T) {
+	svcPorts, err := getPortsFromCluster(*instanceWithWrongSvc)
+	assert.Nil(t, err)
+
+	// getPortsFromCluster creates service ports based on the container ports.
+	// It will assign a generated service port name if the container port name
+	// is not defined. To compare created service ports with container ports,
+	// all generated service port names need to be reverted to empty strings.
+	svcNames := map[int32]string{}
+	for name, port := range svcPorts {
+		if name == (fmt.Sprint(port) + "-port") {
+			name = ""
+		}
+		svcNames[port] = name
+	}
+
+	index := utils.FindRayContainerIndex(instanceWithWrongSvc.Spec.HeadGroupSpec.Template.Spec)
+	cPorts := instanceWithWrongSvc.Spec.HeadGroupSpec.Template.Spec.Containers[index].Ports
+
+	for _, cPort := range cPorts {
+		expectedResult := cPort.Name
+		actualResult := svcNames[cPort.ContainerPort]
+		if !reflect.DeepEqual(expectedResult, actualResult) {
+			t.Fatalf("Expected `%v` but got `%v`", expectedResult, actualResult)
+		}
+	}
+}