From bad86a35116db4584a6b310a2090012f6f05e916 Mon Sep 17 00:00:00 2001 From: bobz965 Date: Thu, 27 Jul 2023 12:22:01 +0000 Subject: [PATCH 1/3] fix repeate set chassis --- pkg/controller/init.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/controller/init.go b/pkg/controller/init.go index 828ea17dbed..51cb171513f 100644 --- a/pkg/controller/init.go +++ b/pkg/controller/init.go @@ -853,6 +853,14 @@ func (c *Controller) initNodeChassis() error { for _, node := range nodes { chassisName := node.Annotations[util.ChassisAnnotation] if chassisName != "" { + existChasisId, err := c.ovnLegacyClient.GetChassis(node.Name) + if err != nil { + klog.Errorf("failed to get chassis id: %v", err) + return err + } + if existChasisId == chassisName { + continue + } exist, err := c.ovnLegacyClient.ChassisExist(chassisName) if err != nil { klog.Errorf("failed to check chassis exist: %v", err) From 4ac9672a8e083f55ebde10951a19733075fc4be2 Mon Sep 17 00:00:00 2001 From: bobz965 Date: Thu, 27 Jul 2023 13:19:58 +0000 Subject: [PATCH 2/3] fail fast --- pkg/controller/controller.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index 10ecac28003..0ca9e9d2b83 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -782,6 +782,10 @@ func (c *Controller) Run(ctx context.Context) { util.LogFatalAndExit(err, "failed to initialize ovn resources") } + if err := c.initNodeChassis(); err != nil { + util.LogFatalAndExit(err, "failed to initialize node chassis") + } + // sync ip crd before initIPAM since ip crd will be used to restore vm and statefulset pod in initIPAM if err := c.initSyncCrdIPs(); err != nil { util.LogFatalAndExit(err, "failed to sync crd ips") @@ -791,10 +795,6 @@ func (c *Controller) Run(ctx context.Context) { util.LogFatalAndExit(err, "failed to initialize ipam") } - if err := c.initNodeChassis(); err != nil { - util.LogFatalAndExit(err, "failed to initialize node chassis") - } - if err := c.initNodeRoutes(); err != nil { util.LogFatalAndExit(err, "failed to initialize node routes") } From d8959f3027aa4b1567c64a8a40a7d884791a3bb1 Mon Sep 17 00:00:00 2001 From: bobz965 Date: Thu, 27 Jul 2023 13:28:14 +0000 Subject: [PATCH 3/3] fix go gmt --- pkg/speaker/subnet.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/speaker/subnet.go b/pkg/speaker/subnet.go index f0398c9fdaf..d37516d5048 100644 --- a/pkg/speaker/subnet.go +++ b/pkg/speaker/subnet.go @@ -96,8 +96,7 @@ func (c *Controller) syncSubnetRoutes() { } } - - klog.V(5).Infof("expected announce ipv4 routes %v\n,ipv6 route %v", bgpExpected[kubeovnv1.ProtocolIPv4], bgpExpected[kubeovnv1.ProtocolIPv6]) + klog.V(5).Infof("expected announce ipv4 routes: %v, ipv6 routes: %v", bgpExpected[kubeovnv1.ProtocolIPv4], bgpExpected[kubeovnv1.ProtocolIPv6]) fn := func(d *bgpapi.Destination) { for _, path := range d.Paths {