Release 1.4.4 (#69)

Bug Fixes:
- Operator crash when Calico bgpconfiguration's .spec was empty

Author: pogossian

calicowatcher/calico/bgpconfigurations.go

@@ -47,7 +47,7 @@ type BGPConfigurationSpec struct {
 	// LogSeverityScreen string `json:"logSeverityScreen,omitempty" validate:"omitempty,logLevel" confignamev1:"loglevel"`
 
 	// NodeToNodeMeshEnabled sets whether full node to node BGP mesh is enabled. [Default: true]
-	NodeToNodeMeshEnabled *bool `json:"nodeToNodeMeshEnabled,omitempty" validate:"omitempty" confignamev1:"node_mesh"`
+	NodeToNodeMeshEnabled *bool `json:"nodeToNodeMeshEnabled" validate:"omitempty" confignamev1:"node_mesh"`
 
 	// ASNumber is the default AS number used by a node. [Default: 64512]
 	ASNumber int `json:"asNumber,omitempty" validate:"omitempty" confignamev1:"as_num"`

calicowatcher/main.go

@@ -265,6 +265,10 @@ func (w *Watcher) process() error {
 		}
 	}
 
+	if w.data.bgpConfs[0].Spec.NodeToNodeMeshEnabled == nil {
+		w.data.bgpConfs[0].Spec.NodeToNodeMeshEnabled = &bgpActive
+	}
+
 	if bgpActive {
 		if *w.data.bgpConfs[0].Spec.NodeToNodeMeshEnabled {
 			debugLogger.Info("All BGPs are established", "deleteMode", w.data.deleteMode)
@@ -328,6 +332,10 @@ func (w *Watcher) deleteNodesASNs() error {
 }
 
 func (w *Watcher) deleteProcess() error {
+	f := false
+	if w.data.bgpConfs[0].Spec.NodeToNodeMeshEnabled == nil {
+		w.data.bgpConfs[0].Spec.NodeToNodeMeshEnabled = &f
+	}
 	if !*w.data.bgpConfs[0].Spec.NodeToNodeMeshEnabled {
 		if err := w.updateBGPConfMesh(true); err != nil {
 			return err
@@ -416,7 +424,7 @@ func (w *Watcher) mainProcessing() error {
 func (w *Watcher) updateBGPConfMesh(enabled bool) error {
 	if len(w.data.bgpConfs) > 0 {
 		bgpConf := w.data.bgpConfs[0]
-		bgpConf.Spec.NodeToNodeMeshEnabled = &enabled
+		*bgpConf.Spec.NodeToNodeMeshEnabled = enabled
 		return w.Calico.UpdateBGPConfiguration(bgpConf, w.restClient)
 	}
 	return fmt.Errorf("BGPConfiguration is missing in calico")

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.8.3
+version: 0.8.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: v1.4.3
+appVersion: v1.4.4
 home: https://github.com/netrisai/netris-operator
 icon: https://www.netris.ai/wp-content/uploads/2021/01/logo-300.png  # [todo] Change url to permalink
 keywords: