resolve review problem

kubeovn · Aug 27, 2020 · c5ca0b1 · c5ca0b1
1 parent e779a09
commit c5ca0b1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -330,6 +330,7 @@ func (c *Controller) startWorkers(stopCh <-chan struct{}) {
 		go wait.Until(c.runDeleteNodeWorker, time.Second, stopCh)
 	}
 	for {
+		ready := true
 		time.Sleep(3 * time.Second)
 		nodes, err := c.nodesLister.List(labels.Everything())
 		if err != nil {
@@ -338,10 +339,13 @@ func (c *Controller) startWorkers(stopCh <-chan struct{}) {
 		for _, node := range nodes {
 			if node.Annotations[util.AllocatedAnnotation] != "true" {
 				klog.Infof("wait node %s annotation ready", node.Name)
-				continue
+				ready = false
+				break
 			}
 		}
-		break
+		if ready == true {
+			break
+		}
 	}
 
 	// run in a single worker to avoid subnet cidr conflict

diff --git a/pkg/controller/gc.go b/pkg/controller/gc.go
@@ -2,15 +2,16 @@ package controller
 
 import (
 	"fmt"
+	"strings"
+	"time"
+
 	"github.com/alauda/kube-ovn/pkg/ovs"
 	"github.com/alauda/kube-ovn/pkg/util"
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/klog"
-	"strings"
-	"time"
 )
 
 var lastNoPodLSP map[string]bool
@@ -181,9 +182,9 @@ func (c *Controller) gcLoadBalancer() error {
 				}
 			} else {
 				if svc.Spec.SessionAffinity == corev1.ServiceAffinityClientIP {
-					tcpSessionVips = append(udpSessionVips, fmt.Sprintf("%s:%d", ip, port.Port))
+					udpSessionVips = append(udpSessionVips, fmt.Sprintf("%s:%d", ip, port.Port))
 				} else {
-					tcpVips = append(udpVips, fmt.Sprintf("%s:%d", ip, port.Port))
+					udpVips = append(udpVips, fmt.Sprintf("%s:%d", ip, port.Port))
 				}
 			}
 		}

diff --git a/pkg/controller/init.go b/pkg/controller/init.go
@@ -41,7 +41,7 @@ func (c *Controller) InitOVN() error {
 	return nil
 }
 
-// InitDefaultLogicalSwitch int the default logical switch for ovn network
+// InitDefaultLogicalSwitch init the default logical switch for ovn network
 func (c *Controller) initDefaultLogicalSwitch() error {
 	_, err := c.config.KubeOvnClient.KubeovnV1().Subnets().Get(c.config.DefaultLogicalSwitch, v1.GetOptions{})
 	if err == nil {