hostPort consistent naming

Author: Gasoid

apis/v1alpha2/nginxproxy_types.go

@@ -616,13 +616,13 @@ type NodePort struct {
 
 // HostPort exposes an nginx container port on the host.
 type HostPort struct {
-	// ContainerPort is the port on the nginx container to map to the HostPort.
+	// Number of port to expose on the host.
 	// kubebuilder:validation:Minimum=1
 	// kubebuilder:validation:Maximum=65535
-	ContainerPort int32 `json:"containerPort"`
+	Port int32 `json:"port"`
 
-	// Number of port to expose on the host.
+	// ContainerPort is the port on the nginx container to map to the HostPort.
 	// kubebuilder:validation:Minimum=1
 	// kubebuilder:validation:Maximum=65535
-	HostPort int32 `json:"hostPort"`
+	ContainerPort int32 `json:"containerPort"`
 }

charts/nginx-gateway-fabric/values.schema.json

@@ -324,7 +324,7 @@
                     "required": [],
                     "type": "integer"
                   },
-                  "hostPort": {
+                  "port": {
                     "maximum": 65535,
                     "minimum": 1,
                     "required": [],

charts/nginx-gateway-fabric/values.yaml

@@ -406,21 +406,21 @@ nginx:
     # items:
     #   type: object
     #   properties:
-    #     containerPort:
+    #     port:
     #       type: integer
     #       required: true
     #       minimum: 1
     #       maximum: 65535
-    #     hostPort:
+    #     containerPort:
     #       type: integer
     #       required: true
     #       minimum: 1
     #       maximum: 65535
     # @schema
     # -- The hostPort configuration
     hostPorts: []
-    # - containerPort: 80
-    #   hostPort: 80
+    # - port: 80
+    #   containerPort: 80
 
     # -- The resource requirements of the NGINX container.
     # resources: {}

config/crd/bases/gateway.nginx.org_nginxproxies.yaml

@@ -341,17 +341,17 @@ spec:
                             description: |-
                               List of ports to expose on the host.
                             items:
-                              containerPort:
+                              port:
                                 description: |-
-                                  ContainerPort number of nginx
+                                  HostPort number to expose on the host
                                 type: integer
-                              hostPort:
+                              containerPort:
                                 description: |-
-                                  HostPort number to expose on the host
+                                  ContainerPort number of nginx
                                 type: integer
                               required:
+                              - port
                               - containerPort
-                              - hostPort
                             type: array
                           resources:
                             description: Resources describes the compute resource

deploy/crds.yaml

@@ -926,17 +926,17 @@ spec:
                             description: |-
                               List of ports to expose on the host.
                             items:
-                              containerPort:
+                              port:
                                 description: |-
-                                  ContainerPort of nginx
+                                  HostPort number to expose on the host
                                 type: integer
-                              hostPort:
+                              containerPort:
                                 description: |-
-                                  HostPort number to expose on the host
+                                  ContainerPort of nginx
                                 type: integer
                               required:
+                              - port
                               - containerPort
-                              - hostPort
                             type: array
                           resources:
                             description: Resources describes the compute resource

internal/controller/provisioner/objects.go

@@ -784,7 +784,7 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
 			for _, hostPort := range containerSpec.HostPorts {
 				for i, port := range container.Ports {
 					if hostPort.ContainerPort == port.ContainerPort {
-						container.Ports[i].HostPort = hostPort.HostPort
+						container.Ports[i].HostPort = hostPort.Port
 					}
 				}
 			}

internal/controller/provisioner/objects_test.go

@@ -298,7 +298,7 @@ func TestBuildNginxResourceObjects_NginxProxyConfig(t *testing.T) {
 							corev1.ResourceCPU: resource.Quantity{Format: "100m"},
 						},
 					},
-					HostPorts: []ngfAPIv1alpha2.HostPort{{ContainerPort: int32(8443), HostPort: int32(8443)}},
+					HostPorts: []ngfAPIv1alpha2.HostPort{{ContainerPort: int32(8443), Port: int32(8443)}},
 				},
 			},
 		},