Calico Integration minor fixes (#36)

* fix: bgp: set default transport to 'port'

* fix: calico: use patch method for annotating the nodes

* preparation for new release

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

Author: pogossian

calicowatcher/main.go

@@ -37,6 +37,7 @@ import (
 	"go.uber.org/zap/zapcore"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -297,7 +298,13 @@ func (w *Watcher) deleteNodesASNs() error {
 			if as >= w.data.asnStart && as <= w.data.asnEnd {
 				delete(anns, "projectcalico.org/ASNumber")
 				node.SetAnnotations(anns)
-				_, err := w.clientset.CoreV1().Nodes().Update(ctx, node.DeepCopy(), metav1.UpdateOptions{})
+				payload := []patchStringValue{{
+					Op:    "remove",
+					Path:  "/metadata/annotations/projectcalico.org~1ASNumber",
+					Value: asn,
+				}}
+				payloadBytes, _ := json.Marshal(payload)
+				_, err := w.clientset.CoreV1().Nodes().Patch(ctx, node.Name, types.JSONPatchType, payloadBytes, metav1.PatchOptions{})
 				if err != nil {
 					return err
 				}
@@ -627,14 +634,21 @@ func (w *Watcher) fillNodesASNs() error {
 				if !asnMap[asn] {
 					anns["projectcalico.org/ASNumber"] = asn
 					node.SetAnnotations(anns)
+					payload := []patchStringValue{{
+						Op:    "replace",
+						Path:  "/metadata/annotations/projectcalico.org~1ASNumber",
+						Value: asn,
+					}}
+					payloadBytes, _ := json.Marshal(payload)
 					ctx, cancel := context.WithTimeout(cntxt, contextTimeout)
-					_, err := w.clientset.CoreV1().Nodes().Update(ctx, node.DeepCopy(), metav1.UpdateOptions{})
+					_, err := w.clientset.CoreV1().Nodes().Patch(ctx, node.Name, types.JSONPatchType, payloadBytes, metav1.PatchOptions{})
 					if err != nil {
 						cancel()
 						return err
 					}
-					cancel()
 					asnMap[asn] = true
+					cancel()
+					break
 				}
 			}
 		} else {
@@ -773,3 +787,10 @@ func (w *Watcher) validateASNRange(asns string) (int, int, error) {
 
 	return a, b, nil
 }
+
+//  patchStringValue specifies a patch operation for a string.
+type patchStringValue struct {
+	Op    string `json:"op"`
+	Path  string `json:"path"`
+	Value string `json:"value"`
+}

controllers/bgp_translations.go

@@ -81,6 +81,10 @@ func (r *BGPReconciler) BGPToBGPMeta(bgp *k8sv1alpha1.BGP) (*k8sv1alpha1.BGPMeta
 		terminateOnSwitch = "yes"
 	}
 
+	if bgp.Spec.Transport.Type == "" {
+		bgp.Spec.Transport.Type = "port"
+	}
+
 	if bgp.Spec.Transport.Type == "port" {
 		if port, ok := r.NStorage.BGPStorage.FindPort(siteID, bgp.Spec.Transport.Name); ok {
 			portID = port.PortID

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.3/netris-operator.yaml
+kubectl apply -f https://github.com/netrisai/netris-operator/releases/download/v0.4.4/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.5
+version: 0.3.6
 
 # 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.3
+appVersion: v0.4.4
 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: