From 41eabf134a0c9c98d4a56c74f800a297bca0cc3d Mon Sep 17 00:00:00 2001 From: Maksym Pavlenko Date: Tue, 17 Jan 2023 14:24:06 -0800 Subject: [PATCH] Backport #7685 to sbserver Signed-off-by: Maksym Pavlenko --- pkg/cri/sbserver/sandbox_run.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/cri/sbserver/sandbox_run.go b/pkg/cri/sbserver/sandbox_run.go index d94afe8a6..db848ecab 100644 --- a/pkg/cri/sbserver/sandbox_run.go +++ b/pkg/cri/sbserver/sandbox_run.go @@ -330,6 +330,8 @@ func (c *criService) setupPodNetwork(ctx context.Context, sandbox *sandboxstore. config = sandbox.Config path = sandbox.NetNSPath netPlugin = c.getNetworkPlugin(sandbox.RuntimeHandler) + err error + result *cni.Result ) if netPlugin == nil { return errors.New("cni config not initialized") @@ -341,7 +343,11 @@ func (c *criService) setupPodNetwork(ctx context.Context, sandbox *sandboxstore. } log.G(ctx).WithField("podsandboxid", id).Debugf("begin cni setup") netStart := time.Now() - result, err := netPlugin.Setup(ctx, id, path, opts...) + if c.config.CniConfig.NetworkPluginSetupSerially { + result, err = netPlugin.SetupSerially(ctx, id, path, opts...) + } else { + result, err = netPlugin.Setup(ctx, id, path, opts...) + } networkPluginOperations.WithValues(networkSetUpOp).Inc() networkPluginOperationsLatency.WithValues(networkSetUpOp).UpdateSince(netStart) if err != nil {