LBwacher minor fixes (#39)

* fix: lb-watcher: use only pods with same seletors and in the same namespace with service * fix: lb-watcher: patch IP in CR after creating or updating the l4lb in automatic mode * deploy: remove default 'resources' in manifest * Preparation for new release Co-authored-by: Artashes Balabekyan <[email protected]>
netrisai · Aug 26, 2021 · 49c0c66 · 49c0c66
1 parent 920acbc
commit 49c0c66
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 48 deletions.
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -30,11 +30,4 @@ spec:
         image: controller:latest
         imagePullPolicy: "Always"
         name: manager
-        resources:
-          limits:
-            cpu: 100m
-            memory: 30Mi
-          requests:
-            cpu: 100m
-            memory: 20Mi
       terminationGracePeriodSeconds: 10
diff --git a/controllers/l4lbmeta_controller.go b/controllers/l4lbmeta_controller.go
@@ -255,13 +255,12 @@ func (u *uniReconciler) updateL4LBIfNeccesarry(l4lbCR *v1alpha1.L4LB, l4lbMeta v
 		l4lbCR.Spec.Frontend.IP = l4lbMeta.Spec.IP
 		shouldUpdateCR = true
 	}
-	if l4lbCR.Spec.OwnerTenant == "" || l4lbCR.Spec.Site == "" {
+	if l4lbCR.Spec.OwnerTenant == "" || l4lbCR.Spec.Site == "" || l4lbCR.Spec.Frontend.IP == "" {
+		_ = u.NStorage.L4LBStorage.Download()
 		if updatedL4LB, ok := u.NStorage.L4LBStorage.FindByID(l4lbMeta.Spec.ID); ok {
 			l4lbCR.Spec.OwnerTenant = updatedL4LB.TenantName
 			l4lbCR.Spec.Site = updatedL4LB.SiteName
-			if l4lbCR.Spec.Frontend.IP == "" {
-				l4lbCR.Spec.Frontend.IP = updatedL4LB.IP
-			}
+			l4lbCR.Spec.Frontend.IP = updatedL4LB.IP
 			shouldUpdateCR = true
 		}
 	}

diff --git a/deploy/charts/netris-operator/Chart.yaml b/deploy/charts/netris-operator/Chart.yaml
@@ -15,12 +15,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.7
+version: 0.3.8
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: v0.4.5
+appVersion: v0.4.6
 home: https://github.com/netrisai/netris-operator
 icon: https://www.netris.ai/wp-content/uploads/2020/05/logo-600.png  # [todo] Change url to permalink
 keywords:

diff --git a/lbwatcher/lb_watcher.go b/lbwatcher/lb_watcher.go
@@ -29,7 +29,6 @@ import (
 	k8sv1alpha1 "github.com/netrisai/netris-operator/api/v1alpha1"
 	"github.com/netrisai/netris-operator/netrisstorage"
 	"go.uber.org/zap/zapcore"
-	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/record"
@@ -417,12 +416,6 @@ func (w *Watcher) generateLoadBalancers(clientset *kubernetes.Clientset, lbTimeo
 		return lbList, fmt.Errorf("{generateLoadBalancers} %s", err)
 	}
 
-	debugLogger.Info("Getting k8s pods...")
-	podList, err := getPods(clientset, "")
-	if err != nil {
-		return lbList, fmt.Errorf("{generateLoadBalancers} %s", err)
-	}
-
 	timeout, err := strconv.Atoi(lbTimeout)
 	if err != nil {
 		return lbList, fmt.Errorf("{generateLoadBalancers} %s", err)
@@ -435,21 +428,19 @@ func (w *Watcher) generateLoadBalancers(clientset *kubernetes.Clientset, lbTimeo
 
 	for _, svc := range serviceList.Items {
 		if svc.Spec.Type == "LoadBalancer" {
-			selectors := []selector{}
+			selectors := []string{}
 			hostIPs := map[string]int{}
 			for key, value := range svc.Spec.Selector {
-				selectors = append(selectors, selector{
-					Key:   key,
-					Value: value,
-				})
+				selectors = append(selectors, fmt.Sprintf("%s=%s", key, value))
 			}
 
-			pods := []v1.Pod{}
-			for _, sel := range selectors {
-				pods = append(pods, filterPodsBySelector(podList, sel.Key, sel.Value)...)
+			debugLogger.Info("Getting k8s pods...", "service", svc.Name, "namespace", svc.Namespace)
+			podList, err := getPodsByLabelSeector(clientset, svc.Namespace, strings.Join(selectors, ","))
+			if err != nil {
+				return lbList, fmt.Errorf("{generateLoadBalancers} %s", err)
 			}
 
-			for _, pod := range pods {
+			for _, pod := range podList.Items {
 				hostIPs[pod.Status.HostIP] = 1
 			}
 

diff --git a/lbwatcher/pods.go b/lbwatcher/pods.go
@@ -25,24 +25,15 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
-func getPods(clientset *kubernetes.Clientset, namespace string) (*v1.PodList, error) {
+func getPodsByLabelSeector(clientset *kubernetes.Clientset, namespace, selectors string) (*v1.PodList, error) {
 	ctx, cancel := context.WithTimeout(cntxt, contextTimeout)
 	defer cancel()
-	pods, err := clientset.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{})
+	listOptions := metav1.ListOptions{
+		LabelSelector: selectors,
+	}
+	pods, err := clientset.CoreV1().Pods(namespace).List(ctx, listOptions)
 	if err != nil {
 		return pods, fmt.Errorf("{getPods} %s", err)
 	}
 	return pods, nil
 }
-
-func filterPodsBySelector(pods *v1.PodList, selectorKey, selectorValue string) []v1.Pod {
-	filteredPods := []v1.Pod{}
-	for _, pod := range pods.Items {
-		for labelKey, labelValue := range pod.Labels {
-			if labelKey == selectorKey && labelValue == selectorValue {
-				filteredPods = append(filteredPods, pod)
-			}
-		}
-	}
-	return filteredPods
-}
diff --git a/lbwatcher/types.go b/lbwatcher/types.go
@@ -27,11 +27,6 @@ type Watcher struct {
 	MGR      manager.Manager
 }
 
-type selector struct {
-	Key   string
-	Value string
-}
-
 type lbIP struct {
 	Name      string
 	IP        string