diff --git a/api/v1alpha1/backend_types.go b/api/v1alpha1/backend_types.go index a45806e462f..caa4ab88b12 100644 --- a/api/v1alpha1/backend_types.go +++ b/api/v1alpha1/backend_types.go @@ -14,13 +14,13 @@ const ( KindBackend = "Backend" ) -type AddressProtocolType string +type ProtocolType string const ( - // AddressProtocolTypeTCP defines the TCP address protocol. - AddressProtocolTypeTCP AddressProtocolType = "TCP" - // AddressProtocolTypeUDP defines the UDP address protocol. - AddressProtocolTypeUDP AddressProtocolType = "UDP" + // ProtocolTypeTCP defines the TCP address protocol. + ProtocolTypeTCP ProtocolType = "TCP" + // ProtocolTypeUDP defines the UDP address protocol. + ProtocolTypeUDP ProtocolType = "UDP" ) type ApplicationProtocolType string @@ -81,7 +81,7 @@ type SocketAddress struct { Port int32 `json:"port"` // +kubebuilder:validation:Enum=TCP;UDP - Protocol *AddressProtocolType `json:"protocol,omitempty"` + Protocol *ProtocolType `json:"protocol,omitempty"` } // UnixDomainSocketAddress describes TCP/UDP unix domain socket address, corresponding to Envoy's Pipe diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 0c3a4d6ebac..e5dacb940a1 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -4057,7 +4057,7 @@ func (in *SocketAddress) DeepCopyInto(out *SocketAddress) { *out = *in if in.Protocol != nil { in, out := &in.Protocol, &out.Protocol - *out = new(AddressProtocolType) + *out = new(ProtocolType) **out = **in } } diff --git a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backends.yaml b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backends.yaml index 361a80f3d6c..6288193e287 100644 --- a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backends.yaml +++ b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backends.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 name: backends.gateway.envoyproxy.io spec: group: gateway.envoyproxy.io diff --git a/site/content/en/latest/api/extension_types.md b/site/content/en/latest/api/extension_types.md index d3b02f14034..182ba55f6c3 100644 --- a/site/content/en/latest/api/extension_types.md +++ b/site/content/en/latest/api/extension_types.md @@ -172,21 +172,6 @@ _Appears in:_ | `TCP` | ActiveHealthCheckerTypeTCP defines the TCP type of health checking.
| -#### AddressProtocolType - -_Underlying type:_ _string_ - - - -_Appears in:_ -- [SocketAddress](#socketaddress) - -| Value | Description | -| ----- | ----------- | -| `TCP` | AddressProtocolTypeTCP defines the TCP address protocol.
| -| `UDP` | AddressProtocolTypeUDP defines the UDP address protocol.
| - - #### ApplicationProtocolType _Underlying type:_ _string_ @@ -2330,6 +2315,21 @@ _Appears in:_ | `body` | _[ExtProcBodyProcessingMode](#extprocbodyprocessingmode)_ | false | Defines body processing mode | +#### ProtocolType + +_Underlying type:_ _string_ + + + +_Appears in:_ +- [SocketAddress](#socketaddress) + +| Value | Description | +| ----- | ----------- | +| `TCP` | ProtocolTypeTCP defines the TCP address protocol.
| +| `UDP` | ProtocolTypeUDP defines the UDP address protocol.
| + + #### ProviderType _Underlying type:_ _string_ @@ -3076,7 +3076,7 @@ _Appears in:_ | --- | --- | --- | --- | | `address` | _string_ | true | Address refers to the FQDN or IP address of the backend service. | | `port` | _integer_ | true | Address refers to the FQDN or IP address of the backend service. | -| `protocol` | _[AddressProtocolType](#addressprotocoltype)_ | true | | +| `protocol` | _[ProtocolType](#protocoltype)_ | true | |