scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 19:28:16 +00:00
Code Issues 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

70
pkg/api/pod/util_test.go
View File

@@ -1768,73 +1768,3 @@ func TestDropOSField(t *testing.T) {
}
}
}
func TestDropDisabledStatusFields(t *testing.T) {
podWithHostIP := func() *api.PodStatus {
return &api.PodStatus{
HostIPs: makeHostIPs("10.0.0.1", "fd00:10::1"),
}
}
podWithoutHostIPs := func() *api.PodStatus {
return &api.PodStatus{
HostIPs: nil,
}
}
tests := []struct {
name string
podStatus *api.PodStatus
oldPodStatus *api.PodStatus
wantPodStatus *api.PodStatus
featureEnabled bool
}{
{
podStatus: podWithHostIP(),
oldPodStatus: podWithHostIP(),
featureEnabled: false,
wantPodStatus: podWithHostIP(),
},
{
podStatus: podWithoutHostIPs(),
oldPodStatus: podWithHostIP(),
featureEnabled: true,
wantPodStatus: podWithoutHostIPs(),
},
{
podStatus: podWithoutHostIPs(),
oldPodStatus: podWithoutHostIPs(),
featureEnabled: false,
wantPodStatus: podWithoutHostIPs(),
},
{
podStatus: podWithHostIP(),
oldPodStatus: podWithoutHostIPs(),
featureEnabled: true,
wantPodStatus: podWithHostIP(),
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.PodHostIPs, tt.featureEnabled)()
dropDisabledStatusFields(tt.podStatus, tt.oldPodStatus)
if !reflect.DeepEqual(tt.podStatus, tt.wantPodStatus) {
t.Errorf("dropDisabledStatusFields() = %v, want %v", tt.podStatus, tt.wantPodStatus)
}
})
}
}
func makeHostIPs(ips ...string) []api.HostIP {
ret := []api.HostIP{}
for _, ip := range ips {
ret = append(ret, api.HostIP{IP: ip})
}
return ret
}