Skip to content

Commit

Permalink
fix log (#2586)
Browse files Browse the repository at this point in the history 
* fix log

* lsp set should ignore non ovn lsp ip

---------

Co-authored-by: bobz965 <1220582684@qq.com>
  • Loading branch information
@bobz965
bobz965 and bobz965 committed Apr 3, 2023
1 parent da323a5 commit 9399c1e
Show file tree
Hide file tree
Showing 4 changed files with 116 additions and 79 deletions.
29 changes: 15 additions & 14 deletions pkg/controller/init.go
View file
Expand Up @@ -395,23 +395,24 @@ func (c *Controller) InitIPAM() error {
klog.Errorf("failed to create/update ips CR %s.%s with ip address %s: %v", podName, pod.Namespace, ip, err)
}
}

externalIDs := make(map[string]string, 3)
if _, ok := lspWithoutVendor[portName]; ok {
externalIDs["vendor"] = util.CniTypeName
externalIDs["pod"] = fmt.Sprintf("%s/%s", pod.Namespace, pod.Name)
}
if uuid := lspWithoutLS[portName]; uuid != "" {
for ls, ports := range lsPortsMap {
if _, ok := ports[uuid]; ok {
externalIDs[logicalSwitchKey] = ls
break
if podNet.ProviderName == util.OvnProvider || strings.HasSuffix(podNet.ProviderName, util.OvnProvider) {
externalIDs := make(map[string]string, 3)
if _, ok := lspWithoutVendor[portName]; ok {
externalIDs["vendor"] = util.CniTypeName
externalIDs["pod"] = fmt.Sprintf("%s/%s", pod.Namespace, pod.Name)
}
if uuid := lspWithoutLS[portName]; uuid != "" {
for ls, ports := range lsPortsMap {
if _, ok := ports[uuid]; ok {
externalIDs[logicalSwitchKey] = ls
break
}
}
}
}

if err = c.initAppendLspExternalIds(portName, externalIDs); err != nil {
klog.Errorf("failed to append external-ids for logical switch port %s: %v", portName, err)
if err = c.initAppendLspExternalIds(portName, externalIDs); err != nil {
klog.Errorf("failed to append external-ids for logical switch port %s: %v", portName, err)
}
}
}
}
Expand Down
21 changes: 11 additions & 10 deletions pkg/controller/switch_lb_rule.go
View file
Expand Up @@ -149,15 +149,15 @@ func (c *Controller) handleAddOrUpdateSwitchLBRule(key string) error {

svc := genHeadlessService(slr, oldSvc)
if needToCreate {
_, err = c.config.KubeClient.CoreV1().Services(slr.Spec.Namespace).Create(context.Background(), svc, metav1.CreateOptions{})
if err != nil {
klog.Errorf("failed to create service '%s', err: %v", svc, err)
if _, err = c.config.KubeClient.CoreV1().Services(slr.Spec.Namespace).Create(context.Background(), svc, metav1.CreateOptions{}); err != nil {
err := fmt.Errorf("failed to create service '%s', err: %v", svc, err)
klog.Error(err)
return err
}
} else {
_, err = c.config.KubeClient.CoreV1().Services(slr.Spec.Namespace).Update(context.Background(), svc, metav1.UpdateOptions{})
if err != nil {
klog.Errorf("failed to update service '%s', err: %v", svc, err)
if _, err = c.config.KubeClient.CoreV1().Services(slr.Spec.Namespace).Update(context.Background(), svc, metav1.UpdateOptions{}); err != nil {
err := fmt.Errorf("failed to update service '%s', err: %v", svc, err)
klog.Error(err)
return err
}
}
Expand All @@ -172,11 +172,12 @@ func (c *Controller) handleAddOrUpdateSwitchLBRule(key string) error {
}
formatPorts = fmt.Sprintf("%s,%d/%s", formatPorts, port.Port, protocol)
}
newSlr.Status.Ports = strings.TrimPrefix(formatPorts, ",")

_, err = c.config.KubeOvnClient.KubeovnV1().SwitchLBRules().UpdateStatus(context.Background(), newSlr, metav1.UpdateOptions{})
if err != nil {
klog.Errorf("update SwitchLBRule status failed, %v", err)
newSlr.Status.Ports = strings.TrimPrefix(formatPorts, ",")
if _, err = c.config.KubeOvnClient.KubeovnV1().SwitchLBRules().UpdateStatus(context.Background(), newSlr, metav1.UpdateOptions{}); err != nil {
err := fmt.Errorf("failed to update switch lb rule status, %v", err)
klog.Error(err)
return err
}

return nil
Expand Down
49 changes: 30 additions & 19 deletions pkg/controller/vpc_dns.go
View file
Expand Up @@ -139,7 +139,7 @@ func (c *Controller) handleAddOrUpdateVpcDns(key string) error {
if !enableCoredns {
time.Sleep(10 * time.Second)
if !enableCoredns {
return fmt.Errorf("failed to add/update vpc-dns, enable ='%v'", enableCoredns)
return fmt.Errorf("failed to add or update vpc-dns, not enabled")
}
}

Expand All @@ -158,73 +158,84 @@ func (c *Controller) handleAddOrUpdateVpcDns(key string) error {
newVpcDns.Status.Active = false
}

_, err = c.config.KubeOvnClient.KubeovnV1().VpcDnses().UpdateStatus(context.Background(),
newVpcDns, metav1.UpdateOptions{})
if err != nil {
klog.Errorf("update vpc-dns status failed, %v", err)
if _, err = c.config.KubeOvnClient.KubeovnV1().VpcDnses().UpdateStatus(context.Background(),
newVpcDns, metav1.UpdateOptions{}); err != nil {
err := fmt.Errorf("failed to update vpc dns status, %v", err)
klog.Error(err)
}
}()

if len(corednsImage) == 0 {
err := fmt.Errorf("failed to get the vpc-dns coredns image parameter")
klog.Errorf("failed to get corednsImage, err: %s", err)
err := fmt.Errorf("vpc-dns coredns image should be set")
klog.Error(err)
return err
}

if len(corednsVip) == 0 {
err := fmt.Errorf("the configuration parameter corednsVip is empty")
klog.Errorf("failed to get corednsVip, err: %s", err)
err := fmt.Errorf("vpc-dns corednsVip should be set")
klog.Error(err)
return err
}

if _, err := c.vpcsLister.Get(vpcDns.Spec.Vpc); err != nil {
klog.Errorf("failed to get vpc '%s', err: %v", vpcDns.Spec.Vpc, err)
err := fmt.Errorf("failed to get vpc '%s', err: %v", vpcDns.Spec.Vpc, err)
klog.Error(err)
return err
}

if _, err := c.subnetsLister.Get(vpcDns.Spec.Subnet); err != nil {
klog.Errorf("failed to get subnet '%s', err: %v", vpcDns.Spec.Subnet, err)
err := fmt.Errorf("failed to get subnet '%s', err: %v", vpcDns.Spec.Subnet, err)
klog.Error(err)
return err
}

if err := c.checkOvnNad(); err != nil {
klog.Errorf("failed to check nad, %v", err)
err := fmt.Errorf("failed to check nad, %v", err)
klog.Error(err)
return err
}

if err := c.checkOvnProvided(); err != nil {
klog.Errorf("failed to check %s provided, %v", util.DefaultSubnet, err)
if err := c.checkOvnDefaultSpecProvider(); err != nil {
err := fmt.Errorf("failed to check %s spec provider, %v", util.DefaultSubnet, err)
klog.Error(err)
return err
}

if err := c.checkVpcDnsDuplicated(vpcDns); err != nil {
klog.Errorf("failed to deploy %s, %v", vpcDns.Name, err)
err = fmt.Errorf("failed to deploy %s, %v", vpcDns.Name, err)
klog.Error(err)
return err
}

if err := c.createOrUpdateVpcDnsDep(vpcDns); err != nil {
err = fmt.Errorf("failed to create or update vpc dns %s, %v", vpcDns.Name, err)
klog.Error(err)
return err
}

if err := c.createOrUpdateVpcDnsSlr(vpcDns); err != nil {
err = fmt.Errorf("failed to create or update slr for vpc dns %s, %v", vpcDns.Name, err)
klog.Error(err)
return err
}

return nil
return err
}

func (c *Controller) handleDelVpcDns(key string) error {
klog.V(3).Infof("handleDelVpcDns,%s", key)
name := genVpcDnsDpName(key)
err := c.config.KubeClient.AppsV1().Deployments(c.config.PodNamespace).Delete(context.Background(), name, metav1.DeleteOptions{})
if err != nil && !k8serrors.IsNotFound(err) {
klog.Errorf("failed to delete Deployments: %v", err)
err := fmt.Errorf("failed to delete vpc dns deployment: %v", err)
klog.Error(err)
return err
}

err = c.config.KubeOvnClient.KubeovnV1().SwitchLBRules().Delete(context.Background(), name, metav1.DeleteOptions{})
if err != nil && !k8serrors.IsNotFound(err) {
klog.Errorf("failed to delete SwitchLBRule: %v", err)
err := fmt.Errorf("failed to delete switch lb rule: %v", err)
klog.Error(err)
return err
}
return nil
Expand Down Expand Up @@ -482,7 +493,7 @@ func (c *Controller) checkOvnNad() error {
return nil
}

func (c *Controller) checkOvnProvided() error {
func (c *Controller) checkOvnDefaultSpecProvider() error {
cachedSubnet, err := c.subnetsLister.Get(util.DefaultSubnet)
if err != nil {
return fmt.Errorf("failed to get default subnet %v", err)
Expand Down

0 comments on commit 9399c1e

Please sign in to comment.