Bug 1776297: Add support to EnsureServicePorts

lib/resourceapply/core.go

@@ -55,8 +55,10 @@ func ApplyService(client coreclientv1.ServicesGetter, required *corev1.Service)
 
 	modified := pointer.BoolPtr(false)
 	resourcemerge.EnsureObjectMeta(modified, &existing.ObjectMeta, required.ObjectMeta)
+	resourcemerge.EnsureServicePorts(modified, &existing.Spec.Ports, required.Spec.Ports)
 	selectorSame := equality.Semantic.DeepEqual(existing.Spec.Selector, required.Spec.Selector)
 	typeSame := equality.Semantic.DeepEqual(existing.Spec.Type, required.Spec.Type)
+
 	if selectorSame && typeSame && !*modified {
 		return nil, false, nil
 	}

lib/resourcemerge/core.go

@@ -202,6 +202,51 @@ func ensureContainerPort(modified *bool, existing *corev1.ContainerPort, require
 	}
 }
 
+func EnsureServicePorts(modified *bool, existing *[]corev1.ServicePort, required []corev1.ServicePort) {
+	for i, existingServicePort := range *existing {
+		var existingCurr *corev1.ServicePort
+		for _, requiredServicePort := range required {
+			if existingServicePort.Name == requiredServicePort.Name {
+				existingCurr = &(*existing)[i]
+				ensureServicePort(modified, existingCurr, requiredServicePort)
+				break
+			}
+		}
+		if existingCurr == nil {
+			*modified = true
+			*existing = append((*existing)[:i], (*existing)[i+1:]...)
+		}
+	}
+
+	for _, requiredServicePort := range required {
+		match := false
+		for _, existingServicePort := range *existing {
+			if existingServicePort.Name == requiredServicePort.Name {
+				match = true
+				break
+			}
+		}
+		if !match {
+			*modified = true
+			*existing = append(*existing, requiredServicePort)
+		}
+	}
+}
+
+func ensureServicePort(modified *bool, existing *corev1.ServicePort, required corev1.ServicePort) {
+	ensureServicePortDefaults(&required)
+	if !equality.Semantic.DeepEqual(required, *existing) {
+		*modified = true
+		*existing = required
+	}
+}
+
+func ensureServicePortDefaults(servicePort *corev1.ServicePort) {
+	if servicePort.Protocol == "" {
+		servicePort.Protocol = corev1.ProtocolTCP
+	}
+}
+
 func ensureVolumeMount(modified *bool, existing *corev1.VolumeMount, required corev1.VolumeMount) {
 	if !equality.Semantic.DeepEqual(required, *existing) {
 		*modified = true