Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lrp should use chassis name instead of uuid #3258

Merged
merged 1 commit into from
Sep 26, 2023
Merged

lrp should use chassis name instead of uuid #3258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/controller/external-gw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions pkg/ovs/ovn-sb-chassis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down