From 04269b8e0664df4c6e011658786908e5e5e2d9c9 Mon Sep 17 00:00:00 2001 From: Julien Pinsonneau Date: Tue, 2 Jan 2024 11:29:23 +0100 Subject: [PATCH] fix merge --- api/v1beta1/flowcollector_webhook.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/v1beta1/flowcollector_webhook.go b/api/v1beta1/flowcollector_webhook.go index 99bb6bc75..a4581073c 100644 --- a/api/v1beta1/flowcollector_webhook.go +++ b/api/v1beta1/flowcollector_webhook.go @@ -284,7 +284,7 @@ func Convert_v1beta1_FlowCollectorFLP_To_v1beta2_FlowCollectorFLP(in *FlowCollec ConversationEndTimeout: helper.GetDebugDurationValue(debugPath, "conversationEndTimeout", in.ConversationEndTimeout), ConversationTerminatingTimeout: helper.GetDebugDurationValue(debugPath, "conversationTerminatingTimeout", in.ConversationTerminatingTimeout), } - return autoConvert_v1beta1_FlowCollectorFLP_To_v1beta2_FlowCollectorFLP(in, out, s) + return nil } // we have new defined fields in v1beta2 not in v1beta1