Merge pull request #384 from surajssd/populate-service-port-name

always populate service port name
kedgeproject · Oct 26, 2017 · 3fcdf5d · 3fcdf5d
2 parents 66e8dc6 + 99f6ba8
commit 3fcdf5d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/pkg/spec/populators.go b/pkg/spec/populators.go
@@ -29,12 +29,10 @@ import (
 
 func populateServicePortNames(serviceName string, servicePorts []api_v1.ServicePort) {
 	// auto populate port names if more than 1 port specified
-	if len(servicePorts) > 1 {
-		for i := range servicePorts {
-			// Only populate if the port name is not already specified
-			if len(servicePorts[i].Name) == 0 {
-				servicePorts[i].Name = serviceName + "-" + strconv.FormatInt(int64(servicePorts[i].Port), 10)
-			}
+	for i := range servicePorts {
+		// Only populate if the port name is not already specified
+		if len(servicePorts[i].Name) == 0 {
+			servicePorts[i].Name = serviceName + "-" + strconv.FormatInt(int64(servicePorts[i].Port), 10)
 		}
 	}
 }

diff --git a/pkg/spec/populators_test.go b/pkg/spec/populators_test.go
@@ -217,6 +217,7 @@ func TestPopulateServicePortNames(t *testing.T) {
 			},
 			outputServicePorts: []api_v1.ServicePort{
 				{
+					Name: fmt.Sprintf("%v-%v", serviceName, 8080),
 					Port: 8080,
 				},
 			},

diff --git a/pkg/spec/resources_test.go b/pkg/spec/resources_test.go
@@ -609,7 +609,7 @@ func TestCreateServices(t *testing.T) {
 			},
 			append(make([]runtime.Object, 0), &api_v1.Service{
 				ObjectMeta: meta_v1.ObjectMeta{Name: "test"},
-				Spec:       api_v1.ServiceSpec{Ports: []api_v1.ServicePort{{Port: 8080}}},
+				Spec:       api_v1.ServiceSpec{Ports: []api_v1.ServicePort{{Port: 8080, Name: "test-8080"}}},
 			}),
 		},
 	}