fix: use corev1.Protocol directly in port maps instead of wrapping in PortInfo

Author: Skcey

internal/controller/provisioner/objects.go

@@ -44,11 +44,6 @@ const (
 	defaultInitialDelaySeconds = int32(3)
 )
 
-type PortInfo struct {
-	Port     int32
-	Protocol corev1.Protocol
-}
-
 var emptyDirVolumeSource = corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{}}
 
 //nolint:gocyclo // will refactor at some point
@@ -152,7 +147,7 @@ func (p *NginxProvisioner) buildNginxResourceObjects(
 		openshiftObjs = p.buildOpenshiftObjects(objectMeta)
 	}
 
-	ports := make(map[int32]PortInfo)
+	ports := make(map[int32]corev1.Protocol)
 	for _, listener := range gateway.Spec.Listeners {
 		var protocol corev1.Protocol
 		switch listener.Protocol {
@@ -163,7 +158,7 @@ func (p *NginxProvisioner) buildNginxResourceObjects(
 		default:
 			protocol = corev1.ProtocolTCP
 		}
-		ports[int32(listener.Port)] = PortInfo{Port: int32(listener.Port), Protocol: protocol}
+		ports[int32(listener.Port)] = protocol
 	}
 
 	// Create separate copies of objectMeta for service and deployment to avoid shared map references
@@ -529,7 +524,7 @@ func (p *NginxProvisioner) buildOpenshiftObjects(objectMeta metav1.ObjectMeta) [
 func buildNginxService(
 	objectMeta metav1.ObjectMeta,
 	nProxyCfg *graph.EffectiveNginxProxy,
-	ports map[int32]PortInfo,
+	ports map[int32]corev1.Protocol,
 	selectorLabels map[string]string,
 	addresses []gatewayv1.GatewaySpecAddress,
 ) (*corev1.Service, error) {
@@ -552,17 +547,17 @@ func buildNginxService(
 	}
 
 	servicePorts := make([]corev1.ServicePort, 0, len(ports))
-	for _, portInfo := range ports {
+	for port, protocol := range ports {
 		servicePort := corev1.ServicePort{
-			Name:       fmt.Sprintf("port-%d", portInfo.Port),
-			Port:       portInfo.Port,
-			TargetPort: intstr.FromInt32(portInfo.Port),
-			Protocol:   portInfo.Protocol,
+			Name:       fmt.Sprintf("port-%d", port),
+			Port:       port,
+			TargetPort: intstr.FromInt32(port),
+			Protocol:   protocol,
 		}
 
 		if serviceType != corev1.ServiceTypeClusterIP {
 			for _, nodePort := range serviceCfg.NodePorts {
-				if nodePort.ListenerPort == portInfo.Port {
+				if nodePort.ListenerPort == port {
 					servicePort.NodePort = nodePort.Port
 				}
 			}
@@ -640,7 +635,7 @@ func (p *NginxProvisioner) buildNginxDeployment(
 	nProxyCfg *graph.EffectiveNginxProxy,
 	ngxIncludesConfigMapName string,
 	ngxAgentConfigMapName string,
-	ports map[int32]PortInfo,
+	ports map[int32]corev1.Protocol,
 	selectorLabels map[string]string,
 	agentTLSSecretName string,
 	dockerSecretNames map[string]string,
@@ -794,7 +789,7 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
 	nProxyCfg *graph.EffectiveNginxProxy,
 	ngxIncludesConfigMapName string,
 	ngxAgentConfigMapName string,
-	ports map[int32]PortInfo,
+	ports map[int32]corev1.Protocol,
 	agentTLSSecretName string,
 	dockerSecretNames map[string]string,
 	jwtSecretName string,
@@ -803,11 +798,11 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
 	dataplaneKeySecretName string,
 ) corev1.PodTemplateSpec {
 	containerPorts := make([]corev1.ContainerPort, 0, len(ports))
-	for _, portInfo := range ports {
+	for port, protocol := range ports {
 		containerPort := corev1.ContainerPort{
-			Name:          fmt.Sprintf("port-%d", portInfo.Port),
-			ContainerPort: portInfo.Port,
-			Protocol:      portInfo.Protocol,
+			Name:          fmt.Sprintf("port-%d", port),
+			ContainerPort: port,
+			Protocol:      protocol,
 		}
 		containerPorts = append(containerPorts, containerPort)
 	}

internal/controller/provisioner/objects_test.go

@@ -177,17 +177,20 @@ func TestBuildNginxResourceObjects(t *testing.T) {
 		{
 			Port:       80,
 			Name:       "port-80",
+			Protocol:   corev1.ProtocolTCP,
 			TargetPort: intstr.FromInt(80),
 			NodePort:   30000,
 		},
 		{
 			Port:       8888,
 			Name:       "port-8888",
+			Protocol:   corev1.ProtocolTCP,
 			TargetPort: intstr.FromInt(8888),
 		},
 		{
 			Port:       9999,
 			Name:       "port-9999",
+			Protocol:   corev1.ProtocolTCP,
 			TargetPort: intstr.FromInt(9999),
 		},
 	}))
@@ -208,10 +211,12 @@ func TestBuildNginxResourceObjects(t *testing.T) {
 		{
 			ContainerPort: 80,
 			Name:          "port-80",
+			Protocol:      corev1.ProtocolTCP,
 		},
 		{
 			ContainerPort: 8888,
 			Name:          "port-8888",
+			Protocol:      corev1.ProtocolTCP,
 		},
 		{
 			ContainerPort: config.DefaultNginxMetricsPort,
@@ -220,6 +225,7 @@ func TestBuildNginxResourceObjects(t *testing.T) {
 		{
 			ContainerPort: 9999,
 			Name:          "port-9999",
+			Protocol:      corev1.ProtocolTCP,
 		},
 	}))
 
@@ -374,6 +380,7 @@ func TestBuildNginxResourceObjects_NginxProxyConfig(t *testing.T) {
 	g.Expect(container.Ports).To(ContainElement(corev1.ContainerPort{
 		ContainerPort: 8443,
 		Name:          "port-8443",
+		Protocol:      corev1.ProtocolTCP,
 		HostPort:      8443,
 	}))