Release 1.3.1 (#64)

Bug Fixes:
- Calico CNI detector after losing connection with the KubeApi
- Ignoring '/' in the controller URL string

Author: pogossian

api/v1alpha1/zz_generated.deepcopy.go

@@ -71,9 +71,9 @@ type ServiceClusterIPBlock struct {
 	CIDR string `json:"cidr,omitempty" validate:"omitempty,net"`
 }
 
-// IsCalicoNotDetected error message parser for missing calico case.
-func IsCalicoNotDetected(err error) bool {
-	return err.Error() == "Calico CNI not detected"
+// IsMissingResource error message parser for missing calico case.
+func IsMissingResource(err error) bool {
+	return err.Error() == "the server could not find the requested resource"
 }
 
 // GetBGPConfiguration .
@@ -93,7 +93,7 @@ func (c *Calico) GetBGPConfiguration(config *rest.Config) ([]*BGPConfiguration,
 
 	list, err := dynClient.Resource(bgpConfigurationResource).List(ctx, metav1.ListOptions{})
 	if err != nil {
-		return nil, fmt.Errorf("Calico CNI not detected")
+		return nil, err
 	}
 
 	var bgpConfigurations []*BGPConfiguration

calicowatcher/calico/bgpconfigurations.go

@@ -384,8 +384,9 @@ func (w *Watcher) deleteProcess() error {
 func (w *Watcher) mainProcessing() error {
 	var err error
 	if w.data.bgpConfs, err = w.Calico.GetBGPConfiguration(w.restClient); err != nil {
-		if calico.IsCalicoNotDetected(err) {
+		if calico.IsMissingResource(err) {
 			logger.Info(err.Error())
+			logger.Info("Calico CNI not detected")
 			logger.Info("Calico Watcher Stopped")
 			w.stop <- struct{}{}
 			return nil

calicowatcher/main.go

@@ -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.7.0
+version: 0.7.1
 
 # 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.3.0
+appVersion: v1.3.1
 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:

deploy/charts/netris-operator/Chart.yaml

@@ -5,13 +5,13 @@ go 1.17
 require (
 	github.com/go-logr/logr v0.1.0
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/netrisai/netriswebapi v0.0.0-20220207194714-42a1095aa823
-	github.com/onsi/ginkgo v1.12.1
-	github.com/onsi/gomega v1.10.1
+	github.com/netrisai/netriswebapi v0.0.0-20220323225010-5c3a27388618
+	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/gomega v1.19.0
 	github.com/r3labs/diff/v2 v2.9.1
 	github.com/sirupsen/logrus v1.8.1
 	go.uber.org/zap v1.10.0
-	gopkg.in/yaml.v2 v2.3.0
+	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.18.6
 	k8s.io/apimachinery v0.18.6
 	k8s.io/client-go v0.18.6
@@ -25,10 +25,10 @@ require (
 	github.com/evanphx/json-patch v4.9.0+incompatible // indirect
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/go-logr/zapr v0.1.0 // indirect
-	github.com/gogo/protobuf v1.3.1 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
-	github.com/golang/protobuf v1.4.2 // indirect
-	github.com/google/go-cmp v0.4.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.5 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/google/uuid v1.1.1 // indirect
 	github.com/googleapis/gnostic v0.3.1 // indirect
@@ -40,7 +40,7 @@ require (
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/nxadm/tail v1.4.4 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/pkg/errors v0.8.1 // indirect
 	github.com/prometheus/client_golang v1.0.0 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
@@ -50,16 +50,15 @@ require (
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	go.uber.org/atomic v1.4.0 // indirect
 	go.uber.org/multierr v1.1.0 // indirect
-	golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 // indirect
-	golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 // indirect
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
-	golang.org/x/sys v0.0.0-20210331175145-43e1dd70ce54 // indirect
-	golang.org/x/text v0.3.3 // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
-	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.0.1 // indirect
 	google.golang.org/appengine v1.6.6 // indirect
-	google.golang.org/protobuf v1.23.0 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect