github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 61b3c028ba.
This commit is contained in:
Maciej Wyrzuc
2022-03-30 12:50:48 +00:00
parent e54ff8a7ff
commit 1108bed763
32 changed files with 1072 additions and 2068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/apis/core/v1/conversion.go
View File

@@ -270,17 +270,6 @@ func Convert_v1_PodStatus_To_core_PodStatus(in *v1.PodStatus, out *core.PodStatu
},
}
}
// If both fields (v1.HostIPs and v1.HostIP) are provided and differ, then HostIP is authoritative for compatibility with older kubelets
if (len(in.HostIP) > 0 && len(in.HostIPs) > 0) && (in.HostIP != in.HostIPs[0].IP) {
out.HostIPs = []core.HostIP{{IP: in.HostIP}}
}
// at the this point, autoConvert copied v1.HostIPs -> core.HostIPs
// if v1.HostIPs was empty but v1.HostIP is not, then set core.HostIPs[0] with v1.HostIP
if len(in.HostIP) > 0 && len(in.HostIPs) == 0 {
out.HostIPs = []core.HostIP{{IP: in.HostIP}}
}
return nil
}
@@ -294,11 +283,6 @@ func Convert_core_PodStatus_To_v1_PodStatus(in *core.PodStatus, out *v1.PodStatu
if len(in.PodIPs) > 0 {
out.PodIP = in.PodIPs[0].IP
}
// at the this point autoConvert copied core.HostIPs -> v1.HostIPs
if len(in.HostIPs) > 0 {
out.HostIP = in.HostIPs[0].IP
}
return nil
}