Merge pull request #100027 from aojea/fixmirrorin

fix flake integration test endpoint slice mirroring updates
This commit is contained in:
Kubernetes Prow Robot 2021-03-09 17:39:41 -08:00 committed by GitHub
commit a43bd5e3da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -377,13 +377,13 @@ func TestEndpointSliceMirroringUpdates(t *testing.T) {
if !apiequality.Semantic.DeepEqual(epAddresses, sliceAddresses) {
t.Logf("Expected EndpointSlice to have the same IP addresses, expected %v got %v", epAddresses, sliceAddresses)
return false, nil
continue
}
// check labels were mirrored
if !isSubset(customEndpoints.Labels, endpointSlice.Labels) {
t.Logf("Expected EndpointSlice to mirror labels, expected %v to be in received %v", customEndpoints.Labels, endpointSlice.Labels)
return false, nil
continue
}
// check annotations but endpoints.kubernetes.io/last-change-trigger-time were mirrored
@ -396,10 +396,13 @@ func TestEndpointSliceMirroringUpdates(t *testing.T) {
}
if !apiequality.Semantic.DeepEqual(annotations, endpointSlice.Annotations) {
t.Logf("Expected EndpointSlice to mirror annotations, expected %v received %v", customEndpoints.Annotations, endpointSlice.Annotations)
return false, nil
continue
}
// This is a temporary workaround for https://github.com/kubernetes/kubernetes/issues/100033.
// TODO(robscott): When that issue is fixed, update this test to expect all EndpointSlices to meet this criteria.
return true, nil
}
return true, nil
return false, nil
})
if err != nil {
t.Fatalf("Timed out waiting for conditions: %v", err)