Fix linting and github workflow go version

ipfs-cluster · Jan 18, 2023 · 62a8898 · 62a8898
1 parent 8b54d72
commit 62a8898
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/validate-ipfs.yaml b/.github/workflows/validate-ipfs.yaml
@@ -7,7 +7,7 @@ on:
     branches: ["main", "release*"]
 
 env:
-  GO_VERSION: "1.18"
+  GO_VERSION: "1.19"
   GO111MODULE: "on"
   OPERATOR_IMAGE: "quay.io/redhat-et-ipfs/ipfs-operator"
   BUNDLE_IMAGE: "quay.io/redhat-et-ipfs/ipfs-operator-bundle"

diff --git a/api/v1alpha1/circuitrelay_types.go b/api/v1alpha1/circuitrelay_types.go
@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	ma "github.com/multiformats/go-multiaddr"

diff --git a/controllers/ipfs_cluster_service.go b/controllers/ipfs_cluster_service.go
@@ -7,7 +7,10 @@ import (
 
 func GetDefaultServiceConfig() *cmdutils.ConfigHelper {
 	cfgHelper := cmdutils.NewConfigHelper("", "", "crdt", "badger")
-	cfgHelper.Manager().Default()
+	err := cfgHelper.Manager().Default()
+	if err != nil {
+		return nil
+	}
 	return cfgHelper
 }
 

diff --git a/controllers/scripts/config.go b/controllers/scripts/config.go
@@ -239,8 +239,9 @@ func applyIPFSClusterK8sDefaults(conf *config.Config, storageMax string, peers [
 	conf.Addresses.API = config.Strings{"/ip4/0.0.0.0/tcp/5001"}
 	conf.Addresses.Gateway = config.Strings{"/ip4/0.0.0.0/tcp/8080"}
 	highWater := &config.OptionalInteger{}
-	highWater.UnmarshalJSON([]byte("2000"))
-	conf.Swarm.ConnMgr.HighWater = highWater
+	if err := highWater.UnmarshalJSON([]byte("2000")); err == nil {
+		conf.Swarm.ConnMgr.HighWater = highWater
+	}
 	conf.Datastore.BloomFilterSize = 1048576
 	conf.Datastore.StorageMax = storageMax
 	conf.Addresses.Swarm = []string{"/ip4/0.0.0.0/tcp/4001", "/ip6/::/tcp/4001"}

diff --git a/go.mod b/go.mod
@@ -7,7 +7,6 @@ require (
 	github.com/ipfs-cluster/ipfs-cluster v1.0.4
 	github.com/ipfs/kubo v0.17.0
 	github.com/libp2p/go-libp2p v0.23.4
-	github.com/libp2p/go-libp2p-core v0.20.1
 	github.com/libp2p/go-libp2p-relay-daemon v0.1.1-0.20220720133550-bd5627c90f06
 	github.com/multiformats/go-multiaddr v0.8.0
 	github.com/onsi/ginkgo/v2 v2.7.0
@@ -127,6 +126,7 @@ require (
 	github.com/libp2p/go-flow-metrics v0.1.0 // indirect
 	github.com/libp2p/go-libp2p-asn-util v0.2.0 // indirect
 	github.com/libp2p/go-libp2p-consensus v0.0.1 // indirect
+	github.com/libp2p/go-libp2p-core v0.20.1 // indirect
 	github.com/libp2p/go-libp2p-gorpc v0.5.0 // indirect
 	github.com/libp2p/go-libp2p-gostream v0.5.0 // indirect
 	github.com/libp2p/go-libp2p-http v0.4.0 // indirect