Revert "Field status.hostIPs added for Pod (#101566)"

This reverts commit 61b3c028ba618a939559c39befb546ae5e5fd0b9.

Kubernetes-commit: 1108bed7631f545d43530aa697175d243b99610b

core/v1/types.go

@@ -3605,15 +3605,11 @@ type PodDNSConfigOption struct {
 	Value *string `json:"value,omitempty" protobuf:"bytes,2,opt,name=value"`
 }
 
-// PodIP address information for entries in the (plural) PodIPs field.
+// IP address information for entries in the (plural) PodIPs field.
+// Each entry includes:
+//    IP: An IP address allocated to the pod. Routable at least within the cluster.
 type PodIP struct {
-	// IP is the IP address assigned to the pod
-	IP string `json:"ip,omitempty" protobuf:"bytes,1,opt,name=ip"`
-}
-
-// HostIP address information for entries in the (plural) HostIPs field.
-type HostIP struct {
-	// IP is the IP address assigned to the host
+	// ip is an IP address (IPv4 or IPv6) assigned to the pod
 	IP string `json:"ip,omitempty" protobuf:"bytes,1,opt,name=ip"`
 }
 
@@ -3834,24 +3830,10 @@ type PodStatus struct {
 	// +optional
 	NominatedNodeName string `json:"nominatedNodeName,omitempty" protobuf:"bytes,11,opt,name=nominatedNodeName"`
 
-	// hostIP holds the IP address of the host to which the pod is assigned.
-	// Empty if the pod has not started yet.
-	// A pod can be assigned to a node that has a problem in kubelet which in turns mean that HostIP will
-	// not be updated even if there is node is assigned to pod
+	// IP address of the host to which the pod is assigned. Empty if not yet scheduled.
 	// +optional
 	HostIP string `json:"hostIP,omitempty" protobuf:"bytes,5,opt,name=hostIP"`
-
-	// hostIPs holds the IP addresses allocated to the host. If this field is specified, the first entry must
-	// match the hostIP field. This list is empty if the pod has not started yet.
-	// A pod can be assigned to a node that has a problem in kubelet which in turns means that HostIPs will
-	// not be updated even if there is a node is assigned to this pod.
-	// +optional
-	// +patchStrategy=merge
-	// +patchMergeKey=ip
-	// +listType=set
-	HostIPs []HostIP `json:"hostIPs,omitempty" protobuf:"bytes,14,rep,name=hostIPs" patchStrategy:"merge" patchMergeKey:"ip"`
-
-	// podIP address allocated to the pod. Routable at least within the cluster.
+	// IP address allocated to the pod. Routable at least within the cluster.
 	// Empty if not yet allocated.
 	// +optional
 	PodIP string `json:"podIP,omitempty" protobuf:"bytes,6,opt,name=podIP"`

core/v1/types_swagger_doc_generated.go

@@ -825,15 +825,6 @@ func (HostAlias) SwaggerDoc() map[string]string {
 	return map_HostAlias
 }
 
-var map_HostIP = map[string]string{
-	"":   "HostIP address information for entries in the (plural) HostIPs field.",
-	"ip": "IP is the IP address assigned to the host",
-}
-
-func (HostIP) SwaggerDoc() map[string]string {
-	return map_HostIP
-}
-
 var map_HostPathVolumeSource = map[string]string{
 	"":     "Represents a host path mapped into a pod. Host path volumes do not support ownership management or SELinux relabeling.",
 	"path": "path of the directory on the host. If the path is a symlink, it will follow the link to the real path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath",
@@ -1543,8 +1534,8 @@ func (PodExecOptions) SwaggerDoc() map[string]string {
 }
 
 var map_PodIP = map[string]string{
-	"":   "PodIP address information for entries in the (plural) PodIPs field.",
-	"ip": "IP is the IP address assigned to the pod",
+	"":   "IP address information for entries in the (plural) PodIPs field. Each entry includes:\n   IP: An IP address allocated to the pod. Routable at least within the cluster.",
+	"ip": "ip is an IP address (IPv4 or IPv6) assigned to the pod",
 }
 
 func (PodIP) SwaggerDoc() map[string]string {
@@ -1692,9 +1683,8 @@ var map_PodStatus = map[string]string{
 	"message":                    "A human readable message indicating details about why the pod is in this condition.",
 	"reason":                     "A brief CamelCase message indicating details about why the pod is in this state. e.g. 'Evicted'",
 	"nominatedNodeName":          "nominatedNodeName is set only when this pod preempts other pods on the node, but it cannot be scheduled right away as preemption victims receive their graceful termination periods. This field does not guarantee that the pod will be scheduled on this node. Scheduler may decide to place the pod elsewhere if other nodes become available sooner. Scheduler may also decide to give the resources on this node to a higher priority pod that is created after preemption. As a result, this field may be different than PodSpec.nodeName when the pod is scheduled.",
-	"hostIP":                     "hostIP holds the IP address of the host to which the pod is assigned. Empty if the pod has not started yet. A pod can be assigned to a node that has a problem in kubelet which in turns mean that HostIP will not be updated even if there is node is assigned to pod",
-	"hostIPs":                    "hostIPs holds the IP addresses allocated to the host. If this field is specified, the first entry must match the hostIP field. This list is empty if the pod has not started yet. A pod can be assigned to a node that has a problem in kubelet which in turns means that HostIPs will not be updated even if there is a node is assigned to this pod.",
-	"podIP":                      "podIP address allocated to the pod. Routable at least within the cluster. Empty if not yet allocated.",
+	"hostIP":                     "IP address of the host to which the pod is assigned. Empty if not yet scheduled.",
+	"podIP":                      "IP address allocated to the pod. Routable at least within the cluster. Empty if not yet allocated.",
 	"podIPs":                     "podIPs holds the IP addresses allocated to the pod. If this field is specified, the 0th entry must match the podIP field. Pods may be allocated at most 1 value for each of IPv4 and IPv6. This list is empty if no IPs have been allocated yet.",
 	"startTime":                  "RFC 3339 date and time at which the object was acknowledged by the Kubelet. This is before the Kubelet pulled the container image(s) for the pod.",
 	"initContainerStatuses":      "The list has one entry per init container in the manifest. The most recent successful init container will have ready = true, the most recently started container will have startTime set. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#pod-and-container-status",

testdata/HEAD/core.v1.Pod.json

@@ -1582,11 +1582,6 @@
     "reason": "reasonValue",
     "nominatedNodeName": "nominatedNodeNameValue",
     "hostIP": "hostIPValue",
-    "hostIPs": [
-      {
-        "ip": "ipValue"
-      }
-    ],
     "podIP": "podIPValue",
     "podIPs": [
       {

testdata/HEAD/core.v1.Pod.yaml

@@ -1159,8 +1159,6 @@ status:
         message: messageValue
         reason: reasonValue
   hostIP: hostIPValue
-  hostIPs:
-  - ip: ipValue
   initContainerStatuses:
   - containerID: containerIDValue
     image: imageValue

testdata/HEAD/core.v1.PodStatusResult.json

@@ -60,11 +60,6 @@
     "reason": "reasonValue",
     "nominatedNodeName": "nominatedNodeNameValue",
     "hostIP": "hostIPValue",
-    "hostIPs": [
-      {
-        "ip": "ipValue"
-      }
-    ],
     "podIP": "podIPValue",
     "podIPs": [
       {

testdata/HEAD/core.v1.PodStatusResult.yaml

@@ -114,8 +114,6 @@ status:
         message: messageValue
         reason: reasonValue
   hostIP: hostIPValue
-  hostIPs:
-  - ip: ipValue
   initContainerStatuses:
   - containerID: containerIDValue
     image: imageValue