Add appProtocol to EndpointSlice.Port

Author: howardjohn

api/openapi-spec/swagger.json

@@ -130,6 +130,14 @@ type EndpointPort struct {
 	// If this is not specified, ports are not restricted and must be
 	// interpreted in the context of the specific consumer.
 	Port *int32
+	// The application protocol for this port.
+	// This field follows standard Kubernetes label syntax.
+	// Un-prefixed names are reserved for IANA standard service names (as per
+	// RFC-6335 and http://www.iana.org/assignments/service-names).
+	// Non-standard protocols should use prefixed names.
+	// Default is empty string.
+	// +optional
+	AppProtocol *string
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

pkg/apis/discovery/types.go

@@ -143,6 +143,12 @@ func validatePorts(endpointPorts []discovery.EndpointPort, fldPath *field.Path)
 		} else if !supportedPortProtocols.Has(string(*endpointPort.Protocol)) {
 			allErrs = append(allErrs, field.NotSupported(idxPath.Child("protocol"), *endpointPort.Protocol, supportedPortProtocols.List()))
 		}
+
+		if endpointPort.AppProtocol != nil {
+			for _, msg := range validation.IsQualifiedName(*endpointPort.AppProtocol) {
+				allErrs = append(allErrs, field.Invalid(idxPath.Child("appProtocol"), endpointPort.AppProtocol, msg))
+			}
+		}
 	}
 
 	return allErrs

pkg/apis/discovery/v1alpha1/zz_generated.conversion.go

@@ -88,6 +88,34 @@ func TestValidateEndpointSlice(t *testing.T) {
 				}},
 			},
 		},
+		"app-protocols": {
+			expectedErrors: 0,
+			endpointSlice: &discovery.EndpointSlice{
+				ObjectMeta:  standardMeta,
+				AddressType: addressTypePtr(discovery.AddressTypeIP),
+				Ports: []discovery.EndpointPort{{
+					Name:        utilpointer.StringPtr("one"),
+					Protocol:    protocolPtr(api.ProtocolTCP),
+					AppProtocol: utilpointer.StringPtr("HTTP"),
+				}, {
+					Name:        utilpointer.StringPtr("two"),
+					Protocol:    protocolPtr(api.ProtocolTCP),
+					AppProtocol: utilpointer.StringPtr("https"),
+				}, {
+					Name:        utilpointer.StringPtr("three"),
+					Protocol:    protocolPtr(api.ProtocolTCP),
+					AppProtocol: utilpointer.StringPtr("my-protocol"),
+				}, {
+					Name:        utilpointer.StringPtr("four"),
+					Protocol:    protocolPtr(api.ProtocolTCP),
+					AppProtocol: utilpointer.StringPtr("example.com/custom-protocol"),
+				}},
+				Endpoints: []discovery.Endpoint{{
+					Addresses: generateIPAddresses(1),
+					Hostname:  utilpointer.StringPtr("valid-123"),
+				}},
+			},
+		},
 		"empty-port-name": {
 			expectedErrors: 0,
 			endpointSlice: &discovery.EndpointSlice{
@@ -390,6 +418,22 @@ func TestValidateEndpointSlice(t *testing.T) {
 				}},
 			},
 		},
+		"bad-app-protocol": {
+			expectedErrors: 1,
+			endpointSlice: &discovery.EndpointSlice{
+				ObjectMeta:  standardMeta,
+				AddressType: addressTypePtr(discovery.AddressTypeIP),
+				Ports: []discovery.EndpointPort{{
+					Name:        utilpointer.StringPtr("http"),
+					Protocol:    protocolPtr(api.ProtocolTCP),
+					AppProtocol: utilpointer.StringPtr("--"),
+				}},
+				Endpoints: []discovery.Endpoint{{
+					Addresses: generateIPAddresses(1),
+					Hostname:  utilpointer.StringPtr("valid-123"),
+				}},
+			},
+		},
 		"empty-everything": {
 			expectedErrors: 3,
 			endpointSlice: &discovery.EndpointSlice{

pkg/apis/discovery/validation/validation.go

@@ -267,7 +267,7 @@ func TestSyncServiceFull(t *testing.T) {
 	slice := sliceList.Items[0]
 	assert.Len(t, slice.Endpoints, 2, "Expected 2 endpoints in first slice")
 	assert.Equal(t, slice.Annotations["endpoints.kubernetes.io/last-change-trigger-time"], serviceCreateTime.Format(time.RFC3339Nano))
-	assert.EqualValues(t, []discovery.EndpointPort{{
+	assert.ElementsMatch(t, []discovery.EndpointPort{{
 		Name:     strPtr("tcp-example"),
 		Protocol: protoPtr(v1.ProtocolTCP),
 		Port:     int32Ptr(int32(80)),

pkg/apis/discovery/validation/validation_test.go

@@ -135,6 +135,13 @@ type EndpointPort struct {
 	// If this is not specified, ports are not restricted and must be
 	// interpreted in the context of the specific consumer.
 	Port *int32 `json:"port,omitempty" protobuf:"bytes,3,opt,name=port"`
+	// The application protocol for this port.
+	// This field follows standard Kubernetes label syntax.
+	// Un-prefixed names are reserved for IANA standard service names (as per
+	// RFC-6335 and http://www.iana.org/assignments/service-names).
+	// Non-standard protocols should use prefixed names.
+	// Default is empty string.
+	AppProtocol *string `json:"appProtocol,omitempty" protobuf:"bytes,4,name=appProtocol"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object