Merge pull request #119876 from marosset/revert-118895

Revert "Merge pull request #118895 from RyanAoh/kep-1860" Kubernetes-commit: e6218f3d3bede036b2d67a4349dd761aac06ae97
kubernetes · Aug 10, 2023 · e32cee6 · e32cee6
2 parents b76dbf0 + b582191
commit e32cee6
Show file tree

Hide file tree

Showing 8 changed files with 576 additions and 660 deletions.
diff --git a/core/v1/generated.pb.go b/core/v1/generated.pb.go
diff --git a/core/v1/generated.proto b/core/v1/generated.proto
diff --git a/core/v1/types.go b/core/v1/types.go
@@ -4692,15 +4692,6 @@ type LoadBalancerIngress struct {
 	// +optional
 	Hostname string `json:"hostname,omitempty" protobuf:"bytes,2,opt,name=hostname"`
 
-	// 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.
-	// +optional
-	IPMode *LoadBalancerIPMode `json:"ipMode,omitempty" protobuf:"bytes,3,opt,name=ipMode"`
-
 	// Ports is a list of records of service ports
 	// If used, every port defined in the service should have an entry in it
 	// +listType=atomic
@@ -7063,15 +7054,3 @@ type PortStatus struct {
 	// +kubebuilder:validation:MaxLength=316
 	Error *string `json:"error,omitempty" protobuf:"bytes,3,opt,name=error"`
 }
-
-// LoadBalancerIPMode represents the mode of the LoadBalancer ingress IP
-type LoadBalancerIPMode string
-
-const (
-	// LoadBalancerIPModeVIP indicates that traffic is delivered to the node with
-	// the destination set to the load-balancer's IP and port.
-	LoadBalancerIPModeVIP LoadBalancerIPMode = "VIP"
-	// LoadBalancerIPModeProxy indicates that traffic is delivered to the node or pod with
-	// the destination set to the node's IP and port or the pod's IP and port.
-	LoadBalancerIPModeProxy LoadBalancerIPMode = "Proxy"
-)
diff --git a/core/v1/types_swagger_doc_generated.go b/core/v1/types_swagger_doc_generated.go
@@ -988,7 +988,6 @@ var map_LoadBalancerIngress = map[string]string{
 	"":         "LoadBalancerIngress represents the status of a load-balancer ingress point: traffic intended for the service should be sent to an ingress point.",
 	"ip":       "IP is set for load-balancer ingress points that are IP based (typically GCE or OpenStack load-balancers)",
 	"hostname": "Hostname is set for load-balancer ingress points that are DNS based (typically AWS load-balancers)",
-	"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.",
 	"ports":    "Ports is a list of records of service ports If used, every port defined in the service should have an entry in it",
 }
 

diff --git a/core/v1/zz_generated.deepcopy.go b/core/v1/zz_generated.deepcopy.go
diff --git a/testdata/HEAD/core.v1.Service.json b/testdata/HEAD/core.v1.Service.json
@@ -93,7 +93,6 @@
         {
           "ip": "ipValue",
           "hostname": "hostnameValue",
-          "ipMode": "ipModeValue",
           "ports": [
             {
               "port": 1,

diff --git a/testdata/HEAD/core.v1.Service.pb b/testdata/HEAD/core.v1.Service.pb
diff --git a/testdata/HEAD/core.v1.Service.yaml b/testdata/HEAD/core.v1.Service.yaml
@@ -77,7 +77,6 @@ status:
     ingress:
     - hostname: hostnameValue
       ip: ipValue
-      ipMode: ipModeValue
       ports:
       - error: errorValue
         port: 1