LBwatcher: site detection (#30)

* feat: l4lb: find site for specified backend IP if it is not defined in CR

* fix: l4lb: error message

Co-authored-by: Artashes Balabekyan <[email protected]>

Author: pogossian

README.md

@@ -5,7 +5,6 @@
 [![](https://github.com/netrisai/netris-operator/workflows/Create%20release/badge.svg)](https://github.com/netrisai/netris-operator/actions)
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/netrisai)](https://artifacthub.io/packages/helm/netrisai/netris-operator)
 [![Go Report Card](https://goreportcard.com/badge/github.com/netrisai/netris-operator)](https://goreportcard.com/report/github.com/netrisai/netris-operator)
-[![Language](https://img.shields.io/badge/Language-Go-blue.svg)](https://golang.org/)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 

api/v1alpha1/l4lb_types.go

@@ -32,7 +32,7 @@ type L4LBSpec struct {
 
 	Check       L4LBCheck `json:"check,omitempty"`
 	OwnerTenant string    `json:"ownerTenant,omitempty"`
-	Site        string    `json:"site"`
+	Site        string    `json:"site,omitempty"`
 
 	// +kubebuilder:validation:Enum=tcp;udp
 	Protocol string `json:"protocol,omitempty"`

config/crd/bases/k8s.netris.ai_l4lbs.yaml

@@ -114,7 +114,6 @@ spec:
           required:
           - backend
           - frontend
-          - site
           type: object
         status:
           description: L4LBStatus defines the observed state of L4LB

controllers/l4lb_translations.go

@@ -39,12 +39,6 @@ func (r *L4LBReconciler) L4LBToL4LBMeta(l4lb *k8sv1alpha1.L4LB) (*k8sv1alpha1.L4
 	var timeout string
 	proto := "tcp"
 
-	if site, ok := NStorage.SitesStorage.FindByName(l4lb.Spec.Site); ok {
-		siteID = site.ID
-	} else {
-		return nil, fmt.Errorf("'%s' site not found", l4lb.Spec.Site)
-	}
-
 	l4lbMetaBackends := []k8sv1alpha1.L4LBMetaBackend{}
 	ipForTenant := ""
 
@@ -78,6 +72,22 @@ func (r *L4LBReconciler) L4LBToL4LBMeta(l4lb *k8sv1alpha1.L4LB) (*k8sv1alpha1.L4
 		tenantID = tenant.ID
 	}
 
+	if l4lb.Spec.Site == "" {
+		siteid, err := findSiteByIP(ipForTenant)
+		if err != nil {
+			return nil, err
+		}
+		siteID = siteid
+	}
+
+	if siteID == 0 {
+		if site, ok := NStorage.SitesStorage.FindByName(l4lb.Spec.Site); ok {
+			siteID = site.ID
+		} else {
+			return nil, fmt.Errorf("'%s' site not found", l4lb.Spec.Site)
+		}
+	}
+
 	if l4lb.Spec.State == "" || l4lb.Spec.State == "active" {
 		state = "enable"
 	} else {
@@ -396,5 +406,35 @@ func findTenantByIP(ip string) (int, error) {
 		}
 	}
 
-	return tenantID, fmt.Errorf("There is no subnets for specified IP address %s", ip)
+	return tenantID, fmt.Errorf("There are no subnets for specified IP address %s", ip)
+}
+
+func findSiteByIP(ip string) (int, error) {
+	siteID := 0
+	subnets, err := Cred.GetSubnets()
+	if err != nil {
+		return siteID, err
+	}
+
+	subnetChilds := []api.APISubnetChild{}
+	for _, subnet := range subnets {
+		subnetChilds = append(subnetChilds, subnet.Children...)
+	}
+
+	for _, subnet := range subnetChilds {
+		ipAddr := net.ParseIP(ip)
+		_, ipNet, err := net.ParseCIDR(fmt.Sprintf("%s/%d", subnet.Prefix, subnet.Length))
+		if err != nil {
+			return siteID, err
+		}
+		if ipNet.Contains(ipAddr) {
+			sID, _ := strconv.Atoi(subnet.SiteID)
+			if err != nil {
+				return siteID, err
+			}
+			return sID, nil
+		}
+	}
+
+	return siteID, fmt.Errorf("There are no sites  for specified IP address %s", ip)
 }

controllers/l4lbmeta_controller.go

@@ -243,9 +243,10 @@ func (u *uniReconciler) updateL4LBIfNeccesarry(l4lbCR *v1alpha1.L4LB, l4lbMeta v
 		l4lbCR.Spec.Frontend.IP = l4lbMeta.Spec.IP
 		shouldUpdateCR = true
 	}
-	if l4lbCR.Spec.OwnerTenant == "" {
+	if l4lbCR.Spec.OwnerTenant == "" || l4lbCR.Spec.Site == "" {
 		if updatedL4LB, ok := 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
 			}

deploy/README.md

@@ -11,7 +11,7 @@ All resources are included in a single YAML manifest file:
 1) Install the CustomResourceDefinitions and netris-operator itself:
 
 ```
-kubectl apply -f https://github.com/netrisai/netris-operator/releases/download/v0.3.9/netris-operator.yaml
+kubectl apply -f https://github.com/netrisai/netris-operator/releases/download/v0.4.0/netris-operator.yaml
 ```
 
 

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.1
+version: 0.3.2
 
 # 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.3.9
+appVersion: v0.4.0
 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:

deploy/charts/netris-operator/crds/k8s.netris.ai_l4lbs.yaml

@@ -114,7 +114,6 @@ spec:
           required:
           - backend
           - frontend
-          - site
           type: object
         status:
           description: L4LBStatus defines the observed state of L4LB