[ignore] patch test

[Dan Williams]

Hi all,

Ignore this message, it's just a test of how well patches survive
formatting in Google Groups, for another project.

Dan

---

diff --git a/go-controller/pkg/ovn/gateway_init.go b/go-controller/pkg/ovn/gateway_init.go
index 6a373b4fb9af4..426860204b8ed 100644
--- a/go-controller/pkg/ovn/gateway_init.go
+++ b/go-controller/pkg/ovn/gateway_init.go
@@ -4,11 +4,13 @@ import (
"fmt"
"net"
"strings"
+ "time"

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"

kapi "k8s.io/api/core/v1"
+ "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog"
utilnet "k8s.io/utils/net"
)
@@ -421,8 +423,13 @@ func addDistributedGWPort() error {
return nil
}

- datapath, stderr, err := util.RunOVNSbctl("--data=bare", "--no-heading", "--columns=_uuid", "find", "datapath",
- "external_ids:name="+ovnClusterRouter)
+ // Wait a bit for northd to create the cluster router's datapath in southbound
+ var datapath string
+ err = wait.PollImmediate(500*time.Millisecond, 30*time.Second, func() (bool, error) {
+ datapath, stderr, err = util.RunOVNSbctl("--data=bare", "--no-heading", "--columns=_uuid", "find", "datapath",
+ "external_ids:name="+ovnClusterRouter)
+ return datapath != "", err
+ })
if err != nil {
return fmt.Errorf("failed to get the datapatah UUID of %s from OVN SB "+
"stdout: %q, stderr: %q, error: %v", ovnClusterRouter, datapath, stderr, err)