From 68cfaa401c69c7454b30f3060f8a91cdb94b0838 Mon Sep 17 00:00:00 2001 From: Rob Scott Date: Wed, 10 Mar 2021 17:21:46 -0800 Subject: [PATCH] Rolling back PR 100027 This PR was filed as a temporary workaround to reduce flakiness. Now that the root cause has been fixed by #100103 we can restore the full test. --- .../endpointslice/endpointslicemirroring_test.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/test/integration/endpointslice/endpointslicemirroring_test.go b/test/integration/endpointslice/endpointslicemirroring_test.go index e8536fa4f9c..fcee245cf25 100644 --- a/test/integration/endpointslice/endpointslicemirroring_test.go +++ b/test/integration/endpointslice/endpointslicemirroring_test.go @@ -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)