Skip to content

Commit e32cee6

Browse files
k8s-publishing-botk8s-publishing-bot
committed
Merge pull request #119876 from marosset/revert-118895
Revert "Merge pull request #118895 from RyanAoh/kep-1860" Kubernetes-commit: e6218f3d3bede036b2d67a4349dd761aac06ae97
2 parents b76dbf0 + b582191 commit e32cee6

8 files changed

Lines changed: 576 additions & 660 deletions

File tree

‎core/v1/generated.pb.go‎

Lines changed: 576 additions & 622 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/v1/generated.proto‎

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/v1/types.go‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4692,15 +4692,6 @@ type LoadBalancerIngress struct {
46924692
// +optional
46934693
Hostname string `json:"hostname,omitempty" protobuf:"bytes,2,opt,name=hostname"`
46944694

4695-
// IPMode specifies how the load-balancer IP behaves, and may only be specified when the ip field is specified.
4696-
// Setting this to "VIP" indicates that traffic is delivered to the node with
4697-
// the destination set to the load-balancer's IP and port.
4698-
// Setting this to "Proxy" indicates that traffic is delivered to the node or pod with
4699-
// the destination set to the node's IP and node port or the pod's IP and port.
4700-
// Service implementations may use this information to adjust traffic routing.
4701-
// +optional
4702-
IPMode *LoadBalancerIPMode `json:"ipMode,omitempty" protobuf:"bytes,3,opt,name=ipMode"`
4703-
47044695
// Ports is a list of records of service ports
47054696
// If used, every port defined in the service should have an entry in it
47064697
// +listType=atomic
@@ -7063,15 +7054,3 @@ type PortStatus struct {
70637054
// +kubebuilder:validation:MaxLength=316
70647055
Error *string `json:"error,omitempty" protobuf:"bytes,3,opt,name=error"`
70657056
}
7066-
7067-
// LoadBalancerIPMode represents the mode of the LoadBalancer ingress IP
7068-
type LoadBalancerIPMode string
7069-
7070-
const (
7071-
// LoadBalancerIPModeVIP indicates that traffic is delivered to the node with
7072-
// the destination set to the load-balancer's IP and port.
7073-
LoadBalancerIPModeVIP LoadBalancerIPMode = "VIP"
7074-
// LoadBalancerIPModeProxy indicates that traffic is delivered to the node or pod with
7075-
// the destination set to the node's IP and port or the pod's IP and port.
7076-
LoadBalancerIPModeProxy LoadBalancerIPMode = "Proxy"
7077-
)

‎core/v1/types_swagger_doc_generated.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,6 @@ var map_LoadBalancerIngress = map[string]string{
988988
"": "LoadBalancerIngress represents the status of a load-balancer ingress point: traffic intended for the service should be sent to an ingress point.",
989989
"ip": "IP is set for load-balancer ingress points that are IP based (typically GCE or OpenStack load-balancers)",
990990
"hostname": "Hostname is set for load-balancer ingress points that are DNS based (typically AWS load-balancers)",
991-
"ipMode": "IPMode specifies how the load-balancer IP behaves, and may only be specified when the ip field is specified. Setting this to \"VIP\" indicates that traffic is delivered to the node with the destination set to the load-balancer's IP and port. Setting this to \"Proxy\" indicates that traffic is delivered to the node or pod with the destination set to the node's IP and node port or the pod's IP and port. Service implementations may use this information to adjust traffic routing.",
992991
"ports": "Ports is a list of records of service ports If used, every port defined in the service should have an entry in it",
993992
}
994993

‎core/v1/zz_generated.deepcopy.go‎

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎testdata/HEAD/core.v1.Service.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
{
9494
"ip": "ipValue",
9595
"hostname": "hostnameValue",
96-
"ipMode": "ipModeValue",
9796
"ports": [
9897
{
9998
"port": 1,

‎testdata/HEAD/core.v1.Service.pb‎

-14 Bytes
Binary file not shown.

‎testdata/HEAD/core.v1.Service.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ status:
7777
ingress:
7878
- hostname: hostnameValue
7979
ip: ipValue
80-
ipMode: ipModeValue
8180
ports:
8281
- error: errorValue
8382
port: 1

0 commit comments

Comments
 (0)