From 4bf6b92e371396ccffff17f9b9de1f71b1bd380d Mon Sep 17 00:00:00 2001 From: Ali Ok Date: Mon, 14 Sep 2020 16:06:13 +0300 Subject: [PATCH 1/3] Add retries for webhook fails at conformance tests --- .../broker_control_plane_test_helper.go | 24 +++++++++++++++++-- .../helpers/broker_data_plane_test_helper.go | 13 +++++++++- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/test/conformance/helpers/broker_control_plane_test_helper.go b/test/conformance/helpers/broker_control_plane_test_helper.go index 6c309fe6c78..22cc8447061 100644 --- a/test/conformance/helpers/broker_control_plane_test_helper.go +++ b/test/conformance/helpers/broker_control_plane_test_helper.go @@ -136,7 +136,17 @@ func triggerV1Beta1ReadyAfterBrokerIncludesSubURI(t *testing.T, triggerName, bro client.WaitForResourceReadyOrFail(triggerName, testlib.TriggerTypeMeta) - tr, err := client.Eventing.EventingV1beta1().Triggers(client.Namespace).Get(context.Background(), triggerName, metav1.GetOptions{}) + var tr *eventingv1beta1.Trigger + triggers := client.Eventing.EventingV1beta1().Triggers(client.Namespace) + err = client.RetryWebhookErrors(func(attempts int) (err error) { + var e error + client.T.Logf("Getting v1beta1 trigger %s", triggerName) + tr, e = triggers.Get(context.Background(), triggerName, metav1.GetOptions{}) + if e != nil { + client.T.Logf("Failed to get trigger %q: %v", triggerName, e) + } + return err + }) if err != nil { t.Fatalf("Error: Could not get trigger %s: %v", triggerName, err) } @@ -147,7 +157,17 @@ func triggerV1Beta1ReadyAfterBrokerIncludesSubURI(t *testing.T, triggerName, bro func triggerV1Beta1ReadyIncludesSubURI(t *testing.T, triggerName string, client *testlib.Client) { client.WaitForResourceReadyOrFail(triggerName, testlib.TriggerTypeMeta) - tr, err := client.Eventing.EventingV1beta1().Triggers(client.Namespace).Get(context.Background(), triggerName, metav1.GetOptions{}) + var tr *eventingv1beta1.Trigger + triggers := client.Eventing.EventingV1beta1().Triggers(client.Namespace) + err := client.RetryWebhookErrors(func(attempts int) (err error) { + var e error + client.T.Logf("Getting v1beta1 trigger %s", triggerName) + tr, e = triggers.Get(context.Background(), triggerName, metav1.GetOptions{}) + if e != nil { + client.T.Logf("Failed to get trigger %q: %v", triggerName, e) + } + return err + }) if err != nil { t.Fatalf("Error: Could not get trigger %s: %v", triggerName, err) } diff --git a/test/conformance/helpers/broker_data_plane_test_helper.go b/test/conformance/helpers/broker_data_plane_test_helper.go index 6dcc47142d7..d89932dc4cb 100644 --- a/test/conformance/helpers/broker_data_plane_test_helper.go +++ b/test/conformance/helpers/broker_data_plane_test_helper.go @@ -54,7 +54,18 @@ func BrokerDataPlaneSetupHelper(ctx context.Context, client *testlib.Client, bro ) client.WaitForResourceReadyOrFail(broker.Name, testlib.BrokerTypeMeta) } else { - if broker, err = client.Eventing.EventingV1beta1().Brokers(brokerNamespace).Get(ctx, brokerName, metav1.GetOptions{}); err != nil { + var broker *eventingv1beta1.Broker + brokers := client.Eventing.EventingV1beta1().Brokers(brokerNamespace) + err := client.RetryWebhookErrors(func(attempts int) (err error) { + var e error + client.T.Logf("Getting v1beta1 broker %s", brokerName) + broker, e = brokers.Get(context.Background(), brokerName, metav1.GetOptions{}) + if e != nil { + client.T.Logf("Failed to get broker %q: %v", brokerName, e) + } + return err + }) + if err != nil { client.T.Fatalf("Could not Get broker %s/%s: %v", brokerNamespace, brokerName, err) } } From f9f5e637cb736af0b2531b4b6572ef2b2e3c83e1 Mon Sep 17 00:00:00 2001 From: Ali Ok Date: Mon, 14 Sep 2020 16:20:16 +0300 Subject: [PATCH 2/3] Add retries for webhook fails at conformance tests --- test/conformance/helpers/broker_data_plane_test_helper.go | 1 - 1 file changed, 1 deletion(-) diff --git a/test/conformance/helpers/broker_data_plane_test_helper.go b/test/conformance/helpers/broker_data_plane_test_helper.go index d89932dc4cb..b4700973c44 100644 --- a/test/conformance/helpers/broker_data_plane_test_helper.go +++ b/test/conformance/helpers/broker_data_plane_test_helper.go @@ -40,7 +40,6 @@ var podMeta = metav1.TypeMeta{ func BrokerDataPlaneSetupHelper(ctx context.Context, client *testlib.Client, brokerClass string, brokerTestRunner testlib.ComponentsTestRunner) *eventingv1beta1.Broker { var broker *eventingv1beta1.Broker - var err error brokerName := brokerTestRunner.ComponentName brokerNamespace := brokerTestRunner.ComponentNamespace if brokerName == "" || brokerNamespace == "" { From 2a0178752f717a146bdd9d2b9f77f6c065d5bad3 Mon Sep 17 00:00:00 2001 From: Ali Ok Date: Mon, 14 Sep 2020 16:56:45 +0300 Subject: [PATCH 3/3] Add retries for webhook fails at conformance tests --- test/conformance/helpers/broker_data_plane_test_helper.go | 1 - 1 file changed, 1 deletion(-) diff --git a/test/conformance/helpers/broker_data_plane_test_helper.go b/test/conformance/helpers/broker_data_plane_test_helper.go index b4700973c44..9facba44571 100644 --- a/test/conformance/helpers/broker_data_plane_test_helper.go +++ b/test/conformance/helpers/broker_data_plane_test_helper.go @@ -53,7 +53,6 @@ func BrokerDataPlaneSetupHelper(ctx context.Context, client *testlib.Client, bro ) client.WaitForResourceReadyOrFail(broker.Name, testlib.BrokerTypeMeta) } else { - var broker *eventingv1beta1.Broker brokers := client.Eventing.EventingV1beta1().Brokers(brokerNamespace) err := client.RetryWebhookErrors(func(attempts int) (err error) { var e error