From 1156c03d61cace1fc2c46d30821078b868e8f2e2 Mon Sep 17 00:00:00 2001 From: bobz965 Date: Tue, 26 Sep 2023 11:12:00 +0800 Subject: [PATCH] lrp should use chassis name instead of uuid (#3258) Signed-off-by: bobz965 --- pkg/controller/external-gw.go | 2 +- pkg/ovs/ovn-sb-chassis.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/controller/external-gw.go b/pkg/controller/external-gw.go index 10e25310bf0..2fa71c7b086 100644 --- a/pkg/controller/external-gw.go +++ b/pkg/controller/external-gw.go @@ -262,7 +262,7 @@ func (c *Controller) getGatewayChassis(config map[string]string) ([]string, erro klog.Errorf("failed to get node %s chassis: %s, %v", node.Name, annoChassisName, err) return chassises, err } - chassises = append(chassises, chassis.UUID) + chassises = append(chassises, chassis.Name) } if len(chassises) == 0 { klog.Error("no available external gw") diff --git a/pkg/ovs/ovn-sb-chassis.go b/pkg/ovs/ovn-sb-chassis.go index 599f86a7ed2..dde299d4dd2 100644 --- a/pkg/ovs/ovn-sb-chassis.go +++ b/pkg/ovs/ovn-sb-chassis.go @@ -38,10 +38,10 @@ func (c *OVNSbClient) DeleteChassis(chassisName string) error { } ops, err := c.ovsDbClient.Where(chassis).Delete() if err != nil { - return fmt.Errorf("failed to generate delete operations for chassis %s: %v", chassis.UUID, err) + return fmt.Errorf("failed to generate delete chassis operations for node %s: %v", chassis.Hostname, err) } if err = c.Transact("chassis-del", ops); err != nil { - return fmt.Errorf("failed to delete chassis with with UUID %s: %v", chassis.UUID, err) + return fmt.Errorf("failed to delete chassis for node %s: %v", chassis.Hostname, err) } return nil }