BGP resource fixes (#33)

* fix: bgp: additional printed columns improvement

* fix: bgp: rename 'port' to 'port/vnet' in k8s printed columns

* fix: bgp: detect ip version

* fix: bgp: default originate default value

* refactor: update go version to 1.16

* refactor: update netrisapi package and fix appropriate field types

* refactor: update netrisapi package and fix neighborAddress field type

* fix: bgp struct generated deepcopy

* fix: bgp: neighbor address field type

* fix: bgp: compare terminateOnSwitch field

* helm chart crd update

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

Author: pogossian

api/v1alpha1/bgp_types.go

@@ -104,12 +104,12 @@ type BGPTransport struct {
 // +kubebuilder:printcolumn:name="State",type=string,JSONPath=`.status.state`
 // +kubebuilder:printcolumn:name="BGP State",type=string,JSONPath=`.status.bgpstate`
 // +kubebuilder:printcolumn:name="Port State",type=string,JSONPath=`.status.portstate`
-// +kubebuilder:printcolumn:name="NeighborAS",type=string,JSONPath=`.spec.neighborAs`
+// +kubebuilder:printcolumn:name="Neighbor AS",type=string,JSONPath=`.spec.neighborAs`
 // +kubebuilder:printcolumn:name="Local address",type=string,JSONPath=`.spec.localIP`
 // +kubebuilder:printcolumn:name="Remote address",type=string,JSONPath=`.spec.remoteIP`
-// +kubebuilder:printcolumn:name="Port",type=string,JSONPath=`.spec.transport.name`,priority=1
+// +kubebuilder:printcolumn:name="Port/Vnet",type=string,JSONPath=`.spec.transport.name`,priority=1
 // +kubebuilder:printcolumn:name="VLANID",type=string,JSONPath=`.status.vlanID`,priority=1
-// +kubebuilder:printcolumn:name="TerminatedOn",type=string,JSONPath=`.status.terminateOnSwitch`,priority=1
+// +kubebuilder:printcolumn:name="Terminated On",type=string,JSONPath=`.status.terminateOnSwitch`,priority=1
 // +kubebuilder:printcolumn:name="Modified",type=date,JSONPath=`.status.modified`,priority=1
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 

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

@@ -19,7 +19,7 @@ spec:
     name: Port State
     type: string
   - JSONPath: .spec.neighborAs
-    name: NeighborAS
+    name: Neighbor AS
     type: string
   - JSONPath: .spec.localIP
     name: Local address
@@ -28,15 +28,15 @@ spec:
     name: Remote address
     type: string
   - JSONPath: .spec.transport.name
-    name: Port
+    name: Port/Vnet
     priority: 1
     type: string
   - JSONPath: .status.vlanID
     name: VLANID
     priority: 1
     type: string
   - JSONPath: .status.terminateOnSwitch
-    name: TerminatedOn
+    name: Terminated On
     priority: 1
     type: string
   - JSONPath: .status.modified

controllers/bgp_translations.go

@@ -42,9 +42,10 @@ func (r *BGPReconciler) BGPToBGPMeta(bgp *k8sv1alpha1.BGP) (*k8sv1alpha1.BGPMeta
 		vnetID            int
 		imported          = false
 		reclaim           = false
+		ipVersion         = "ipv6"
 	)
 
-	originate := ""
+	originate := "disabled"
 	localPreference := 100
 	if site, ok := NStorage.SitesStorage.FindByName(bgp.Spec.Site); ok {
 		siteID = site.ID
@@ -53,7 +54,7 @@ func (r *BGPReconciler) BGPToBGPMeta(bgp *k8sv1alpha1.BGP) (*k8sv1alpha1.BGPMeta
 	}
 
 	if bgp.Spec.DefaultOriginate {
-		originate = "true"
+		originate = "enabled"
 	}
 
 	if bgp.Spec.Transport.VlanID > 1 {
@@ -115,6 +116,9 @@ func (r *BGPReconciler) BGPToBGPMeta(bgp *k8sv1alpha1.BGP) (*k8sv1alpha1.BGPMeta
 	localIP, cidr, _ := net.ParseCIDR(bgp.Spec.LocalIP)
 	remoteIP, _, _ := net.ParseCIDR(bgp.Spec.RemoteIP)
 	prefixLength, _ := cidr.Mask.Size()
+	if localIP.To4() != nil {
+		ipVersion = "ipv4"
+	}
 
 	bgpMeta = &k8sv1alpha1.BGPMeta{
 		ObjectMeta: metav1.ObjectMeta{
@@ -152,6 +156,7 @@ func (r *BGPReconciler) BGPToBGPMeta(bgp *k8sv1alpha1.BGP) (*k8sv1alpha1.BGPMeta
 			AllowasIn:          bgp.Spec.AllowAsIn,
 			Originate:          originate,
 			PrefixLimit:        bgp.Spec.PrefixInboundMax, // ?
+			IPVersion:          ipVersion,
 			InboundRouteMap:    bgpMeta.Spec.InboundRouteMap,
 			LocalPreference:    localPreference,
 			Weight:             bgp.Spec.Weight,
@@ -218,7 +223,7 @@ func BGPMetaToNetris(bgpMeta *k8sv1alpha1.BGPMeta) (*api.APIEBGPAdd, error) {
 		LocalPreference:    bgpMeta.Spec.LocalPreference,
 		Multihop:           bgpMeta.Spec.Multihop,
 		Name:               bgpMeta.Spec.BGPName,
-		NeighborAddress:    bgpMeta.Spec.NeighborAddress,
+		NeighborAddress:    stringOrNull(bgpMeta.Spec.NeighborAddress),
 		NeighborAs:         strconv.Itoa(bgpMeta.Spec.NeighborAs),
 		NfvID:              bgpMeta.Spec.NfvID,
 		NfvPortID:          bgpMeta.Spec.NfvPortID,
@@ -262,14 +267,14 @@ func BGPMetaToNetrisUpdate(bgpMeta *k8sv1alpha1.BGPMeta) (*api.APIEBGPUpdate, er
 		LocalPreference:    bgpMeta.Spec.LocalPreference,
 		Multihop:           bgpMeta.Spec.Multihop,
 		Name:               bgpMeta.Spec.BGPName,
-		NeighborAddress:    bgpMeta.Spec.NeighborAddress,
+		NeighborAddress:    stringOrNull(bgpMeta.Spec.NeighborAddress),
 		NeighborAs:         strconv.Itoa(bgpMeta.Spec.NeighborAs),
 		NfvID:              bgpMeta.Spec.NfvID,
 		NfvPortID:          bgpMeta.Spec.NfvPortID,
 		Originate:          bgpMeta.Spec.Originate,
 		OutboundRouteMap:   bgpMeta.Spec.OutboundRouteMap,
 		PrefixLength:       bgpMeta.Spec.PrefixLength,
-		PrefixLimit:        bgpMeta.Spec.PrefixLimit,
+		PrefixLimit:        strconv.Itoa(bgpMeta.Spec.PrefixLimit),
 		PrefixListInbound:  bgpMeta.Spec.PrefixListInbound,
 		PrefixListOutbound: bgpMeta.Spec.PrefixListOutbound,
 		PrependInbound:     bgpMeta.Spec.PrependInbound,
@@ -330,8 +335,11 @@ func compareBGPMetaAPIEBGP(bgpMeta *k8sv1alpha1.BGPMeta, apiBGP *api.APIEBGP) bo
 		return false
 	}
 
+	if bgpMeta.Spec.TerminateOnSwitch != apiBGP.TerminateOnSwitch {
+		return false
+	}
+
 	if bgpMeta.Spec.TerminateOnSwitch != "yes" && bgpMeta.Spec.NfvID != apiBGP.TermSwitchID {
-		fmt.Println("TermSwitchID")
 		return false
 	}
 	// if apiBGP.NfvID != bgpMeta.Spec.NfvID {

controllers/utils.go

@@ -55,3 +55,10 @@ func regParser(valueMatch []string, subexpNames []string) map[string]string {
 	}
 	return result
 }
+
+func stringOrNull(s string) *string {
+	if len(s) > 0 {
+		return &s
+	}
+	return nil
+}

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.4.1/netris-operator.yaml
+kubectl apply -f https://github.com/netrisai/netris-operator/releases/download/v0.4.2/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.3
+version: 0.3.4
 
 # 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.1
+appVersion: v0.4.2
 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_bgps.yaml

@@ -19,7 +19,7 @@ spec:
     name: Port State
     type: string
   - JSONPath: .spec.neighborAs
-    name: NeighborAS
+    name: Neighbor AS
     type: string
   - JSONPath: .spec.localIP
     name: Local address
@@ -28,15 +28,15 @@ spec:
     name: Remote address
     type: string
   - JSONPath: .spec.transport.name
-    name: Port
+    name: Port/Vnet
     priority: 1
     type: string
   - JSONPath: .status.vlanID
     name: VLANID
     priority: 1
     type: string
   - JSONPath: .status.terminateOnSwitch
-    name: TerminatedOn
+    name: Terminated On
     priority: 1
     type: string
   - JSONPath: .status.modified

go.mod

@@ -1,12 +1,12 @@
 module github.com/netrisai/netris-operator
 
-go 1.14
+go 1.16
 
 require (
 	github.com/go-logr/logr v0.1.0
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
-	github.com/netrisai/netrisapi v0.0.0-20210401135324-2d43003b1f89
+	github.com/netrisai/netrisapi v0.0.0-20210610175837-ededc2c4cd4b
 	github.com/onsi/ginkgo v1.12.1
 	github.com/onsi/gomega v1.10.1
 	github.com/prometheus/common v0.4.1

go.sum

@@ -279,6 +279,10 @@ github.com/netrisai/netrisapi v0.0.0-20210401135108-e8ab0d6a45f7 h1:rfgrZT5y7u7a
 github.com/netrisai/netrisapi v0.0.0-20210401135108-e8ab0d6a45f7/go.mod h1:IqkB+A4amKw4jG8dgAWjcWE0W7rvIbSl4K+E3v332ZM=
 github.com/netrisai/netrisapi v0.0.0-20210401135324-2d43003b1f89 h1:aJSD17vqty2loV+jrDK7xes+lgzOBJFJZaJA1U/ZhI8=
 github.com/netrisai/netrisapi v0.0.0-20210401135324-2d43003b1f89/go.mod h1:IqkB+A4amKw4jG8dgAWjcWE0W7rvIbSl4K+E3v332ZM=
+github.com/netrisai/netrisapi v0.0.0-20210609193230-8881eda50f3a h1:x0piXuyEZm/NFIAr4px2MNyzFvOKaNN33Um6szHm0jg=
+github.com/netrisai/netrisapi v0.0.0-20210609193230-8881eda50f3a/go.mod h1:IqkB+A4amKw4jG8dgAWjcWE0W7rvIbSl4K+E3v332ZM=
+github.com/netrisai/netrisapi v0.0.0-20210610175837-ededc2c4cd4b h1:Esz09GWT+Gf6HJxEeVuHk9SQkjhVaZLs2AiMeG+3JFA=
+github.com/netrisai/netrisapi v0.0.0-20210610175837-ededc2c4cd4b/go.mod h1:IqkB+A4amKw4jG8dgAWjcWE0W7rvIbSl4K+E3v332ZM=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=