github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix unready endpoints bug introduced in #50934

Browse Source 
A pod status change of unready -> ready results in a move from
the endpoint's unready endpoint addresses to its ready addresses
so if a pod update contains an unready -> ready status change,
the endpoint needs to be updated.
This commit is contained in:
Joel Smith
2017-08-22 13:19:26 -06:00
parent e225666813
commit d6aa7fb716
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/controller/endpoint/endpoints_controller_test.go
View File

@@ -992,7 +992,7 @@ func TestPodToEndpointAddress(t *testing.T) {
}
}
func TestPodAddressChanged(t *testing.T) {
func TestPodChanged(t *testing.T) {
podStore := cache.NewStore(cache.DeletionHandlingMetaNamespaceKeyFunc)
ns := "test"
addPods(podStore, ns, 1, 1, 0)
@@ -1004,33 +1004,40 @@ func TestPodAddressChanged(t *testing.T) {
oldPod := pods[0].(*v1.Pod)
newPod := oldPod.DeepCopy()
if podAddressChanged(oldPod, newPod) {
t.Errorf("Expected address to be unchanged for copied pod")
if podChanged(oldPod, newPod) {
t.Errorf("Expected pod to be unchanged for copied pod")
}
newPod.Spec.NodeName = "changed"
if !podAddressChanged(oldPod, newPod) {
t.Errorf("Expected address to be changed for pod with NodeName changed")
if !podChanged(oldPod, newPod) {
t.Errorf("Expected pod to be changed for pod with NodeName changed")
}
newPod.Spec.NodeName = oldPod.Spec.NodeName
newPod.ObjectMeta.ResourceVersion = "changed"
if podAddressChanged(oldPod, newPod) {
t.Errorf("Expected address to be unchanged for pod with only ResourceVersion changed")
if podChanged(oldPod, newPod) {
t.Errorf("Expected pod to be unchanged for pod with only ResourceVersion changed")
}
newPod.ObjectMeta.ResourceVersion = oldPod.ObjectMeta.ResourceVersion
newPod.Status.PodIP = "1.2.3.1"
if !podAddressChanged(oldPod, newPod) {
t.Errorf("Expected address to be changed with pod IP address change")
if !podChanged(oldPod, newPod) {
t.Errorf("Expected pod to be changed with pod IP address change")
}
newPod.Status.PodIP = oldPod.Status.PodIP
newPod.ObjectMeta.Name = "wrong-name"
if !podAddressChanged(oldPod, newPod) {
t.Errorf("Expected address to be changed with pod name change")
if !podChanged(oldPod, newPod) {
t.Errorf("Expected pod to be changed with pod name change")
}
newPod.ObjectMeta.Name = oldPod.ObjectMeta.Name
saveConditions := oldPod.Status.Conditions
oldPod.Status.Conditions = nil
if !podChanged(oldPod, newPod) {
t.Errorf("Expected pod to be changed with pod readiness change")
}
oldPod.Status.Conditions = saveConditions
}
func TestDetermineNeededServiceUpdates(t *testing.T) {