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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kube-ovn-controller: fix subnet update #2882

Merged
merged 1 commit into from
Jun 5, 2023
Merged

kube-ovn-controller: fix subnet update #2882

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/controller/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (c *Controller) initDefaultLogicalSwitch() error {
if util.CheckProtocol(c.config.DefaultCIDR) == kubeovnv1.ProtocolDual {
subnet := subnet.DeepCopy()
subnet.Spec.CIDRBlock = c.config.DefaultCIDR
if err := formatSubnet(subnet, c); err != nil {
if _, err = formatSubnet(subnet, c); err != nil {
klog.Errorf("init format subnet %s failed: %v", c.config.DefaultLogicalSwitch, err)
return err
}
Expand Down Expand Up @@ -158,7 +158,7 @@ func (c *Controller) initNodeSwitch() error {
// single-stack upgrade to dual-stack
subnet := subnet.DeepCopy()
subnet.Spec.CIDRBlock = c.config.NodeSwitchCIDR
if err := formatSubnet(subnet, c); err != nil {
if _, err = formatSubnet(subnet, c); err != nil {
klog.Errorf("init format subnet %s failed: %v", c.config.NodeSwitch, err)
return err
}
Expand Down
23 changes: 7 additions & 16 deletions pkg/controller/subnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,13 @@ func (c *Controller) processNextDeleteSubnetWorkItem() bool {
return true
}

func formatSubnet(subnet *kubeovnv1.Subnet, c *Controller) error {
func formatSubnet(subnet *kubeovnv1.Subnet, c *Controller) (*kubeovnv1.Subnet, error) {
var err error
changed := false

changed, err = checkSubnetChanged(subnet)
if err != nil {
return err
return nil, err
}
if subnet.Spec.Provider == "" {
subnet.Spec.Provider = util.OvnProvider
Expand Down Expand Up @@ -296,7 +296,7 @@ func formatSubnet(subnet *kubeovnv1.Subnet, c *Controller) error {
if _, err := c.vlansLister.Get(subnet.Spec.Vlan); err != nil {
err = fmt.Errorf("failed to get vlan %s: %s", subnet.Spec.Vlan, err)
klog.Error(err)
return err
return nil, err
}
}
}
Expand All @@ -313,13 +313,13 @@ func formatSubnet(subnet *kubeovnv1.Subnet, c *Controller) error {

klog.Infof("format subnet %v, changed %v", subnet.Name, changed)
if changed {
_, err = c.config.KubeOvnClient.KubeovnV1().Subnets().Update(context.Background(), subnet, metav1.UpdateOptions{})
subnet, err = c.config.KubeOvnClient.KubeovnV1().Subnets().Update(context.Background(), subnet, metav1.UpdateOptions{})
if err != nil {
klog.Errorf("failed to update subnet %s, %v", subnet.Name, err)
return err
return nil, err
}
}
return nil
return subnet.DeepCopy(), nil
}

func genNatOutgoingPolicyRulesStatus(subnet *kubeovnv1.Subnet) error {
Expand Down Expand Up @@ -642,17 +642,8 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
}
klog.V(4).Infof("handle add or update subnet %s", cachedSubnet.Name)

subnet := cachedSubnet.DeepCopy()
if err = formatSubnet(subnet, c); err != nil {
return err
}

subnet, err = c.subnetsLister.Get(key)
subnet, err := formatSubnet(cachedSubnet.DeepCopy(), c)
if err != nil {
if k8serrors.IsNotFound(err) {
return nil
}
klog.Errorf("failed to get subnet %s error %v", key, err)
return err
}

Expand Down