Distinguish between different unnamed node ports when preserving

Signed-off-by: Scott Seago <[email protected]>

changelogs/unreleased/4026-sseago

@@ -0,0 +1 @@
+Distinguish between different unnamed node ports when preserving

pkg/restore/service_action.go

@@ -83,6 +83,7 @@ func deleteNodePorts(service *corev1api.Service) error {
 	// to the last-applied-config annotation. We'll retain these values, and
 	// clear out any other (presumably auto-assigned) NodePort values.
 	explicitNodePorts := sets.NewString()
+	unnamedPortInts := sets.NewInt()
 	lastAppliedConfig, ok := service.Annotations[annotationLastAppliedConfig]
 	if ok {
 		appliedServiceUnstructured := new(map[string]interface{})
@@ -123,7 +124,7 @@ func deleteNodePorts(service *corev1api.Service) error {
 						portName, ok := p["name"]
 						if !ok {
 							// unnamed port
-							explicitNodePorts.Insert("")
+							unnamedPortInts.Insert(nodePortInt)
 						} else {
 							explicitNodePorts.Insert(portName.(string))
 						}
@@ -135,8 +136,14 @@ func deleteNodePorts(service *corev1api.Service) error {
 	}
 
 	for i, port := range service.Spec.Ports {
-		if !explicitNodePorts.Has(port.Name) {
-			service.Spec.Ports[i].NodePort = 0
+		if port.Name != "" {
+			if !explicitNodePorts.Has(port.Name) {
+				service.Spec.Ports[i].NodePort = 0
+			}
+		} else {
+			if !unnamedPortInts.Has(int(port.NodePort)) {
+				service.Spec.Ports[i].NodePort = 0
+			}
 		}
 	}
 

pkg/restore/service_action_test.go

@@ -196,6 +196,9 @@ func TestServiceActionExecute(t *testing.T) {
 						{
 							NodePort: 8080,
 						},
+						{
+							NodePort: 9090,
+						},
 					},
 				},
 			},
@@ -212,6 +215,7 @@ func TestServiceActionExecute(t *testing.T) {
 						{
 							NodePort: 8080,
 						},
+						{},
 					},
 				},
 			},