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

Jump to bottom

fix: init default vpc #4429

Merged
merged 4 commits into from
Aug 27, 2024
Merged

fix: init default vpc #4429

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f891132
fix: init default vpc
bobz965 Aug 22, 2024
3f9a854
fix: log
bobz965 Aug 22, 2024
789d4f3
Update pkg/controller/init.go
bobz965 Aug 23, 2024
0b906f8
fix after review
bobz965 Aug 23, 2024
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
58 changes: 32 additions & 26 deletions pkg/controller/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,31 +66,36 @@ func (c *Controller) InitOVN() error {

func (c *Controller) InitDefaultVpc() error {
cachedVpc, err := c.vpcsLister.Get(c.config.ClusterRouter)
if !k8serrors.IsNotFound(err) {
klog.Errorf("get default vpc %s failed: %v", c.config.DefaultLogicalSwitch, err)
return err
}

if k8serrors.IsNotFound(err) {
if err != nil {
if !k8serrors.IsNotFound(err) {
klog.Errorf("failed to get default vpc %q: %v", c.config.ClusterRouter, err)
return err
}
// create default vpc
vpc := &kubeovnv1.Vpc{
ObjectMeta: metav1.ObjectMeta{Name: c.config.ClusterRouter},
}
cachedVpc, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Create(context.Background(), vpc, metav1.CreateOptions{})
if err != nil {
klog.Errorf("init default vpc failed: %v", err)
klog.Errorf("failed to create default vpc %q: %v", c.config.ClusterRouter, err)
return err
}
}

// update default vpc status
vpc := cachedVpc.DeepCopy()
vpc.Status.DefaultLogicalSwitch = c.config.DefaultLogicalSwitch
vpc.Status.Router = c.config.ClusterRouter
vpc.Status.Standby = true
vpc.Status.Default = true

if _, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().UpdateStatus(context.Background(), vpc, metav1.UpdateOptions{}); err != nil {
klog.Errorf("init default vpc failed: %v", err)
return err
if !vpc.Status.Default || !vpc.Status.Standby ||
vpc.Status.Router != c.config.ClusterRouter ||
vpc.Status.DefaultLogicalSwitch != c.config.DefaultLogicalSwitch {
vpc.Status.Standby = true
vpc.Status.Default = true
vpc.Status.Router = c.config.ClusterRouter
vpc.Status.DefaultLogicalSwitch = c.config.DefaultLogicalSwitch

if _, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().UpdateStatus(context.Background(), vpc, metav1.UpdateOptions{}); err != nil {
klog.Errorf("failed to update default vpc %q: %v", c.config.ClusterRouter, err)
return err
}
}

return nil
Expand Down Expand Up @@ -147,8 +152,11 @@ func (c *Controller) initDefaultLogicalSwitch() error {
defaultSubnet.Spec.U2OInterconnection = c.config.DefaultU2OInterconnection
}

_, err = c.config.KubeOvnClient.KubeovnV1().Subnets().Create(context.Background(), &defaultSubnet, metav1.CreateOptions{})
return err
if _, err = c.config.KubeOvnClient.KubeovnV1().Subnets().Create(context.Background(), &defaultSubnet, metav1.CreateOptions{}); err != nil {
klog.Errorf("failed to create default subnet %q: %v", c.config.DefaultLogicalSwitch, err)
return err
}
return nil
}

// InitNodeSwitch init node switch to connect host and pod
Expand Down Expand Up @@ -189,9 +197,8 @@ func (c *Controller) initNodeSwitch() error {
},
}

_, err = c.config.KubeOvnClient.KubeovnV1().Subnets().Create(context.Background(), &nodeSubnet, metav1.CreateOptions{})
if err != nil {
klog.Errorf("failed to create subnet %s: %v", c.config.NodeSwitch, err)
if _, err = c.config.KubeOvnClient.KubeovnV1().Subnets().Create(context.Background(), &nodeSubnet, metav1.CreateOptions{}); err != nil {
klog.Errorf("failed to create node subnet %q: %v", c.config.NodeSwitch, err)
return err
}
return nil
Expand Down Expand Up @@ -276,8 +283,7 @@ func (c *Controller) initLoadBalancer() error {
klog.Error(err)
return err
}
_, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Patch(context.Background(), vpc.Name, types.MergePatchType, bytes, metav1.PatchOptions{}, "status")
if err != nil {
if _, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Patch(context.Background(), vpc.Name, types.MergePatchType, bytes, metav1.PatchOptions{}, "status"); err != nil {
klog.Error(err)
return err
}
Expand Down Expand Up @@ -686,7 +692,7 @@ func (c *Controller) syncVpcNatGatewayCR() error {
// get vpc nat gateway enable state
cm, err := c.configMapsLister.ConfigMaps(c.config.PodNamespace).Get(util.VpcNatGatewayConfig)
if err != nil && !k8serrors.IsNotFound(err) {
klog.Errorf("failed to get %s, %v", util.VpcNatGatewayConfig, err)
klog.Errorf("failed to get config map %s, %v", util.VpcNatGatewayConfig, err)
return err
}
if k8serrors.IsNotFound(err) || cm.Data["enable-vpc-nat-gw"] == "false" {
Expand All @@ -696,15 +702,15 @@ func (c *Controller) syncVpcNatGatewayCR() error {
cm, err = c.configMapsLister.ConfigMaps(c.config.PodNamespace).Get(util.VpcNatConfig)
if err != nil {
if k8serrors.IsNotFound(err) {
klog.Errorf("configMap of %s not set, %v", util.VpcNatConfig, err)
klog.Errorf("should set config map for vpc-nat-gateway %s, %v", util.VpcNatConfig, err)
return err
}
klog.Errorf("failed to get %s, %v", util.VpcNatConfig, err)
klog.Errorf("failed to get config map %s, %v", util.VpcNatConfig, err)
return err
}

if cm.Data["image"] == "" {
err = errors.New("image of vpc-nat-gateway not set")
err = errors.New("should set image for vpc-nat-gateway pod")
klog.Error(err)
return err
}
Expand Down
Loading