Merge pull request #100107 from robscott/rollback-100027

Rolling back PR 100027
This commit is contained in:
Kubernetes Prow Robot 2021-03-11 17:28:41 -08:00 committed by GitHub
commit 5ae856c36f
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)
continue
return false, nil
}
// 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)
continue
return false, nil
}
// check annotations but endpoints.kubernetes.io/last-change-trigger-time were mirrored
@ -396,13 +396,10 @@ 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)
continue
return false, nil
}
// 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 false, nil
return true, nil
})
if err != nil {
t.Fatalf("Timed out waiting for conditions: %v", err)