diff --git a/pkg/controller/endpoint.go b/pkg/controller/endpoint.go index 31e10b5d5e8..cb2270e19ed 100644 --- a/pkg/controller/endpoint.go +++ b/pkg/controller/endpoint.go @@ -98,6 +98,7 @@ func (c *Controller) handleUpdateEndpoint(key string) error { if errors.IsNotFound(err) { return nil } + klog.Error(err) return err } @@ -106,6 +107,7 @@ func (c *Controller) handleUpdateEndpoint(key string) error { if errors.IsNotFound(err) { return nil } + klog.Error(err) return err } svc := cachedService.DeepCopy() diff --git a/pkg/controller/external-gw.go b/pkg/controller/external-gw.go index 932c869272c..554c7a93ac6 100644 --- a/pkg/controller/external-gw.go +++ b/pkg/controller/external-gw.go @@ -150,6 +150,7 @@ func (c *Controller) establishExternalGateway(config map[string]string) error { lrpName := fmt.Sprintf("%s-%s", c.config.ClusterRouter, c.config.ExternalGatewaySwitch) exist, err := c.ovnClient.LogicalRouterPortExists(lrpName) if err != nil { + klog.Error(err) return err } if exist { diff --git a/pkg/controller/gc.go b/pkg/controller/gc.go index a26ee18b364..db343e83735 100644 --- a/pkg/controller/gc.go +++ b/pkg/controller/gc.go @@ -38,6 +38,7 @@ func (c *Controller) gc() error { } for _, gcFunc := range gcFunctions { if err := gcFunc(); err != nil { + klog.Error(err) return err } } @@ -270,6 +271,7 @@ func (c *Controller) gcVip() error { } return nil } + klog.Error(err) return err } } @@ -394,6 +396,7 @@ func (c *Controller) gcLoadBalancer() error { // remove lb from logical switch vpcs, err := c.vpcsLister.List(labels.Everything()) if err != nil { + klog.Error(err) return err } for _, cachedVpc := range vpcs { @@ -404,6 +407,7 @@ func (c *Controller) gcLoadBalancer() error { if k8serrors.IsNotFound(err) { continue } + klog.Error(err) return err } if !isOvnSubnet(subnet) { @@ -419,6 +423,7 @@ func (c *Controller) gcLoadBalancer() error { vpc.Status.SctpLoadBalancer, vpc.Status.SctpSessionLoadBalancer) if err != nil { + klog.Error(err) return err } } @@ -431,10 +436,12 @@ func (c *Controller) gcLoadBalancer() error { vpc.Status.SctpSessionLoadBalancer = "" bytes, err := vpc.Status.Bytes() if err != nil { + 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 { + klog.Error(err) return err } } @@ -528,21 +535,27 @@ func (c *Controller) gcLoadBalancer() error { } if err = removeVIP(tcpLb, tcpVips); err != nil { + klog.Error(err) return err } if err = removeVIP(tcpSessLb, tcpSessionVips); err != nil { + klog.Error(err) return err } if err = removeVIP(udpLb, udpVips); err != nil { + klog.Error(err) return err } if err = removeVIP(udpSessLb, udpSessionVips); err != nil { + klog.Error(err) return err } if err = removeVIP(sctpLb, sctpVips); err != nil { + klog.Error(err) return err } if err = removeVIP(sctpSessLb, sctpSessionVips); err != nil { + klog.Error(err) return err } } @@ -561,6 +574,7 @@ func (c *Controller) gcLoadBalancer() error { } klog.Infof("start to destroy load balancer %s", lb) if err := c.ovnLegacyClient.DeleteLoadBalancer(lb); err != nil { + klog.Error(err) return err } } diff --git a/pkg/controller/init.go b/pkg/controller/init.go index 05de0fd1c2c..e55b7f035c5 100644 --- a/pkg/controller/init.go +++ b/pkg/controller/init.go @@ -77,6 +77,7 @@ func (c *Controller) InitDefaultVpc() error { bytes, err := vpc.Status.Bytes() if err != nil { + klog.Error(err) return err } _, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Patch(context.Background(), vpc.Name, types.MergePatchType, bytes, metav1.PatchOptions{}, "status") @@ -137,8 +138,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.Error(err) + return err + } + return nil } // InitNodeSwitch init node switch to connect host and pod @@ -179,8 +183,7 @@ func (c *Controller) initNodeSwitch() error { }, } - _, err = c.config.KubeOvnClient.KubeovnV1().Subnets().Create(context.Background(), &nodeSubnet, metav1.CreateOptions{}) - if err != nil { + if _, err = c.config.KubeOvnClient.KubeovnV1().Subnets().Create(context.Background(), &nodeSubnet, metav1.CreateOptions{}); err != nil { klog.Errorf("failed to create subnet %s: %v", c.config.NodeSwitch, err) return err } @@ -191,6 +194,7 @@ func (c *Controller) initNodeSwitch() error { func (c *Controller) initClusterRouter() error { lrs, err := c.ovnLegacyClient.ListLogicalRouter(c.config.EnableExternalVpc) if err != nil { + klog.Error(err) return err } klog.Infof("exists routers: %v", lrs) @@ -237,21 +241,27 @@ func (c *Controller) initLoadBalancer() error { vpc := cachedVpc.DeepCopy() vpcLb := c.GenVpcLoadBalancer(vpc.Name) if err = c.initLB(vpcLb.TcpLoadBalancer, string(v1.ProtocolTCP), false); err != nil { + klog.Error(err) return err } if err = c.initLB(vpcLb.TcpSessLoadBalancer, string(v1.ProtocolTCP), true); err != nil { + klog.Error(err) return err } if err = c.initLB(vpcLb.UdpLoadBalancer, string(v1.ProtocolUDP), false); err != nil { + klog.Error(err) return err } if err = c.initLB(vpcLb.UdpSessLoadBalancer, string(v1.ProtocolUDP), true); err != nil { + klog.Error(err) return err } if err = c.initLB(vpcLb.SctpLoadBalancer, string(v1.ProtocolSCTP), false); err != nil { + klog.Error(err) return err } if err = c.initLB(vpcLb.SctpSessLoadBalancer, string(v1.ProtocolSCTP), true); err != nil { + klog.Error(err) return err } @@ -263,10 +273,12 @@ func (c *Controller) initLoadBalancer() error { vpc.Status.SctpSessionLoadBalancer = vpcLb.SctpSessLoadBalancer bytes, err := vpc.Status.Bytes() if err != nil { + 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 { + klog.Error(err) return err } } @@ -525,6 +537,7 @@ func (c *Controller) initDefaultVlan() error { } if err := c.initDefaultProviderNetwork(); err != nil { + klog.Error(err) return err } @@ -565,6 +578,7 @@ func (c *Controller) initSyncCrdIPs() error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } @@ -610,6 +624,7 @@ func (c *Controller) initSyncCrdSubnets() error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } for _, orisubnet := range subnets { @@ -663,6 +678,7 @@ func (c *Controller) initSyncCrdVlans() error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } @@ -695,6 +711,7 @@ func (c *Controller) migrateNodeRoute(af int, node, ip, nexthop string) error { match := fmt.Sprintf("ip%d.dst == %s", af, ip) consistent, err := c.ovnLegacyClient.CheckPolicyRouteNexthopConsistent(c.config.ClusterRouter, match, nexthop, util.NodeRouterPolicyPriority) if err != nil { + klog.Error(err) return err } if consistent { diff --git a/pkg/controller/inspection.go b/pkg/controller/inspection.go index 4cb78200cf8..bbb27c35284 100644 --- a/pkg/controller/inspection.go +++ b/pkg/controller/inspection.go @@ -57,6 +57,7 @@ func (c *Controller) inspectPod() error { delete(pod.Annotations, fmt.Sprintf(util.RoutedAnnotationTemplate, podNet.ProviderName)) patch, err := util.GenerateStrategicMergePatchPayload(oriPod, pod) if err != nil { + klog.Error(err) return err } if _, err := c.config.KubeClient.CoreV1().Pods(pod.Namespace).Patch(context.Background(), pod.Name, diff --git a/pkg/controller/ip.go b/pkg/controller/ip.go index e634915c76d..3366daf2d88 100644 --- a/pkg/controller/ip.go +++ b/pkg/controller/ip.go @@ -189,6 +189,7 @@ func (c *Controller) handleAddIP(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } klog.V(3).Infof("handle add ip %s", cachedIP.Name) diff --git a/pkg/controller/namespace.go b/pkg/controller/namespace.go index 9183c564101..ea64d100889 100644 --- a/pkg/controller/namespace.go +++ b/pkg/controller/namespace.go @@ -112,6 +112,7 @@ func (c *Controller) handleAddNamespace(key string) error { if errors.IsNotFound(err) { return nil } + klog.Error(err) return err } namespace := cachedNs.DeepCopy() @@ -184,11 +185,13 @@ func (c *Controller) handleAddNamespace(key string) error { patch, err := util.GenerateStrategicMergePatchPayload(cachedNs, namespace) if err != nil { + klog.Error(err) return err } if _, err = c.config.KubeClient.CoreV1().Namespaces().Patch(context.Background(), key, types.StrategicMergePatchType, patch, metav1.PatchOptions{}, ""); err != nil { klog.Errorf("patch namespace %s failed %v", key, err) + return err } - return err + return nil } diff --git a/pkg/controller/network_policy.go b/pkg/controller/network_policy.go index 89db7d592d3..b936e5c03d7 100644 --- a/pkg/controller/network_policy.go +++ b/pkg/controller/network_policy.go @@ -143,6 +143,7 @@ func (c *Controller) handleUpdateNp(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } diff --git a/pkg/controller/node.go b/pkg/controller/node.go index ae8676e737d..ab60bb0abc8 100644 --- a/pkg/controller/node.go +++ b/pkg/controller/node.go @@ -197,6 +197,7 @@ func (c *Controller) handleAddNode(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } node := cachedNode.DeepCopy() @@ -254,6 +255,7 @@ func (c *Controller) handleAddNode(key string) error { ipStr := util.GetStringIP(v4IP, v6IP) if err := c.ovnLegacyClient.CreatePort(c.config.NodeSwitch, portName, ipStr, mac, "", "", false, "", "", false, false, nil, false); err != nil { + klog.Error(err) return err } @@ -348,10 +350,12 @@ func (c *Controller) handleAddNode(key string) error { } if err := c.validateChassis(node); err != nil { + klog.Error(err) return err } if err := c.retryDelDupChassis(util.ChasRetryTime, util.ChasRetryIntev+2, c.checkChassisDupl, node); err != nil { + klog.Error(err) return err } @@ -457,6 +461,7 @@ func (c *Controller) handleDeleteNode(key string) error { } if err := c.config.KubeOvnClient.KubeovnV1().IPs().Delete(context.Background(), portName, metav1.DeleteOptions{}); err != nil && !k8serrors.IsNotFound(err) { + klog.Error(err) return err } @@ -500,6 +505,7 @@ func (c *Controller) handleDeleteNode(key string) error { for _, pn := range providerNetworks { if err = c.updateProviderNetworkForNodeDeletion(pn, key); err != nil { + klog.Error(err) return err } } @@ -567,6 +573,7 @@ func (c *Controller) handleUpdateNode(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } @@ -582,9 +589,11 @@ func (c *Controller) handleUpdateNode(key string) error { } if err := c.validateChassis(node); err != nil { + klog.Error(err) return err } if err := c.retryDelDupChassis(util.ChasRetryTime, util.ChasRetryIntev+2, c.checkChassisDupl, node); err != nil { + klog.Error(err) return err } @@ -592,6 +601,7 @@ func (c *Controller) handleUpdateNode(key string) error { subnet := cachedSubnet.DeepCopy() if util.GatewayContains(subnet.Spec.GatewayNode, node.Name) { if err := c.reconcileOvnRoute(subnet); err != nil { + klog.Error(err) return err } } @@ -618,9 +628,9 @@ func (c *Controller) createOrUpdateCrdIPs(podName, ip, mac, subnetName, ns, node ipCr, err = c.config.KubeOvnClient.KubeovnV1().IPs().Get(context.Background(), ipName, metav1.GetOptions{}) if err != nil { if !k8serrors.IsNotFound(err) { - errMsg := fmt.Errorf("failed to get ip CR %s: %v", ipName, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to get ip CR %s: %v", ipName, err) + klog.Error(err) + return err } // the returned pointer is not nil if the CR does not exist ipCr = nil @@ -652,9 +662,9 @@ func (c *Controller) createOrUpdateCrdIPs(podName, ip, mac, subnetName, ns, node }, }, metav1.CreateOptions{}) if err != nil { - errMsg := fmt.Errorf("failed to create ip CR %s: %v", ipName, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to create ip CR %s: %v", ipName, err) + klog.Error(err) + return err } } else { newIpCr := ipCr.DeepCopy() @@ -683,9 +693,9 @@ func (c *Controller) createOrUpdateCrdIPs(podName, ip, mac, subnetName, ns, node _, err := c.config.KubeOvnClient.KubeovnV1().IPs().Update(context.Background(), newIpCr, metav1.UpdateOptions{}) if err != nil { - errMsg := fmt.Errorf("failed to update ip CR %s: %v", newIpCr.Name, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to update ip CR %s: %v", newIpCr.Name, err) + klog.Error(err) + return err } } @@ -866,9 +876,9 @@ func (c *Controller) retryDelDupChassis(attempts int, sleep int, f func(node *v1 time.Sleep(time.Duration(sleep) * time.Second) } if i >= (attempts - 1) { - errMsg := fmt.Errorf("exhausting all attempts") - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("exhausting all attempts") + klog.Error(err) + return err } klog.V(3).Infof("finish check chassis") return nil diff --git a/pkg/controller/ovn_eip.go b/pkg/controller/ovn_eip.go index 411f43c2070..10d6e659fef 100644 --- a/pkg/controller/ovn_eip.go +++ b/pkg/controller/ovn_eip.go @@ -208,6 +208,7 @@ func (c *Controller) handleAddOvnEip(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if cachedEip.Status.MacAddress != "" { @@ -253,6 +254,7 @@ func (c *Controller) handleUpdateOvnEip(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if !cachedEip.DeletionTimestamp.IsZero() { @@ -280,6 +282,7 @@ func (c *Controller) handleResetOvnEip(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if cachedEip.Status.MacAddress != "" && cachedEip.Status.MacAddress != cachedEip.Spec.MacAddress { @@ -324,11 +327,13 @@ func (c *Controller) createOrUpdateCrdOvnEip(key, subnet, v4ip, v6ip, mac, usage }, metav1.CreateOptions{}) if err != nil { err := fmt.Errorf("failed to create crd ovn eip '%s', %v", key, err) + klog.Error(err) return err } // wait local cache ready time.Sleep(1 * time.Second) } else { + klog.Error(err) return err } } else { @@ -339,9 +344,9 @@ func (c *Controller) createOrUpdateCrdOvnEip(key, subnet, v4ip, v6ip, mac, usage ovnEip.Spec.MacAddress = mac ovnEip.Spec.Type = usage if _, err := c.config.KubeOvnClient.KubeovnV1().OvnEips().Update(context.Background(), ovnEip, metav1.UpdateOptions{}); err != nil { - errMsg := fmt.Errorf("failed to update ovn eip '%s', %v", key, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to update ovn eip '%s', %v", key, err) + klog.Error(err) + return err } } var needUpdateLabel bool @@ -432,6 +437,7 @@ func (c *Controller) natLabelOvnEip(eipName, natName, vpcName string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } eip := cachedEip.DeepCopy() @@ -462,7 +468,7 @@ func (c *Controller) natLabelOvnEip(eipName, natName, vpcName string) error { return err } } - return err + return nil } func (c *Controller) handleAddOvnEipFinalizer(cachedEip *kubeovnv1.OvnEip) error { diff --git a/pkg/controller/ovn_fip.go b/pkg/controller/ovn_fip.go index cd59c86e697..8fd07afef9c 100644 --- a/pkg/controller/ovn_fip.go +++ b/pkg/controller/ovn_fip.go @@ -178,6 +178,7 @@ func (c *Controller) handleAddOvnFip(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if cachedFip.Status.Ready && cachedFip.Status.V4Ip != "" { @@ -211,12 +212,14 @@ func (c *Controller) handleAddOvnFip(key string) error { vpcName := subnet.Spec.Vpc if cachedEip.Spec.Type != "" && cachedEip.Spec.Type != util.FipUsingEip { err = fmt.Errorf("failed to create ovn fip %s, eip '%s' is using by %s", key, eipName, cachedEip.Spec.Type) + klog.Error(err) return err } if cachedEip.Spec.Type == util.FipUsingEip && cachedEip.Labels[util.VpcNatLabel] != "" && cachedEip.Labels[util.VpcNatLabel] != cachedFip.Name { err = fmt.Errorf("failed to create fip %s, eip '%s' is using by other fip %s", key, eipName, cachedEip.Labels[util.VpcNatLabel]) + klog.Error(err) return err } if err = c.handleAddOvnEipFinalizer(cachedEip); err != nil { @@ -260,6 +263,7 @@ func (c *Controller) handleUpdateOvnFip(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } klog.V(3).Infof("handle add fip %s", key) @@ -269,7 +273,9 @@ func (c *Controller) handleUpdateOvnFip(key string) error { return err } if vpcPodIp.Spec.V4IPAddress == "" || vpcPodIp.Spec.MacAddress == "" { - return fmt.Errorf("vpc pod ip '%s' ip or mac is empty", vpcPodIp.Name) + err = fmt.Errorf("vpc pod ip '%s' ip or mac is empty", vpcPodIp.Name) + klog.Error(err) + return err } // get eip eipName := cachedFip.Spec.OvnEip @@ -290,12 +296,14 @@ func (c *Controller) handleUpdateOvnFip(key string) error { if cachedEip.Spec.Type != "" && cachedEip.Spec.Type != util.FipUsingEip { // eip is in use by other nat err = fmt.Errorf("failed to update fip %s, eip '%s' is using by %s", key, eipName, cachedEip.Spec.Type) + klog.Error(err) return err } if cachedEip.Spec.Type == util.FipUsingEip && cachedEip.Labels[util.VpcNatLabel] != "" && cachedEip.Labels[util.VpcNatLabel] != cachedFip.Name { err = fmt.Errorf("failed to update fip %s, eip '%s' is using by other fip %s", key, eipName, cachedEip.Labels[util.VpcNatLabel]) + klog.Error(err) return err } fip := cachedFip.DeepCopy() @@ -341,6 +349,7 @@ func (c *Controller) handleDelOvnFip(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } eipName := cachedFip.Spec.OvnEip @@ -380,6 +389,7 @@ func (c *Controller) handleAddOvnFipFinalizer(cachedFip *kubeovnv1.OvnFip) error controllerutil.AddFinalizer(newFip, util.ControllerName) patch, err := util.GenerateMergePatchPayload(cachedFip, newFip) if err != nil { + klog.Error(err) return err } if _, err := c.config.KubeOvnClient.KubeovnV1().OvnFips().Patch(context.Background(), cachedFip.Name, @@ -401,6 +411,7 @@ func (c *Controller) handleDelOvnFipFinalizer(cachedFip *kubeovnv1.OvnFip) error controllerutil.RemoveFinalizer(newFip, util.ControllerName) patch, err := util.GenerateMergePatchPayload(cachedFip, newFip) if err != nil { + klog.Error(err) return err } if _, err := c.config.KubeOvnClient.KubeovnV1().OvnFips().Patch(context.Background(), cachedFip.Name, @@ -420,6 +431,7 @@ func (c *Controller) patchOvnFipLabel(key, eipName string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } fip := oriFip.DeepCopy() @@ -456,6 +468,7 @@ func (c *Controller) patchOvnFipStatus(key, vpcName, v4Eip, podIp, podMac string if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } fip := oriFip.DeepCopy() @@ -474,6 +487,7 @@ func (c *Controller) patchOvnFipStatus(key, vpcName, v4Eip, podIp, podMac string if changed { bytes, err := fip.Status.Bytes() if err != nil { + klog.Error(err) return err } if _, err = c.config.KubeOvnClient.KubeovnV1().OvnFips().Patch(context.Background(), fip.Name, diff --git a/pkg/controller/ovn_snat.go b/pkg/controller/ovn_snat.go index 7a5c47e358e..f397b653f4d 100644 --- a/pkg/controller/ovn_snat.go +++ b/pkg/controller/ovn_snat.go @@ -175,6 +175,7 @@ func (c *Controller) handleAddOvnSnatRule(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if cachedSnat.Status.Ready && cachedSnat.Status.V4IpCidr != "" { @@ -193,6 +194,7 @@ func (c *Controller) handleAddOvnSnatRule(key string) error { } if cachedEip.Spec.Type != "" && cachedEip.Spec.Type != util.SnatUsingEip { err = fmt.Errorf("failed to create snat %s, eip '%s' is using by '%s'", key, eipName, cachedEip.Spec.Type) + klog.Error(err) return err } var v4IpCidr, vpcName string @@ -223,6 +225,7 @@ func (c *Controller) handleAddOvnSnatRule(key string) error { if v4IpCidr == "" { // only support IPv4 snat err = fmt.Errorf("failed to get v4 internal ip for snat %s", key) + klog.Error(err) return err } // create snat @@ -264,6 +267,7 @@ func (c *Controller) handleUpdateOvnSnatRule(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } klog.V(3).Infof("handle add ovn snat %s", key) @@ -299,6 +303,7 @@ func (c *Controller) handleUpdateOvnSnatRule(key string) error { if cachedEip.Spec.Type != "" && cachedEip.Spec.Type != util.SnatUsingEip { // eip is in use by other err = fmt.Errorf("failed to create snat %s, eip '%s' is using by nat '%s'", key, eipName, cachedEip.Spec.Type) + klog.Error(err) return err } var v4IpCidr, vpcName string @@ -329,6 +334,7 @@ func (c *Controller) handleUpdateOvnSnatRule(key string) error { if v4IpCidr == "" { // only support IPv4 snat err = fmt.Errorf("failed to get v4 internal ip for snat %s", key) + klog.Error(err) return err } // snat change eip @@ -421,6 +427,7 @@ func (c *Controller) patchOvnSnatStatus(key, vpc, v4Eip, v4IpCidr string, ready if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } snat := oriSnat.DeepCopy() @@ -456,6 +463,7 @@ func (c *Controller) patchOvnSnatLabel(key, eipName string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } snat := oriFip.DeepCopy() diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go index b6b7f2da13d..4d856c61972 100644 --- a/pkg/controller/pod.go +++ b/pkg/controller/pod.go @@ -593,6 +593,7 @@ func (c *Controller) handleAddPod(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } pod := cachedPod.DeepCopy() @@ -622,6 +623,7 @@ func (c *Controller) handleAddPod(key string) error { v4IP, v6IP, mac, subnet, err := c.acquireAddress(pod, podNet) if err != nil { c.recorder.Eventf(pod, v1.EventTypeWarning, "AcquireAddressFailed", err.Error()) + klog.Error(err) return err } ipStr := util.GetStringIP(v4IP, v6IP) @@ -658,6 +660,7 @@ func (c *Controller) handleAddPod(key string) error { vlan, err := c.vlansLister.Get(subnet.Spec.Vlan) if err != nil { c.recorder.Eventf(pod, v1.EventTypeWarning, "GetVlanInfoFailed", err.Error()) + klog.Error(err) return err } pod.Annotations[fmt.Sprintf(util.VlanIdAnnotationTemplate, podNet.ProviderName)] = strconv.Itoa(vlan.Spec.ID) @@ -688,6 +691,7 @@ func (c *Controller) handleAddPod(key string) error { hasUnknown := pod.Annotations[fmt.Sprintf(util.Layer2ForwardAnnotationTemplate, podNet.ProviderName)] == "true" if err := c.ovnLegacyClient.CreatePort(subnet.Name, portName, ipStr, mac, podName, pod.Namespace, portSecurity, securityGroupAnnotation, vips, podNet.AllowLiveMigration, podNet.Subnet.Spec.EnableDHCP, dhcpOptions, hasUnknown); err != nil { c.recorder.Eventf(pod, v1.EventTypeWarning, "CreateOVNPortFailed", err.Error()) + klog.Error(err) return err } @@ -883,6 +887,7 @@ func (c *Controller) handleUpdatePodSecurity(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } podName := c.getNameByPod(pod) @@ -939,6 +944,7 @@ func (c *Controller) handleUpdatePod(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } pod := oriPod.DeepCopy() @@ -1007,6 +1013,7 @@ func (c *Controller) handleUpdatePod(key string) error { if subnet.Spec.GatewayType == kubeovnv1.GWDistributedType && pod.Annotations[util.NorthGatewayAnnotation] == "" { nodeTunlIPAddr, err := getNodeTunlIP(node) if err != nil { + klog.Error(err) return err } @@ -1021,6 +1028,7 @@ func (c *Controller) handleUpdatePod(key string) error { c.ovnPgKeyMutex.Lock(pgName) if err = c.ovnClient.PortGroupAddPort(pgName, portName); err != nil { c.ovnPgKeyMutex.Unlock(pgName) + klog.Error(err) return err } c.ovnPgKeyMutex.Unlock(pgName) @@ -1041,6 +1049,7 @@ func (c *Controller) handleUpdatePod(key string) error { } } else if c.config.EnableEipSnat { if err := c.ovnLegacyClient.DeleteStaticRoute(podIP, c.config.ClusterRouter); err != nil { + klog.Error(err) return err } } diff --git a/pkg/controller/pod_iptables_eip.go b/pkg/controller/pod_iptables_eip.go index 46f8420e912..306e27b5306 100644 --- a/pkg/controller/pod_iptables_eip.go +++ b/pkg/controller/pod_iptables_eip.go @@ -244,6 +244,7 @@ func (c *Controller) handleAddPodAnnotatedIptablesEip(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if cachedPod.Annotations[util.FipEnableAnnotation] != "true" { @@ -264,10 +265,12 @@ func (c *Controller) handleAddPodAnnotatedIptablesEip(key string) error { newPod := cachedPod.DeepCopy() if newPod.Annotations[util.AllocatedAnnotation] != "true" { err = fmt.Errorf("pod network not allocated, failed to create iptables eip %s", eipName) + klog.Error(err) return err } if _, err = c.iptablesEipsLister.Get(eipName); err != nil { if !k8serrors.IsNotFound(err) { + klog.Error(err) return err } klog.V(3).Infof("handle add pod annotated iptables eip %s", eipName) @@ -286,6 +289,7 @@ func (c *Controller) handleAddPodAnnotatedIptablesEip(key string) error { // check eip if ready and update pod eip annotation var eip *kubeovnv1.IptablesEIP if eip, err = c.iptablesEipsLister.Get(eipName); err != nil { + klog.Error(err) return err } // update pod eip annotation @@ -293,6 +297,7 @@ func (c *Controller) handleAddPodAnnotatedIptablesEip(key string) error { newPod.Annotations[util.EipAnnotation] = eip.Status.IP patch, err := util.GenerateStrategicMergePatchPayload(cachedPod, newPod) if err != nil { + klog.Error(err) return err } if _, err := c.config.KubeClient.CoreV1().Pods(namespace).Patch(context.Background(), name, diff --git a/pkg/controller/pod_iptables_fip.go b/pkg/controller/pod_iptables_fip.go index 4b59e0e18dd..4d9472b5795 100644 --- a/pkg/controller/pod_iptables_fip.go +++ b/pkg/controller/pod_iptables_fip.go @@ -231,6 +231,7 @@ func (c *Controller) handleAddPodAnnotatedIptablesFip(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if cachedPod.Annotations[util.FipEnableAnnotation] != "true" { @@ -249,14 +250,17 @@ func (c *Controller) handleAddPodAnnotatedIptablesFip(key string) error { } } if err = c.handleAddPodAnnotatedIptablesFipFinalizer(cachedPod); err != nil { + klog.Error(err) return err } if cachedPod.Annotations[util.AllocatedAnnotation] != "true" { err = fmt.Errorf("pod network not allocated, failed to create iptables fip %s", fipName) + klog.Error(err) return err } if _, err = c.iptablesFipsLister.Get(fipName); err != nil { if !k8serrors.IsNotFound(err) { + klog.Error(err) return err } klog.V(3).Infof("handle add pod annotated iptables fip %s", fipName) @@ -269,6 +273,7 @@ func (c *Controller) handleAddPodAnnotatedIptablesFip(key string) error { newPod.Annotations[util.FipNameAnnotation] = fipName patch, err := util.GenerateStrategicMergePatchPayload(cachedPod, newPod) if err != nil { + klog.Error(err) return err } if _, err := c.config.KubeClient.CoreV1().Pods(namespace).Patch(context.Background(), name, @@ -307,6 +312,7 @@ func (c *Controller) handleDeletePodAnnotatedIptablesFip(pod *v1.Pod) error { } } if err = c.handleDelPodAnnotatedIptablesFipFinalizer(pod); err != nil { + klog.Error(err) return err } return nil diff --git a/pkg/controller/security_group.go b/pkg/controller/security_group.go index eb5d6dc00fc..fb7f1d641fa 100644 --- a/pkg/controller/security_group.go +++ b/pkg/controller/security_group.go @@ -168,9 +168,11 @@ func (c *Controller) processNextDeleteSgWorkItem() bool { func (c *Controller) initDenyAllSecurityGroup() error { if err := c.ovnLegacyClient.CreateSgPortGroup(util.DenyAllSecurityGroup); err != nil { + klog.Error(err) return err } if err := c.ovnLegacyClient.CreateSgDenyAllACL(); err != nil { + klog.Error(err) return err } c.addOrUpdateSgQueue.Add(util.DenyAllSecurityGroup) @@ -210,18 +212,22 @@ func (c *Controller) handleAddOrUpdateSg(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } - sg := cachedSg.DeepCopy() - if err = c.validateSgRule(sg); err != nil { + if err = c.validateSgRule(cachedSg); err != nil { + klog.Error(err) return err } + sg := cachedSg.DeepCopy() if err = c.ovnLegacyClient.CreateSgPortGroup(sg.Name); err != nil { + klog.Error(err) return fmt.Errorf("failed to create sg port_group %s, %v", key, err.Error()) } if err = c.ovnLegacyClient.CreateSgAssociatedAddressSet(sg.Name); err != nil { + klog.Error(err) return fmt.Errorf("failed to create sg associated address_set %s, %v", key, err.Error()) } @@ -252,9 +258,11 @@ func (c *Controller) handleAddOrUpdateSg(key string) error { if err = c.ovnLegacyClient.UpdateSgACL(sg, ovs.SgAclIngressDirection); err != nil { sg.Status.IngressLastSyncSuccess = false c.patchSgStatus(sg) + klog.Error(err) return err } if err := c.ovnLegacyClient.CreateSgBaseIngressACL(sg.Name); err != nil { + klog.Error(err) return err } sg.Status.IngressMd5 = newIngressMd5 @@ -265,9 +273,11 @@ func (c *Controller) handleAddOrUpdateSg(key string) error { if err = c.ovnLegacyClient.UpdateSgACL(sg, ovs.SgAclEgressDirection); err != nil { sg.Status.EgressLastSyncSuccess = false c.patchSgStatus(sg) + klog.Error(err) return err } if err := c.ovnLegacyClient.CreateSgBaseEgressACL(sg.Name); err != nil { + klog.Error(err) return err } sg.Status.EgressMd5 = newEgressMd5 diff --git a/pkg/controller/service.go b/pkg/controller/service.go index 41f52f0d8bb..42b25496ba7 100644 --- a/pkg/controller/service.go +++ b/pkg/controller/service.go @@ -303,6 +303,7 @@ func (c *Controller) handleUpdateService(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } @@ -384,12 +385,15 @@ func (c *Controller) handleUpdateService(key string) error { } if err = updateVip(tcpLb, oTcpLb, tcpVips); err != nil { + klog.Error(err) return err } if err = updateVip(udpLb, oUdpLb, udpVips); err != nil { + klog.Error(err) return err } if err = updateVip(sctpLb, oSctpLb, sctpVips); err != nil { + klog.Error(err) return err } @@ -418,6 +422,7 @@ func (c *Controller) handleAddService(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if svc.Spec.Type != v1.ServiceTypeLoadBalancer || !c.config.EnableLbSvc { @@ -457,6 +462,7 @@ func (c *Controller) handleAddService(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } } @@ -472,6 +478,7 @@ func (c *Controller) handleAddService(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } var ingress v1.LoadBalancerIngress diff --git a/pkg/controller/service_lb.go b/pkg/controller/service_lb.go index c5de5e80c9d..3122a002eb9 100644 --- a/pkg/controller/service_lb.go +++ b/pkg/controller/service_lb.go @@ -160,6 +160,7 @@ func (c *Controller) createLbSvcPod(svc *corev1.Service) error { if k8serrors.IsNotFound(err) { needToCreate = true } else { + klog.Error(err) return err } } @@ -268,6 +269,7 @@ func (c *Controller) execNatRules(pod *corev1.Pod, operation string, rules []str if len(stdOutput) > 0 { klog.V(3).Infof("failed to ExecuteCommandInContainer, stdOutput: %v", stdOutput) } + klog.Error(err) return err } diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go index 1cf160bdea2..a24e268ce6b 100644 --- a/pkg/controller/subnet.go +++ b/pkg/controller/subnet.go @@ -812,6 +812,7 @@ func (c *Controller) handleUpdateSubnetStatus(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if util.CheckProtocol(subnet.Spec.CIDRBlock) == kubeovnv1.ProtocolDual { @@ -831,6 +832,7 @@ func (c *Controller) handleUpdateSubnetStatus(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } subnet = cachedSubnet.DeepCopy() @@ -1373,7 +1375,7 @@ func (c *Controller) reconcileOvnRoute(subnet *kubeovnv1.Subnet) error { klog.Error(err) return err } - return err + return nil } gwNodeExists := c.checkGwNodeExists(subnet.Spec.GatewayNode) @@ -1511,6 +1513,7 @@ func (c *Controller) reconcileOvnRoute(subnet *kubeovnv1.Subnet) error { newActivateNode = node.Name nodeTunlIPAddr, err = getNodeTunlIP(node) if err != nil { + klog.Error(err) return err } klog.Infof("subnet %s uses a new activate gw %s", subnet.Name, node.Name) @@ -1527,8 +1530,9 @@ func (c *Controller) reconcileOvnRoute(subnet *kubeovnv1.Subnet) error { } if _, err = c.config.KubeOvnClient.KubeovnV1().Subnets().Patch(context.Background(), subnet.Name, types.MergePatchType, bytes, metav1.PatchOptions{}, "status"); err != nil { klog.Errorf("failed to patch subnet %s NoReadyGateway status: %v", subnet.Name, err) + return err } - return err + return nil } nextHop := getNextHopByTunnelIP(nodeTunlIPAddr) @@ -1676,10 +1680,12 @@ func (c *Controller) reconcileU2OInterconnectionIP(subnet *kubeovnv1.Subnet) err if needCalcIP { if subnet.Spec.Protocol == kubeovnv1.ProtocolDual { if err := calcDualSubnetStatusIP(subnet, c); err != nil { + klog.Error(err) return err } } else { if err := calcSubnetStatusIP(subnet, c); err != nil { + klog.Error(err) return err } } @@ -1689,6 +1695,7 @@ func (c *Controller) reconcileU2OInterconnectionIP(subnet *kubeovnv1.Subnet) err func calcDualSubnetStatusIP(subnet *kubeovnv1.Subnet, c *Controller) error { if err := util.CheckCidrs(subnet.Spec.CIDRBlock); err != nil { + klog.Error(err) return err } // Get the number of pods, not ips. For one pod with two ip(v4 & v6) in dual-stack, num of Items is 1 @@ -1696,6 +1703,7 @@ func calcDualSubnetStatusIP(subnet *kubeovnv1.Subnet, c *Controller) error { LabelSelector: fields.OneTermEqualSelector(subnet.Name, "").String(), }) if err != nil { + klog.Error(err) return err } @@ -1729,6 +1737,7 @@ func calcDualSubnetStatusIP(subnet *kubeovnv1.Subnet, c *Controller) error { LabelSelector: vipSelectors, }) if err != nil { + klog.Error(err) return err } usingIPs += float64(len(vips.Items)) @@ -1738,6 +1747,7 @@ func calcDualSubnetStatusIP(subnet *kubeovnv1.Subnet, c *Controller) error { LabelSelector: fields.OneTermEqualSelector(util.SubnetNameLabel, subnet.Name).String(), }) if err != nil { + klog.Error(err) return err } usingIPs += float64(len(eips.Items)) @@ -1778,12 +1788,14 @@ func calcDualSubnetStatusIP(subnet *kubeovnv1.Subnet, c *Controller) error { func calcSubnetStatusIP(subnet *kubeovnv1.Subnet, c *Controller) error { _, cidr, err := net.ParseCIDR(subnet.Spec.CIDRBlock) if err != nil { + klog.Error(err) return err } podUsedIPs, err := c.config.KubeOvnClient.KubeovnV1().IPs().List(context.Background(), metav1.ListOptions{ LabelSelector: fields.OneTermEqualSelector(subnet.Name, "").String(), }) if err != nil { + klog.Error(err) return err } @@ -1808,6 +1820,7 @@ func calcSubnetStatusIP(subnet *kubeovnv1.Subnet, c *Controller) error { LabelSelector: vipSelectors, }) if err != nil { + klog.Error(err) return err } usingIPs += float64(len(vips.Items)) @@ -1816,6 +1829,7 @@ func calcSubnetStatusIP(subnet *kubeovnv1.Subnet, c *Controller) error { LabelSelector: fields.OneTermEqualSelector(util.SubnetNameLabel, subnet.Name).String(), }) if err != nil { + klog.Error(err) return err } usingIPs += float64(len(eips.Items)) @@ -2013,6 +2027,7 @@ func (c *Controller) addCommonRoutesForSubnet(subnet *kubeovnv1.Subnet) error { match := fmt.Sprintf("ip%d.dst == %s", af, cidr) exist, err := c.ovnLegacyClient.PolicyRouteExists(util.SubnetRouterPolicyPriority, match) if err != nil { + klog.Error(err) return err } if !exist { @@ -2104,6 +2119,7 @@ func (c *Controller) addPolicyRouteForCentralizedSubnet(subnet *kubeovnv1.Subnet } nameIpMap[tmpName] = nodeIP if err := c.updatePolicyRouteForCentralizedSubnet(subnet.Name, cidrBlock, nextHops, nameIpMap); err != nil { + klog.Error(err) return err } } @@ -2149,6 +2165,7 @@ func (c *Controller) addPolicyRouteForDistributedSubnet(subnet *kubeovnv1.Subnet match := fmt.Sprintf("%s.src == $%s", ipSuffix, pgAs) exist, err := c.ovnLegacyClient.PolicyRouteExists(util.GatewayRouterPolicyPriority, match) if err != nil { + klog.Error(err) return err } if exist { diff --git a/pkg/controller/switch_lb_rule.go b/pkg/controller/switch_lb_rule.go index bd8c500167a..ca878dbfc65 100644 --- a/pkg/controller/switch_lb_rule.go +++ b/pkg/controller/switch_lb_rule.go @@ -132,6 +132,7 @@ func (c *Controller) handleAddOrUpdateSwitchLBRule(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } diff --git a/pkg/controller/vip.go b/pkg/controller/vip.go index 730ad78c939..7c1af075cba 100644 --- a/pkg/controller/vip.go +++ b/pkg/controller/vip.go @@ -169,6 +169,7 @@ func (c *Controller) handleAddVirtualIp(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if cachedVip.Status.Mac != "" { @@ -184,6 +185,7 @@ func (c *Controller) handleAddVirtualIp(key string) error { } subnet, err := c.subnetsLister.Get(subnetName) if err != nil { + klog.Error(err) return err } portName := ovs.PodNameToPortName(vip.Name, vip.Namespace, subnet.Spec.Provider) @@ -195,6 +197,7 @@ func (c *Controller) handleAddVirtualIp(key string) error { v4ip, v6ip, mac, err = c.acquireIpAddress(subnet.Name, vip.Name, portName) } if err != nil { + klog.Error(err) return err } var parentV4ip, parentV6ip, parentMac string @@ -220,6 +223,7 @@ func (c *Controller) handleUpdateVirtualIp(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } vip := cachedVip.DeepCopy() @@ -237,7 +241,7 @@ func (c *Controller) handleUpdateVirtualIp(key string) error { vip.Status.V4ip != "" && vip.Status.V4ip != vip.Spec.V4ip || vip.Status.V6ip != "" && vip.Status.V6ip != vip.Spec.V6ip { err = fmt.Errorf("not support change ip of vip") - klog.Errorf("%v", err) + klog.Error(err) return err } // should update @@ -246,10 +250,12 @@ func (c *Controller) handleUpdateVirtualIp(key string) error { if err = c.createOrUpdateCrdVip(key, vip.Namespace, vip.Spec.Subnet, vip.Spec.V4ip, vip.Spec.V6ip, vip.Spec.MacAddress, vip.Spec.ParentV4ip, vip.Spec.ParentV6ip, vip.Spec.MacAddress); err != nil { + klog.Error(err) return err } ready := true if err = c.patchVipStatus(key, vip.Spec.V4ip, ready); err != nil { + klog.Error(err) return err } if err = c.handleAddVipFinalizer(key); err != nil { @@ -319,7 +325,10 @@ func (c *Controller) subnetCountIp(subnet *kubeovnv1.Subnet) error { } else { err = calcSubnetStatusIP(subnet, c) } - return err + if err != nil { + klog.Error(err) + } + return nil } func (c *Controller) createOrUpdateCrdVip(key, ns, subnet, v4ip, v6ip, mac, pV4ip, pV6ip, pmac string) error { @@ -346,14 +355,14 @@ func (c *Controller) createOrUpdateCrdVip(key, ns, subnet, v4ip, v6ip, mac, pV4i ParentMac: pmac, }, }, metav1.CreateOptions{}); err != nil { - errMsg := fmt.Errorf("failed to create crd vip '%s', %v", key, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to create crd vip '%s', %v", key, err) + klog.Error(err) + return err } } else { - errMsg := fmt.Errorf("failed to get crd vip '%s', %v", key, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to get crd vip '%s', %v", key, err) + klog.Error(err) + return err } } else { vip := vipCr.DeepCopy() @@ -375,9 +384,9 @@ func (c *Controller) createOrUpdateCrdVip(key, ns, subnet, v4ip, v6ip, mac, pV4i vip.Status.Pv6ip = pV6ip vip.Status.Pmac = pmac if _, err := c.config.KubeOvnClient.KubeovnV1().Vips().Update(context.Background(), vip, metav1.UpdateOptions{}); err != nil { - errMsg := fmt.Errorf("failed to update vip '%s', %v", key, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to update vip '%s', %v", key, err) + klog.Error(err) + return err } } var needUpdateLabel bool @@ -416,6 +425,7 @@ func (c *Controller) patchVipStatus(key, v4ip string, ready bool) error { klog.Errorf("failed to get cached vip '%s', %v", key, err) return nil } + klog.Error(err) return err } vip := oriVip.DeepCopy() @@ -481,6 +491,7 @@ func (c *Controller) releaseVip(key string) error { klog.Errorf("failed to get cached vip '%s', %v", key, err) return nil } + klog.Error(err) return err } vip := oriVip.DeepCopy() @@ -517,6 +528,7 @@ func (c *Controller) handleAddVipFinalizer(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if cachedVip.DeletionTimestamp.IsZero() { @@ -548,6 +560,7 @@ func (c *Controller) handleDelVipFinalizer(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if len(cachedVip.Finalizers) == 0 { diff --git a/pkg/controller/vlan.go b/pkg/controller/vlan.go index d738b0e689a..846f95a8402 100644 --- a/pkg/controller/vlan.go +++ b/pkg/controller/vlan.go @@ -173,7 +173,7 @@ func (c *Controller) handleAddVlan(key string) error { if k8serrors.IsNotFound(err) { return nil } - + klog.Error(err) return err } @@ -234,6 +234,7 @@ func (c *Controller) handleUpdateVlan(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } @@ -254,6 +255,7 @@ func (c *Controller) handleUpdateVlan(key string) error { for _, subnet := range subnets { if subnet.Spec.Vlan == vlan.Name { if err = c.setLocalnetTag(subnet.Name, vlan.Spec.ID); err != nil { + klog.Error(err) return err } } @@ -283,6 +285,7 @@ func (c *Controller) handleDelVlan(key string) error { for _, pn := range providerNetworks { if err = c.updateProviderNetworkStatusForVlanDeletion(pn, key); err != nil { + klog.Error(err) return err } } diff --git a/pkg/controller/vpc.go b/pkg/controller/vpc.go index 79a32d3fc10..bfa6ddd0710 100644 --- a/pkg/controller/vpc.go +++ b/pkg/controller/vpc.go @@ -96,11 +96,13 @@ func (c *Controller) runDelVpcWorker() { func (c *Controller) handleDelVpc(vpc *kubeovnv1.Vpc) error { if err := c.deleteVpcLb(vpc); err != nil { + klog.Error(err) return err } err := c.deleteVpcRouter(vpc.Status.Router) if err != nil { + klog.Error(err) return err } @@ -117,12 +119,14 @@ func (c *Controller) handleUpdateVpcStatus(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } vpc := cachedVpc.DeepCopy() subnets, defaultSubnet, err := c.getVpcSubnets(vpc) if err != nil { + klog.Error(err) return err } @@ -135,11 +139,13 @@ func (c *Controller) handleUpdateVpcStatus(key string) error { vpc.Status.Subnets = subnets bytes, err := vpc.Status.Bytes() if err != nil { + klog.Error(err) return err } vpc, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Patch(context.Background(), vpc.Name, types.MergePatchType, bytes, metav1.PatchOptions{}, "status") if err != nil { + klog.Error(err) return err } if change { @@ -150,6 +156,7 @@ func (c *Controller) handleUpdateVpcStatus(key string) error { natGws, err := c.vpcNatGatewayLister.List(labels.Everything()) if err != nil { + klog.Error(err) return err } for _, gw := range natGws { @@ -172,6 +179,7 @@ func (c *Controller) reconcileRouterPorts(vpc *kubeovnv1.Vpc) error { routerPortName := ovs.LogicalRouterPortName(router, subnetName) exists, err := c.ovnClient.LogicalRouterPortExists(routerPortName) if err != nil { + klog.Error(err) return err } @@ -216,6 +224,7 @@ func (c *Controller) reconcileRouterPortBySubnet(vpc *kubeovnv1.Vpc, subnet *kub routerPortName := ovs.LogicalRouterPortName(router, subnet.Name) exists, err := c.ovnClient.LogicalRouterPortExists(routerPortName) if err != nil { + klog.Error(err) return err } @@ -312,6 +321,7 @@ func (c *Controller) handleAddOrUpdateVpc(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } vpc := cachedVpc.DeepCopy() @@ -482,6 +492,7 @@ func (c *Controller) handleAddOrUpdateVpc(key string) error { if c.config.EnableLb { vpcLb, err := c.addLoadBalancer(key) if err != nil { + klog.Error(err) return err } vpc.Status.TcpLoadBalancer = vpcLb.TcpLoadBalancer @@ -493,23 +504,28 @@ func (c *Controller) handleAddOrUpdateVpc(key string) error { } bytes, err := vpc.Status.Bytes() if err != nil { + klog.Error(err) return err } vpc, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Patch(context.Background(), vpc.Name, types.MergePatchType, bytes, metav1.PatchOptions{}, "status") if err != nil { + klog.Error(err) return err } if len(vpc.Annotations) != 0 && strings.ToLower(vpc.Annotations[util.VpcLbAnnotation]) == "on" { if err = c.createVpcLb(vpc); err != nil { + klog.Error(err) return err } } else if err = c.deleteVpcLb(vpc); err != nil { + klog.Error(err) return err } subnets, err := c.subnetsLister.List(labels.Everything()) if err != nil { + klog.Error(err) return err } @@ -785,6 +801,7 @@ func (c *Controller) getVpcSubnets(vpc *kubeovnv1.Vpc) (subnets []string, defaul func (c *Controller) createVpcRouter(lr string) error { lrs, err := c.ovnLegacyClient.ListLogicalRouter(c.config.EnableExternalVpc) if err != nil { + klog.Error(err) return err } klog.Infof("exists routers %v", lrs) @@ -804,6 +821,7 @@ func (c *Controller) deleteVpcRouter(lr string) error { func (c *Controller) handleAddVpcExternal(key string) error { cachedSubnet, err := c.subnetsLister.Get(c.config.ExternalGatewaySwitch) if err != nil { + klog.Error(err) return err } lrpEipName := fmt.Sprintf("%s-%s", key, c.config.ExternalGatewaySwitch) @@ -811,6 +829,7 @@ func (c *Controller) handleAddVpcExternal(key string) error { var needCreateEip bool if err != nil { if !k8serrors.IsNotFound(err) { + klog.Error(err) return err } needCreateEip = true @@ -834,6 +853,7 @@ func (c *Controller) handleAddVpcExternal(key string) error { return fmt.Errorf("lrp '%s' ip or mac should not be empty", lrpEipName) } if err = c.patchOvnEipStatus(lrpEipName); err != nil { + klog.Error(err) return err } // init lrp gw chassis group @@ -861,20 +881,24 @@ func (c *Controller) handleAddVpcExternal(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } vpc := cachedVpc.DeepCopy() vpc.Status.EnableExternal = cachedVpc.Spec.EnableExternal bytes, err := vpc.Status.Bytes() if err != nil { + klog.Error(err) return err } 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 } cachedEip, err = c.ovnEipsLister.Get(lrpEipName) if err != nil { + klog.Error(err) return err } if err = c.handleAddOvnEipFinalizer(cachedEip); err != nil { @@ -890,6 +914,7 @@ func (c *Controller) handleDelVpcExternal(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } lrpEipName := fmt.Sprintf("%s-%s", key, c.config.ExternalGatewaySwitch) @@ -902,10 +927,12 @@ func (c *Controller) handleDelVpcExternal(key string) error { vpc.Status.EnableExternal = cachedVpc.Spec.EnableExternal bytes, err := vpc.Status.Bytes() if err != nil { + klog.Error(err) return err } 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 } cachedEip, err := c.ovnEipsLister.Get(lrpEipName) @@ -913,6 +940,7 @@ func (c *Controller) handleDelVpcExternal(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if err = c.handleDelOvnEipFinalizer(cachedEip); err != nil { diff --git a/pkg/controller/vpc_dns.go b/pkg/controller/vpc_dns.go index 5ab0d98a41f..668ce772a14 100644 --- a/pkg/controller/vpc_dns.go +++ b/pkg/controller/vpc_dns.go @@ -58,6 +58,7 @@ func genVpcDnsDpName(name string) string { func hostConfigFromReader() error { file, err := os.Open("/etc/resolv.conf") if err != nil { + klog.Error(err) return err } defer func(file *os.File) { @@ -69,6 +70,7 @@ func hostConfigFromReader() error { scanner := bufio.NewScanner(file) for scanner.Scan() { if err := scanner.Err(); err != nil { + klog.Error(err) return err } line := scanner.Text() @@ -81,8 +83,10 @@ func hostConfigFromReader() error { hostNameservers = append(hostNameservers, name) } } - - return err + if err != nil { + klog.Error(err) + } + return nil } func (c *Controller) enqueueAddVpcDns(obj interface{}) { @@ -149,6 +153,7 @@ func (c *Controller) handleAddOrUpdateVpcDns(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } @@ -204,10 +209,12 @@ func (c *Controller) handleAddOrUpdateVpcDns(key string) error { } if err := c.createOrUpdateVpcDnsDep(vpcDns); err != nil { + klog.Error(err) return err } if err := c.createOrUpdateVpcDnsSlr(vpcDns); err != nil { + klog.Error(err) return err } @@ -237,6 +244,7 @@ func (c *Controller) checkVpcDnsDuplicated(vpcDns *kubeovnv1.VpcDns) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } @@ -245,6 +253,7 @@ func (c *Controller) checkVpcDnsDuplicated(vpcDns *kubeovnv1.VpcDns) error { item.Name != vpcDns.Name && item.Spec.Vpc == vpcDns.Spec.Vpc { err = fmt.Errorf("only one vpc-dns can be deployed in a vpc") + klog.Error(err) return err } } @@ -260,6 +269,7 @@ func (c *Controller) createOrUpdateVpcDnsDep(vpcDns *kubeovnv1.VpcDns) error { if k8serrors.IsNotFound(err) { needToCreateDp = true } else { + klog.Error(err) return err } } @@ -298,6 +308,7 @@ func (c *Controller) createOrUpdateVpcDnsSlr(vpcDns *kubeovnv1.VpcDns) error { if k8serrors.IsNotFound(err) { needToCreateSlr = true } else { + klog.Error(err) return err } } @@ -473,6 +484,7 @@ func (c *Controller) checkOvnNad() error { _, err := c.config.AttachNetClient.K8sCniCncfIoV1().NetworkAttachmentDefinitions(corev1.NamespaceDefault). Get(context.Background(), nadName, metav1.GetOptions{}) if err != nil { + klog.Error(err) return err } @@ -636,6 +648,7 @@ func getCoreDnsTemplateFile(url string) error { resp, err := client.Get(url) if err != nil { + klog.Error(err) return err } defer func(Body io.ReadCloser) { @@ -651,11 +664,13 @@ func getCoreDnsTemplateFile(url string) error { data, err := io.ReadAll(resp.Body) if err != nil { + klog.Error(err) return err } err = os.WriteFile(CorednsTemplateDep, data, 0644) if err != nil { + klog.Error(err) return err } diff --git a/pkg/controller/vpc_lb.go b/pkg/controller/vpc_lb.go index 3b1f188720b..88ccc590b48 100644 --- a/pkg/controller/vpc_lb.go +++ b/pkg/controller/vpc_lb.go @@ -24,7 +24,13 @@ func vpcLbDeploymentName(vpc string) string { func (c *Controller) createVpcLb(vpc *kubeovnv1.Vpc) error { deployment, err := c.genVpcLbDeployment(vpc) - if deployment == nil || err != nil { + if err != nil { + klog.Error(err) + return err + } + if deployment == nil { + err := fmt.Errorf("failed to get deployment for vpc %s", vpc.Name) + klog.Error(err) return err } diff --git a/pkg/controller/vpc_nat_gateway.go b/pkg/controller/vpc_nat_gateway.go index 3b2d6c5da02..0fd71f0d2e6 100644 --- a/pkg/controller/vpc_nat_gateway.go +++ b/pkg/controller/vpc_nat_gateway.go @@ -212,6 +212,7 @@ func (c *Controller) handleDelVpcNatGw(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } return nil @@ -229,6 +230,7 @@ func (c *Controller) handleAddOrUpdateVpcNatGw(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if _, err := c.vpcsLister.Get(gw.Spec.Vpc); err != nil { @@ -249,6 +251,7 @@ func (c *Controller) handleAddOrUpdateVpcNatGw(key string) error { if k8serrors.IsNotFound(err) { needToCreate = true } else { + klog.Error(err) return err } } @@ -287,6 +290,7 @@ func (c *Controller) handleInitVpcNatGw(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } // subnet for vpc-nat-gw has been checked when create vpc-nat-gw @@ -298,6 +302,7 @@ func (c *Controller) handleInitVpcNatGw(key string) error { oriPod, err := c.getNatGwPod(key) if err != nil { + klog.Error(err) return err } pod := oriPod.DeepCopy() @@ -326,6 +331,7 @@ func (c *Controller) handleInitVpcNatGw(key string) error { pod.Annotations[util.VpcNatGatewayInitAnnotation] = "true" patch, err := util.GenerateStrategicMergePatchPayload(oriPod, pod) if err != nil { + klog.Error(err) return err } if _, err := c.config.KubeClient.CoreV1().Pods(pod.Namespace).Patch(context.Background(), pod.Name, @@ -499,11 +505,13 @@ func (c *Controller) handleUpdateNatGwSubnetRoute(natGwKey string) error { defer c.vpcNatGwKeyMutex.Unlock(natGwKey) gw, err := c.vpcNatGatewayLister.Get(natGwKey) if err != nil { + klog.Error(err) return err } oriPod, err := c.getNatGwPod(natGwKey) if err != nil { + klog.Error(err) return err } pod := oriPod.DeepCopy() @@ -545,6 +553,7 @@ func (c *Controller) handleUpdateNatGwSubnetRoute(natGwKey string) error { } if cidrs, ok := pod.Annotations[util.VpcCIDRsAnnotation]; ok { if err = json.Unmarshal([]byte(cidrs), &oldCIDRs); err != nil { + klog.Error(err) return err } } @@ -586,6 +595,7 @@ func (c *Controller) handleUpdateNatGwSubnetRoute(natGwKey string) error { pod.Annotations[util.VpcCIDRsAnnotation] = string(cidrBytes) patch, err := util.GenerateStrategicMergePatchPayload(oriPod, pod) if err != nil { + klog.Error(err) return err } if _, err := c.config.KubeClient.CoreV1().Pods(pod.Namespace).Patch(context.Background(), pod.Name, @@ -609,6 +619,7 @@ func (c *Controller) execNatGwRules(pod *corev1.Pod, operation string, rules []s if len(stdOutput) > 0 { klog.V(3).Infof("failed to ExecuteCommandInContainer, stdOutput: %v", stdOutput) } + klog.Error(err) return err } @@ -753,6 +764,7 @@ func (c *Controller) checkVpcExternalNet() (err error) { klog.Errorf("vpc external multus net '%s' should be exist already before ovn-vpc-nat-gw-config applied", util.VpcExternalNet) return err } + klog.Error(err) return err } return nil @@ -764,6 +776,7 @@ func (c *Controller) initCreateAt(key string) (err error) { } pod, err := c.getNatGwPod(key) if err != nil { + klog.Error(err) return err } NAT_GW_CREATED_AT = pod.CreationTimestamp.Format("2006-01-02T15:04:05") @@ -773,9 +786,9 @@ func (c *Controller) initCreateAt(key string) (err error) { func (c *Controller) updateCrdNatGw(key string) error { gw, err := c.config.KubeOvnClient.KubeovnV1().VpcNatGateways().Get(context.Background(), key, metav1.GetOptions{}) if err != nil { - errMsg := fmt.Errorf("failed to get vpc nat gw '%s', %v", key, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to get vpc nat gw '%s', %v", key, err) + klog.Error(err) + return err } var needUpdateLabel bool var op string @@ -816,6 +829,7 @@ func (c *Controller) getNatGw(router, subnet string) (string, error) { selectors := labels.Set{util.VpcNameLabel: router, util.SubnetNameLabel: subnet}.AsSelector() gws, err := c.vpcNatGatewayLister.List(selectors) if err != nil { + klog.Error(err) return "", err } if len(gws) == 1 { diff --git a/pkg/controller/vpc_nat_gw_eip.go b/pkg/controller/vpc_nat_gw_eip.go index 98c82db9ec5..b754d208c5c 100644 --- a/pkg/controller/vpc_nat_gw_eip.go +++ b/pkg/controller/vpc_nat_gw_eip.go @@ -213,6 +213,7 @@ func (c *Controller) handleAddIptablesEip(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if cachedEip.Status.Ready && cachedEip.Status.IP != "" { @@ -263,6 +264,7 @@ func (c *Controller) handleResetIptablesEip(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } klog.V(3).Infof("handle reset eip %s", key) @@ -327,6 +329,7 @@ func (c *Controller) handleUpdateIptablesEip(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } // should delete @@ -415,12 +418,14 @@ func (c *Controller) GetEip(eipName string) (*kubeovnv1.IptablesEIP, error) { func (c *Controller) createEipInPod(dp, gw, v4Cidr string) error { gwPod, err := c.getNatGwPod(dp) if err != nil { + klog.Error(err) return err } var addRules []string rule := fmt.Sprintf("%s,%s", v4Cidr, gw) addRules = append(addRules, rule) if err = c.execNatGwRules(gwPod, natGwEipAdd, addRules); err != nil { + klog.Error(err) return err } return nil @@ -432,12 +437,14 @@ func (c *Controller) deleteEipInPod(dp, v4Cidr string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } var delRules []string rule := v4Cidr delRules = append(delRules, rule) if err = c.execNatGwRules(gwPod, natGwEipDel, delRules); err != nil { + klog.Error(err) return err } return nil @@ -535,14 +542,14 @@ func (c *Controller) createOrUpdateCrdEip(key, v4ip, v6ip, mac, natGwDp string) }, metav1.CreateOptions{}) if err != nil { - errMsg := fmt.Errorf("failed to create eip crd %s, %v", key, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to create eip crd %s, %v", key, err) + klog.Error(err) + return err } } else { - errMsg := fmt.Errorf("failed to get eip crd %s, %v", key, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to get eip crd %s, %v", key, err) + klog.Error(err) + return err } } else { eip := cachedEip.DeepCopy() @@ -553,9 +560,9 @@ func (c *Controller) createOrUpdateCrdEip(key, v4ip, v6ip, mac, natGwDp string) eip.Spec.V6ip = v6ip eip.Spec.NatGwDp = natGwDp if _, err := c.config.KubeOvnClient.KubeovnV1().IptablesEIPs().Update(context.Background(), eip, metav1.UpdateOptions{}); err != nil { - errMsg := fmt.Errorf("failed to update eip crd %s, %v", key, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to update eip crd %s, %v", key, err) + klog.Error(err) + return err } if eip.Status.IP == "" { // eip is ip holder, not support change ip @@ -565,6 +572,7 @@ func (c *Controller) createOrUpdateCrdEip(key, v4ip, v6ip, mac, natGwDp string) eip.Status.Ready = true bytes, err := eip.Status.Bytes() if err != nil { + klog.Error(err) return err } if _, err = c.config.KubeOvnClient.KubeovnV1().IptablesEIPs().Patch(context.Background(), key, types.MergePatchType, @@ -593,6 +601,7 @@ func (c *Controller) createOrUpdateCrdEip(key, v4ip, v6ip, mac, natGwDp string) } if needUpdateLabel { if err := c.updateIptableLabels(eip.Name, op, "eip", eip.Labels); err != nil { + klog.Error(err) return err } } @@ -602,6 +611,7 @@ func (c *Controller) createOrUpdateCrdEip(key, v4ip, v6ip, mac, natGwDp string) } eip.Annotations[util.VpcNatAnnotation] = "" if err := c.updateIptableAnnotations(eip.Name, op, "eip", eip.Annotations); err != nil { + klog.Error(err) return err } } @@ -619,6 +629,7 @@ func (c *Controller) handleAddIptablesEipFinalizer(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if cachedIptablesEip.DeletionTimestamp.IsZero() { @@ -650,6 +661,7 @@ func (c *Controller) handleDelIptablesEipFinalizer(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if len(cachedIptablesEip.Finalizers) == 0 { @@ -679,12 +691,14 @@ func (c *Controller) patchEipIP(key, v4ip string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } eip := oriEip.DeepCopy() eip.Status.IP = v4ip bytes, err := eip.Status.Bytes() if err != nil { + klog.Error(err) return err } if _, err = c.config.KubeOvnClient.KubeovnV1().IptablesEIPs().Patch(context.Background(), key, types.MergePatchType, @@ -704,6 +718,7 @@ func (c *Controller) patchEipStatus(key, v4ip, redo, nat string, ready bool) err if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } eip := oriEip.DeepCopy() @@ -730,6 +745,7 @@ func (c *Controller) patchEipStatus(key, v4ip, redo, nat string, ready bool) err if changed { bytes, err := eip.Status.Bytes() if err != nil { + klog.Error(err) return err } if _, err = c.config.KubeOvnClient.KubeovnV1().IptablesEIPs().Patch(context.Background(), key, types.MergePatchType, @@ -750,6 +766,7 @@ func (c *Controller) patchEipNat(key, nat string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if oriEip.Status.Nat == nat { @@ -779,6 +796,7 @@ func (c *Controller) patchResetEipStatusNat(key, nat string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } eip := oriEip.DeepCopy() @@ -786,6 +804,7 @@ func (c *Controller) patchResetEipStatusNat(key, nat string) error { eip.Status.Nat = nat bytes, err := eip.Status.Bytes() if err != nil { + klog.Error(err) return err } if _, err = c.config.KubeOvnClient.KubeovnV1().IptablesEIPs().Patch(context.Background(), key, types.MergePatchType, @@ -805,6 +824,7 @@ func (c *Controller) natLabelEip(eipName, natName string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } eip := oriEip.DeepCopy() @@ -825,6 +845,7 @@ func (c *Controller) natLabelEip(eipName, natName string) error { } if needUpdateLabel { if err := c.updateIptableLabels(eip.Name, op, "eip", eip.Labels); err != nil { + klog.Error(err) return err } } @@ -842,8 +863,9 @@ func (c *Controller) natLabelEip(eipName, natName string) error { } if needUpdateAnno { if err := c.updateIptableAnnotations(eip.Name, op, "eip", eip.Annotations); err != nil { + klog.Error(err) return err } } - return err + return nil } diff --git a/pkg/controller/vpc_nat_gw_nat.go b/pkg/controller/vpc_nat_gw_nat.go index 6e42c9e95b4..dca0156c618 100644 --- a/pkg/controller/vpc_nat_gw_nat.go +++ b/pkg/controller/vpc_nat_gw_nat.go @@ -495,6 +495,7 @@ func (c *Controller) handleAddIptablesFip(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if fip.Status.Ready && fip.Status.V4ip != "" { @@ -515,6 +516,7 @@ func (c *Controller) handleAddIptablesFip(key string) error { if eip.Status.Nat != "" && eip.Status.Nat != util.FipUsingEip { // eip is in use by other nat err = fmt.Errorf("failed to create fip %s, eip '%s' is used by other nat %s", key, eipName, eip.Status.Nat) + klog.Error(err) return err } @@ -522,6 +524,7 @@ func (c *Controller) handleAddIptablesFip(key string) error { eip.Annotations[util.VpcNatAnnotation] != "" && eip.Annotations[util.VpcNatAnnotation] != fip.Name { err = fmt.Errorf("failed to create fip %s, eip '%s' is used by other fip %s", key, eipName, eip.Annotations[util.VpcNatAnnotation]) + klog.Error(err) return err } @@ -563,6 +566,7 @@ func (c *Controller) handleUpdateIptablesFip(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } // should delete @@ -606,6 +610,7 @@ func (c *Controller) handleUpdateIptablesFip(key string) error { eip.Annotations[util.VpcAnnotation] != "" && eip.Annotations[util.VpcAnnotation] != cachedFip.Name { err = fmt.Errorf("failed to update fip %s, eip '%s' is used by other fip %s", key, eipName, eip.Annotations[util.VpcAnnotation]) + klog.Error(err) return err } // fip change eip @@ -677,6 +682,7 @@ func (c *Controller) handleAddIptablesDnatRule(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if dnat.Status.Ready && dnat.Status.V4ip != "" { @@ -700,6 +706,7 @@ func (c *Controller) handleAddIptablesDnatRule(key string) error { return err } if dup, err := c.isDnatDuplicated(eip.Spec.NatGwDp, eipName, dnat.Name, dnat.Spec.ExternalPort); dup || err != nil { + klog.Error(err) return err } // create nat @@ -742,6 +749,7 @@ func (c *Controller) handleUpdateIptablesDnatRule(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } // should delete @@ -776,6 +784,7 @@ func (c *Controller) handleUpdateIptablesDnatRule(key string) error { if eip.Status.Nat != "" && eip.Status.Nat != "dnat" { // eip is in use by other nat err = fmt.Errorf("failed to update dnat %s, eip '%s' is used by nat %s", key, eipName, eip.Status.Nat) + klog.Error(err) return err } if dup, err := c.isDnatDuplicated(cachedDnat.Status.NatGwDp, eipName, cachedDnat.Name, cachedDnat.Spec.ExternalPort); dup || err != nil { @@ -861,6 +870,7 @@ func (c *Controller) handleAddIptablesSnatRule(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if snat.Status.Ready && snat.Status.V4ip != "" { @@ -881,6 +891,7 @@ func (c *Controller) handleAddIptablesSnatRule(key string) error { if eip.Status.Nat != "" && eip.Status.Nat != "snat" { // eip is in use by other nat err = fmt.Errorf("failed to create snat %s, eip '%s' is used by nat '%s'", key, eipName, eip.Status.Nat) + klog.Error(err) return err } // create snat @@ -927,11 +938,13 @@ func (c *Controller) handleUpdateIptablesSnatRule(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } v4Cidr, _ := util.SplitStringIP(cachedSnat.Spec.InternalCIDR) if v4Cidr == "" { err = fmt.Errorf("failed to get snat v4 internal cidr, original cidr is %s", cachedSnat.Spec.InternalCIDR) + klog.Error(err) return err } // should delete @@ -964,6 +977,7 @@ func (c *Controller) handleUpdateIptablesSnatRule(key string) error { if eip.Status.Nat != "" && eip.Status.Nat != "snat" { // eip is in use by other nat err = fmt.Errorf("failed to update snat %s, eip '%s' is used by %s", key, eipName, eip.Status.Nat) + klog.Error(err) return err } // add or update should make sure vpc nat enabled @@ -1031,6 +1045,7 @@ func (c *Controller) handleAddIptablesFipFinalizer(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if cachedIptablesFip.DeletionTimestamp.IsZero() { @@ -1062,6 +1077,7 @@ func (c *Controller) handleDelIptablesFipFinalizer(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if len(cachedIptablesFip.Finalizers) == 0 { @@ -1091,6 +1107,7 @@ func (c *Controller) handleAddIptablesDnatFinalizer(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if cachedIptablesDnat.DeletionTimestamp.IsZero() { @@ -1122,6 +1139,7 @@ func (c *Controller) handleDelIptablesDnatFinalizer(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if len(cachedIptablesDnat.Finalizers) == 0 { @@ -1150,6 +1168,7 @@ func (c *Controller) patchFipLabel(key string, eip *kubeovnv1.IptablesEIP) error if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } fip := oriFip.DeepCopy() @@ -1168,6 +1187,7 @@ func (c *Controller) patchFipLabel(key string, eip *kubeovnv1.IptablesEIP) error } if needUpdateLabel { if err := c.updateIptableLabels(fip.Name, op, util.FipUsingEip, fip.Labels); err != nil { + klog.Error(err) return err } } @@ -1185,6 +1205,7 @@ func (c *Controller) patchFipLabel(key string, eip *kubeovnv1.IptablesEIP) error } if needUpdateAnno { if err := c.updateIptableAnnotations(fip.Name, op, util.FipUsingEip, fip.Annotations); err != nil { + klog.Error(err) return err } } @@ -1197,6 +1218,7 @@ func (c *Controller) handleAddIptablesSnatFinalizer(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if cachedIptablesSnat.DeletionTimestamp.IsZero() { @@ -1228,6 +1250,7 @@ func (c *Controller) handleDelIptablesSnatFinalizer(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if len(cachedIptablesSnat.Finalizers) == 0 { @@ -1257,6 +1280,7 @@ func (c *Controller) patchFipStatus(key, v4ip, v6ip, natGwDp, redo string, ready if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } fip := oriFip.DeepCopy() @@ -1280,6 +1304,7 @@ func (c *Controller) patchFipStatus(key, v4ip, v6ip, natGwDp, redo string, ready if changed { bytes, err := fip.Status.Bytes() if err != nil { + klog.Error(err) return err } if _, err = c.config.KubeOvnClient.KubeovnV1().IptablesFIPRules().Patch(context.Background(), fip.Name, @@ -1300,19 +1325,22 @@ func (c *Controller) redoFip(key, redo string, eipReady bool) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if redo != "" && redo != fip.Status.Redo { if !eipReady { if err = c.patchEipStatus(fip.Spec.EIP, "", redo, "", false); err != nil { + klog.Error(err) return err } } if err = c.patchFipStatus(key, "", "", "", redo, false); err != nil { + klog.Error(err) return err } } - return err + return nil } func (c *Controller) patchDnatLabel(key string, eip *kubeovnv1.IptablesEIP) error { @@ -1321,6 +1349,7 @@ func (c *Controller) patchDnatLabel(key string, eip *kubeovnv1.IptablesEIP) erro if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } dnat := oriDnat.DeepCopy() @@ -1341,6 +1370,7 @@ func (c *Controller) patchDnatLabel(key string, eip *kubeovnv1.IptablesEIP) erro } if needUpdateLabel { if err := c.updateIptableLabels(dnat.Name, op, util.DnatUsingEip, dnat.Labels); err != nil { + klog.Error(err) return err } } @@ -1358,6 +1388,7 @@ func (c *Controller) patchDnatLabel(key string, eip *kubeovnv1.IptablesEIP) erro } if needUpdateAnno { if err := c.updateIptableAnnotations(dnat.Name, op, util.DnatUsingEip, dnat.Annotations); err != nil { + klog.Error(err) return err } } @@ -1370,6 +1401,7 @@ func (c *Controller) patchDnatStatus(key, v4ip, v6ip, natGwDp, redo string, read if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } var changed bool @@ -1408,6 +1440,7 @@ func (c *Controller) patchDnatStatus(key, v4ip, v6ip, natGwDp, redo string, read if changed { bytes, err := dnat.Status.Bytes() if err != nil { + klog.Error(err) return err } if _, err = c.config.KubeOvnClient.KubeovnV1().IptablesDnatRules().Patch(context.Background(), dnat.Name, @@ -1428,15 +1461,18 @@ func (c *Controller) redoDnat(key, redo string, eipReady bool) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if redo != "" && redo != dnat.Status.Redo { if !eipReady { if err = c.patchEipStatus(dnat.Spec.EIP, "", redo, "", false); err != nil { + klog.Error(err) return err } } if err = c.patchDnatStatus(key, "", "", "", redo, false); err != nil { + klog.Error(err) return err } } @@ -1449,6 +1485,7 @@ func (c *Controller) patchSnatLabel(key string, eip *kubeovnv1.IptablesEIP) erro if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } snat := oriSnat.DeepCopy() @@ -1467,6 +1504,7 @@ func (c *Controller) patchSnatLabel(key string, eip *kubeovnv1.IptablesEIP) erro } if needUpdateLabel { if err := c.updateIptableLabels(snat.Name, op, util.SnatUsingEip, snat.Labels); err != nil { + klog.Error(err) return err } } @@ -1484,6 +1522,7 @@ func (c *Controller) patchSnatLabel(key string, eip *kubeovnv1.IptablesEIP) erro } if needUpdateAnno { if err := c.updateIptableAnnotations(snat.Name, op, util.SnatUsingEip, snat.Annotations); err != nil { + klog.Error(err) return err } } @@ -1496,6 +1535,7 @@ func (c *Controller) patchSnatStatus(key, v4ip, v6ip, natGwDp, redo string, read if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } snat := oriSnat.DeepCopy() @@ -1518,6 +1558,7 @@ func (c *Controller) patchSnatStatus(key, v4ip, v6ip, natGwDp, redo string, read if changed { bytes, err := snat.Status.Bytes() if err != nil { + klog.Error(err) return err } if _, err = c.config.KubeOvnClient.KubeovnV1().IptablesSnatRules().Patch(context.Background(), snat.Name, @@ -1538,15 +1579,18 @@ func (c *Controller) redoSnat(key, redo string, eipReady bool) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } if redo != "" && redo != snat.Status.Redo { if !eipReady { if err = c.patchEipStatus(snat.Spec.EIP, "", redo, "", false); err != nil { + klog.Error(err) return err } } if err = c.patchSnatStatus(key, "", "", "", redo, false); err != nil { + klog.Error(err) return err } } @@ -1556,6 +1600,7 @@ func (c *Controller) redoSnat(key, redo string, eipReady bool) error { func (c *Controller) createFipInPod(dp, v4ip, internalIP string) error { gwPod, err := c.getNatGwPod(dp) if err != nil { + klog.Error(err) return err } var addRules []string @@ -1574,6 +1619,7 @@ func (c *Controller) deleteFipInPod(dp, v4ip, internalIP string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } // del nat @@ -1610,6 +1656,7 @@ func (c *Controller) deleteDnatInPod(dp, protocol, v4ip, internalIp, externalPor if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } @@ -1656,6 +1703,7 @@ func (c *Controller) deleteSnatInPod(dp, v4ip, internalCIDR string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } // del nat @@ -1710,6 +1758,7 @@ func (c *Controller) isDnatDuplicated(gwName, eipName, dnatName, externalPort st }) if err != nil { if !k8serrors.IsNotFound(err) { + klog.Error(err) return false, err } } @@ -1738,14 +1787,14 @@ func (c *Controller) createOrUpdateCrdFip(key, eipName, internalIp string) error InternalIp: internalIp, }, }, metav1.CreateOptions{}); err != nil { - errMsg := fmt.Errorf("failed to create fip crd %s, %v", key, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to create fip crd %s, %v", key, err) + klog.Error(err) + return err } } else { - errMsg := fmt.Errorf("failed to get fip crd %s, %v", key, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to get fip crd %s, %v", key, err) + klog.Error(err) + return err } } else { klog.V(3).Infof("update fip cr %s", key) @@ -1754,9 +1803,9 @@ func (c *Controller) createOrUpdateCrdFip(key, eipName, internalIp string) error fip.Spec.EIP = eipName fip.Spec.InternalIp = internalIp if _, err := c.config.KubeOvnClient.KubeovnV1().IptablesFIPRules().Update(context.Background(), fip, metav1.UpdateOptions{}); err != nil { - errMsg := fmt.Errorf("failed to update eip crd %s, %v", key, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to update eip crd %s, %v", key, err) + klog.Error(err) + return err } } } @@ -1813,6 +1862,7 @@ func (c *Controller) patchIptableInfo(name, natType, patchPayload string) error if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } return nil diff --git a/pkg/daemon/config.go b/pkg/daemon/config.go index 24520bdca47..d3aa1727478 100644 --- a/pkg/daemon/config.go +++ b/pkg/daemon/config.go @@ -170,9 +170,11 @@ func (config *Configuration) Init(nicBridgeMappings map[string]string) error { } if err := config.initKubeClient(); err != nil { + klog.Error(err) return err } if err := config.initNicConfig(nicBridgeMappings); err != nil { + klog.Error(err) return err } diff --git a/pkg/daemon/config_windows.go b/pkg/daemon/config_windows.go index 9530e216e6d..3acb37358fb 100644 --- a/pkg/daemon/config_windows.go +++ b/pkg/daemon/config_windows.go @@ -60,6 +60,7 @@ func (config *Configuration) initRuntimeConfig(node *corev1.Node) error { // create hns network if err = config.createHnsNetwork(util.HnsNetwork, config.Iface, util.CheckProtocol(nodeIP)); err != nil { + klog.Error(err) return err } @@ -70,11 +71,13 @@ func (config *Configuration) initRuntimeConfig(node *corev1.Node) error { `Rename-NetAdapter -name "vEthernet (br-provider)" -NewName br-provider;`, } if _, err = util.Powershell(strings.Join(commands[:], " ")); err != nil { + klog.Error(err) return err } } if _, err = util.Powershell(fmt.Sprintf(`Enable-VMSwitchExtension "Open vSwitch Extension" "%s"`, util.HnsNetwork)); err != nil { + klog.Error(err) return err } diff --git a/pkg/daemon/controller.go b/pkg/daemon/controller.go index 30b82040f89..1ad2f689129 100644 --- a/pkg/daemon/controller.go +++ b/pkg/daemon/controller.go @@ -226,6 +226,7 @@ func (c *Controller) processNextDeleteProviderNetworkWorkItem() bool { func (c *Controller) handleAddOrUpdateProviderNetwork(key string) error { node, err := c.nodesLister.Get(c.config.NodeName) if err != nil { + klog.Error(err) return err } pn, err := c.providerNetworksLister.Get(key) @@ -233,6 +234,7 @@ func (c *Controller) handleAddOrUpdateProviderNetwork(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } @@ -269,6 +271,7 @@ func (c *Controller) initProviderNetwork(pn *kubeovnv1.ProviderNetwork, node *v1 } } c.recordProviderNetworkErr(pn.Name, err.Error()) + klog.Error(err) return err } @@ -362,13 +365,13 @@ func (c *Controller) cleanProviderNetwork(pn *kubeovnv1.ProviderNetwork, node *v node.Labels[fmt.Sprintf(util.ProviderNetworkExcludeTemplate, pn.Name)] = "true" raw, _ := json.Marshal(node.Labels) patchPayload := fmt.Sprintf(patchPayloadTemplate, op, raw) - _, err = c.config.KubeClient.CoreV1().Nodes().Patch(context.Background(), node.Name, types.JSONPatchType, []byte(patchPayload), metav1.PatchOptions{}) - if err != nil { + if _, err = c.config.KubeClient.CoreV1().Nodes().Patch(context.Background(), node.Name, types.JSONPatchType, []byte(patchPayload), metav1.PatchOptions{}); err != nil { klog.Errorf("failed to patch node %s: %v", node.Name, err) return err } if err = c.ovsCleanProviderNetwork(pn.Name); err != nil { + klog.Error(err) return err } @@ -377,11 +380,13 @@ func (c *Controller) cleanProviderNetwork(pn *kubeovnv1.ProviderNetwork, node *v func (c *Controller) handleDeleteProviderNetwork(pn *kubeovnv1.ProviderNetwork) error { if err := c.ovsCleanProviderNetwork(pn.Name); err != nil { + klog.Error(err) return err } node, err := c.nodesLister.Get(c.config.NodeName) if err != nil { + klog.Error(err) return err } if len(node.Labels) == 0 { diff --git a/pkg/daemon/controller_linux.go b/pkg/daemon/controller_linux.go index 54d6c865b40..4cb7353ada8 100644 --- a/pkg/daemon/controller_linux.go +++ b/pkg/daemon/controller_linux.go @@ -79,11 +79,13 @@ func (c *Controller) initRuntime() error { if c.protocol == kubeovnv1.ProtocolIPv4 || c.protocol == kubeovnv1.ProtocolDual { ipt, err := iptables.NewWithProtocol(iptables.ProtocolIPv4) if err != nil { + klog.Error(err) return err } c.iptables[kubeovnv1.ProtocolIPv4] = ipt if c.iptablesObsolete != nil { if ipt, err = iptables.NewWithProtocolAndMode(iptables.ProtocolIPv4, "legacy"); err != nil { + klog.Error(err) return err } c.iptablesObsolete[kubeovnv1.ProtocolIPv4] = ipt @@ -93,11 +95,13 @@ func (c *Controller) initRuntime() error { if c.protocol == kubeovnv1.ProtocolIPv6 || c.protocol == kubeovnv1.ProtocolDual { ipt, err := iptables.NewWithProtocol(iptables.ProtocolIPv6) if err != nil { + klog.Error(err) return err } c.iptables[kubeovnv1.ProtocolIPv6] = ipt if c.iptablesObsolete != nil { if ipt, err = iptables.NewWithProtocolAndMode(iptables.ProtocolIPv6, "legacy"); err != nil { + klog.Error(err) return err } c.iptablesObsolete[kubeovnv1.ProtocolIPv6] = ipt @@ -217,6 +221,7 @@ func (c *Controller) reconcileRouters(event *subnetEvent) error { existRoutes, err := getNicExistRoutes(nic, gateway) if err != nil { + klog.Error(err) return err } @@ -453,6 +458,7 @@ func (c *Controller) handlePod(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } @@ -471,21 +477,25 @@ func (c *Controller) handlePod(key string) error { ifaceID := ovs.PodNameToPortName(podName, pod.Namespace, util.OvnProvider) err = ovs.SetInterfaceBandwidth(podName, pod.Namespace, ifaceID, pod.Annotations[util.EgressRateAnnotation], pod.Annotations[util.IngressRateAnnotation]) if err != nil { + klog.Error(err) return err } err = ovs.ConfigInterfaceMirror(c.config.EnableMirror, pod.Annotations[util.MirrorControlAnnotation], ifaceID) if err != nil { + klog.Error(err) return err } // set linux-netem qos err = ovs.SetNetemQos(podName, pod.Namespace, ifaceID, pod.Annotations[util.NetemQosLatencyAnnotation], pod.Annotations[util.NetemQosLimitAnnotation], pod.Annotations[util.NetemQosLossAnnotation]) if err != nil { + klog.Error(err) return err } // set multus-nic bandwidth attachNets, err := util.ParsePodNetworkAnnotation(pod.Annotations[util.AttachmentNetworkAnnotation], pod.Namespace) if err != nil { + klog.Error(err) return err } for _, multiNet := range attachNets { @@ -498,14 +508,17 @@ func (c *Controller) handlePod(key string) error { err = ovs.SetInterfaceBandwidth(podName, pod.Namespace, ifaceID, pod.Annotations[fmt.Sprintf(util.EgressRateAnnotationTemplate, provider)], pod.Annotations[fmt.Sprintf(util.IngressRateAnnotationTemplate, provider)]) if err != nil { + klog.Error(err) return err } err = ovs.ConfigInterfaceMirror(c.config.EnableMirror, pod.Annotations[fmt.Sprintf(util.MirrorControlAnnotationTemplate, provider)], ifaceID) if err != nil { + klog.Error(err) return err } err = ovs.SetNetemQos(podName, pod.Namespace, ifaceID, pod.Annotations[fmt.Sprintf(util.NetemQosLatencyAnnotationTemplate, provider)], pod.Annotations[fmt.Sprintf(util.NetemQosLimitAnnotationTemplate, provider)], pod.Annotations[fmt.Sprintf(util.NetemQosLossAnnotationTemplate, provider)]) if err != nil { + klog.Error(err) return err } } diff --git a/pkg/daemon/controller_windows.go b/pkg/daemon/controller_windows.go index 0364778c9a1..f65f5632cd4 100644 --- a/pkg/daemon/controller_windows.go +++ b/pkg/daemon/controller_windows.go @@ -170,6 +170,7 @@ func (c *Controller) handlePod(key string) error { if k8serrors.IsNotFound(err) { return nil } + klog.Error(err) return err } @@ -188,16 +189,19 @@ func (c *Controller) handlePod(key string) error { ifaceID := ovs.PodNameToPortName(podName, pod.Namespace, util.OvnProvider) err = ovs.SetInterfaceBandwidth(podName, pod.Namespace, ifaceID, pod.Annotations[util.EgressRateAnnotation], pod.Annotations[util.IngressRateAnnotation]) if err != nil { + klog.Error(err) return err } err = ovs.ConfigInterfaceMirror(c.config.EnableMirror, pod.Annotations[util.MirrorControlAnnotation], ifaceID) if err != nil { + klog.Error(err) return err } // set multus-nic bandwidth attachNets, err := util.ParsePodNetworkAnnotation(pod.Annotations[util.AttachmentNetworkAnnotation], pod.Namespace) if err != nil { + klog.Error(err) return err } for _, multiNet := range attachNets { @@ -209,14 +213,17 @@ func (c *Controller) handlePod(key string) error { ifaceID = ovs.PodNameToPortName(podName, pod.Namespace, provider) err = ovs.SetInterfaceBandwidth(podName, pod.Namespace, ifaceID, pod.Annotations[fmt.Sprintf(util.EgressRateAnnotationTemplate, provider)], pod.Annotations[fmt.Sprintf(util.IngressRateAnnotationTemplate, provider)]) if err != nil { + klog.Error(err) return err } err = ovs.ConfigInterfaceMirror(c.config.EnableMirror, pod.Annotations[fmt.Sprintf(util.MirrorControlAnnotationTemplate, provider)], ifaceID) if err != nil { + klog.Error(err) return err } err = ovs.SetNetemQos(podName, pod.Namespace, ifaceID, pod.Annotations[fmt.Sprintf(util.NetemQosLatencyAnnotationTemplate, provider)], pod.Annotations[fmt.Sprintf(util.NetemQosLimitAnnotationTemplate, provider)], pod.Annotations[fmt.Sprintf(util.NetemQosLossAnnotationTemplate, provider)]) if err != nil { + klog.Error(err) return err } } diff --git a/pkg/daemon/gateway_linux.go b/pkg/daemon/gateway_linux.go index 3cfe8ca42c5..5cea806bd9b 100644 --- a/pkg/daemon/gateway_linux.go +++ b/pkg/daemon/gateway_linux.go @@ -741,9 +741,11 @@ func (c *Controller) cleanObsoleteIptablesRules(protocol string, rules []util.IP } if err := clearObsoleteIptablesChain(ipt, NAT, OvnPrerouting, Prerouting); err != nil { + klog.Error(err) return err } if err := clearObsoleteIptablesChain(ipt, NAT, OvnPostrouting, Postrouting); err != nil { + klog.Error(err) return err } @@ -841,6 +843,7 @@ func (c *Controller) setExGateway() error { } else { if _, err := ovs.Exec( ovs.IfExists, "del-br", externalBridge); err != nil { + klog.Error(err) return fmt.Errorf("failed to disable external gateway, %v", err) } } diff --git a/pkg/daemon/init.go b/pkg/daemon/init.go index 8477d643931..538ecbd2d9d 100644 --- a/pkg/daemon/init.go +++ b/pkg/daemon/init.go @@ -79,6 +79,7 @@ func InitNodeGateway(config *Configuration) error { } mac, err := net.ParseMAC(macAddr) if err != nil { + klog.Error(err) return fmt.Errorf("failed to parse mac %s %v", mac, err) } @@ -112,25 +113,25 @@ func (c *Controller) ovsInitProviderNetwork(provider, nic string, exchangeLinkNa } if err := c.configExternalBridge(provider, brName, nic, exchangeLinkName, macLearningFallback); err != nil { - errMsg := fmt.Errorf("failed to create and configure external bridge %s: %v", brName, err) - klog.Error(errMsg) - return 0, errMsg + err := fmt.Errorf("failed to create and configure external bridge %s: %v", brName, err) + klog.Error(err) + return 0, err } // init provider chassis mac if err := initProviderChassisMac(provider); err != nil { - errMsg := fmt.Errorf("failed to init chassis mac for provider %s, %v", provider, err) - klog.Error(errMsg) - return 0, errMsg + err := fmt.Errorf("failed to init chassis mac for provider %s, %v", provider, err) + klog.Error(err) + return 0, err } // add host nic to the external bridge klog.Infof("config provider nic %s on bridge %s", nic, brName) mtu, err := c.configProviderNic(nic, brName) if err != nil { - errMsg := fmt.Errorf("failed to add nic %s to external bridge %s: %v", nic, brName, err) - klog.Error(errMsg) - return 0, errMsg + err := fmt.Errorf("failed to add nic %s to external bridge %s: %v", nic, brName, err) + klog.Error(err) + return 0, err } return mtu, nil @@ -139,6 +140,7 @@ func (c *Controller) ovsInitProviderNetwork(provider, nic string, exchangeLinkNa func (c *Controller) ovsCleanProviderNetwork(provider string) error { mappings, err := getOvnMappings("ovn-bridge-mappings") if err != nil { + klog.Error(err) return err } @@ -174,9 +176,9 @@ func (c *Controller) ovsCleanProviderNetwork(provider string) error { } klog.V(3).Infof("removing ovs port %s from bridge %s", port, brName) if err = c.removeProviderNic(port, brName); err != nil { - errMsg := fmt.Errorf("failed to remove port %s from external bridge %s: %v", port, brName, err) - klog.Error(errMsg) - return errMsg + err := fmt.Errorf("failed to remove port %s from external bridge %s: %v", port, brName, err) + klog.Error(err) + return err } klog.V(3).Infof("ovs port %s has been removed from bridge %s", port, brName) } @@ -184,6 +186,7 @@ func (c *Controller) ovsCleanProviderNetwork(provider string) error { // remove OVS bridge if output, err = ovs.Exec(ovs.IfExists, "del-br", brName); err != nil { + klog.Error(err) return fmt.Errorf("failed to remove OVS bridge %s, %v: %q", brName, err, output) } klog.V(3).Infof("ovs bridge %s has been deleted", brName) @@ -196,9 +199,11 @@ func (c *Controller) ovsCleanProviderNetwork(provider string) error { } if err := removeOvnMapping("ovn-chassis-mac-mappings", provider); err != nil { + klog.Error(err) return err } if err := removeOvnMapping("ovn-bridge-mappings", provider); err != nil { + klog.Error(err) return err } diff --git a/pkg/daemon/ovs.go b/pkg/daemon/ovs.go index 43e521df662..3519d306483 100644 --- a/pkg/daemon/ovs.go +++ b/pkg/daemon/ovs.go @@ -46,6 +46,7 @@ func pingGateway(gw, src string, verbose bool, maxRetry int) error { func configureGlobalMirror(portName string, mtu int) error { nicExist, err := linkExists(portName) if err != nil { + klog.Error(err) return err } @@ -78,6 +79,7 @@ func configureGlobalMirror(portName string, mtu int) error { func configureEmptyMirror(portName string, mtu int) error { nicExist, err := linkExists(portName) if err != nil { + klog.Error(err) return err } @@ -163,6 +165,7 @@ func setOvnMappings(name string, mappings map[string]string) error { func addOvnMapping(name, key, value string, overwrite bool) error { mappings, err := getOvnMappings(name) if err != nil { + klog.Error(err) return err } @@ -172,6 +175,7 @@ func addOvnMapping(name, key, value string, overwrite bool) error { mappings[key] = value if err = setOvnMappings(name, mappings); err != nil { + klog.Error(err) return err } @@ -181,6 +185,7 @@ func addOvnMapping(name, key, value string, overwrite bool) error { func removeOvnMapping(name, key string) error { mappings, err := getOvnMappings(name) if err != nil { + klog.Error(err) return err } @@ -190,6 +195,7 @@ func removeOvnMapping(name, key string) error { return nil } if err = setOvnMappings(name, mappings); err != nil { + klog.Error(err) return err } diff --git a/pkg/daemon/ovs_windows.go b/pkg/daemon/ovs_windows.go index 8a5d03087e2..3fe3fa0356e 100644 --- a/pkg/daemon/ovs_windows.go +++ b/pkg/daemon/ovs_windows.go @@ -125,6 +125,7 @@ func (csh cniServerHandler) configureNic(podName, podNamespace, provider, netns, } if err = ovs.SetInterfaceBandwidth(podName, podNamespace, ifaceID, egress, ingress); err != nil { + klog.Error(err) return err } @@ -207,11 +208,13 @@ func configureNic(name, ip string, mac net.HardwareAddr, mtu int) error { for addr := range addrToDel { if err = util.RemoveNetIPAddress(adapter.InterfaceIndex, addr); err != nil { + klog.Error(err) return err } } for addr := range addrToAdd { if err = util.NewNetIPAddress(adapter.InterfaceIndex, addr); err != nil { + klog.Error(err) return err } } @@ -243,6 +246,7 @@ func waitNetworkReady(nic, ipAddr, gateway string, underlayGateway, verbose bool src := strings.Split(ips[i], "/")[0] if !underlayGateway || util.CheckProtocol(gw) == kubeovnv1.ProtocolIPv6 { if err := pingGateway(gw, src, verbose, maxRetry); err != nil { + klog.Error(err) return err } } @@ -262,6 +266,7 @@ func configureNodeNic(portName, ip, gw string, macAddr net.HardwareAddr, mtu int } if err = configureNic(util.NodeNic, ip, macAddr, mtu); err != nil { + klog.Error(err) return err }