Skip to content

Commit 62a8898

Browse files
committed
Fix linting and github workflow go version
1 parent 8b54d72 commit 62a8898

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

.github/workflows/validate-ipfs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: ["main", "release*"]
88

99
env:
10-
GO_VERSION: "1.18"
10+
GO_VERSION: "1.19"
1111
GO111MODULE: "on"
1212
OPERATOR_IMAGE: "quay.io/redhat-et-ipfs/ipfs-operator"
1313
BUNDLE_IMAGE: "quay.io/redhat-et-ipfs/ipfs-operator-bundle"

api/v1alpha1/circuitrelay_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
"github.com/libp2p/go-libp2p-core/peer"
20+
"github.com/libp2p/go-libp2p/core/peer"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222

2323
ma "github.com/multiformats/go-multiaddr"

controllers/ipfs_cluster_service.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ import (
77

88
func GetDefaultServiceConfig() *cmdutils.ConfigHelper {
99
cfgHelper := cmdutils.NewConfigHelper("", "", "crdt", "badger")
10-
cfgHelper.Manager().Default()
10+
err := cfgHelper.Manager().Default()
11+
if err != nil {
12+
return nil
13+
}
1114
return cfgHelper
1215
}
1316

controllers/scripts/config.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,9 @@ func applyIPFSClusterK8sDefaults(conf *config.Config, storageMax string, peers [
239239
conf.Addresses.API = config.Strings{"/ip4/0.0.0.0/tcp/5001"}
240240
conf.Addresses.Gateway = config.Strings{"/ip4/0.0.0.0/tcp/8080"}
241241
highWater := &config.OptionalInteger{}
242-
highWater.UnmarshalJSON([]byte("2000"))
243-
conf.Swarm.ConnMgr.HighWater = highWater
242+
if err := highWater.UnmarshalJSON([]byte("2000")); err == nil {
243+
conf.Swarm.ConnMgr.HighWater = highWater
244+
}
244245
conf.Datastore.BloomFilterSize = 1048576
245246
conf.Datastore.StorageMax = storageMax
246247
conf.Addresses.Swarm = []string{"/ip4/0.0.0.0/tcp/4001", "/ip6/::/tcp/4001"}

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ require (
77
github.com/ipfs-cluster/ipfs-cluster v1.0.4
88
github.com/ipfs/kubo v0.17.0
99
github.com/libp2p/go-libp2p v0.23.4
10-
github.com/libp2p/go-libp2p-core v0.20.1
1110
github.com/libp2p/go-libp2p-relay-daemon v0.1.1-0.20220720133550-bd5627c90f06
1211
github.com/multiformats/go-multiaddr v0.8.0
1312
github.com/onsi/ginkgo/v2 v2.7.0
@@ -127,6 +126,7 @@ require (
127126
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
128127
github.com/libp2p/go-libp2p-asn-util v0.2.0 // indirect
129128
github.com/libp2p/go-libp2p-consensus v0.0.1 // indirect
129+
github.com/libp2p/go-libp2p-core v0.20.1 // indirect
130130
github.com/libp2p/go-libp2p-gorpc v0.5.0 // indirect
131131
github.com/libp2p/go-libp2p-gostream v0.5.0 // indirect
132132
github.com/libp2p/go-libp2p-http v0.4.0 // indirect

0 commit comments

Comments
 (0)