github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

trigger endpoint update on pod deletion

Browse Source
This commit is contained in:
Minhan Xia 2017-10-30 17:28:54 -07:00
parent d7567cd6c7
commit 5f4145f3de
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/endpoint/endpoints_controller.go
View File

@ -215,6 +215,10 @@ func podToEndpointAddress(pod *v1.Pod) *v1.EndpointAddress {
} }
func podChanged(oldPod, newPod *v1.Pod) bool { func podChanged(oldPod, newPod *v1.Pod) bool {
// If the pod's deletion timestamp is set, remove endpoint from ready address.
if newPod.DeletionTimestamp != oldPod.DeletionTimestamp {
return true
}
// If the pod's readiness has changed, the associated endpoint address // If the pod's readiness has changed, the associated endpoint address
// will move from the unready endpoints set to the ready endpoints. // will move from the unready endpoints set to the ready endpoints.
// So for the purposes of an endpoint, a readiness change on a pod // So for the purposes of an endpoint, a readiness change on a pod

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

@ -1039,6 +1039,13 @@ func TestPodChanged(t *testing.T) {
t.Errorf("Expected pod to be changed with pod readiness change") t.Errorf("Expected pod to be changed with pod readiness change")
} }
oldPod.Status.Conditions = saveConditions oldPod.Status.Conditions = saveConditions
now := metav1.NewTime(time.Now().UTC())
newPod.ObjectMeta.DeletionTimestamp = &now
if !podChanged(oldPod, newPod) {
t.Errorf("Expected pod to be changed with DeletionTimestamp change")
}
newPod.ObjectMeta.DeletionTimestamp = oldPod.ObjectMeta.DeletionTimestamp.DeepCopy()
} }
func TestDetermineNeededServiceUpdates(t *testing.T) { func TestDetermineNeededServiceUpdates(t *testing.T) {