Add service-config and expose metrics

.github/workflows/validate-ipfs.yaml

@@ -6,7 +6,7 @@ on:
     branches: ["main"]
 
 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"

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.18 as builder
+FROM golang:1.19 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

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"

api/v1alpha1/ipfscluster_types.go

@@ -86,6 +86,9 @@ type IpfsClusterSpec struct {
 	// should use when reproviding content.
 	// +optional
 	Reprovider ReprovideSettings `json:"reprovider,omitempty"`
+	// stats determines whether metrics should be enabled.
+	// +optional
+	Stats bool `json:"stats"`
 }
 
 type IpfsClusterStatus struct {

config/crd/bases/cluster.ipfs.io_ipfsclusters.yaml

@@ -125,6 +125,9 @@ spec:
                     - roots
                     type: string
                 type: object
+              stats:
+                description: stats determines whether metrics should be enabled.
+                type: boolean
             required:
             - clusterStorage
             - follows

controllers/circuitrelay_controller.go

@@ -36,9 +36,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/libp2p/go-libp2p-core/crypto"
-	peer "github.com/libp2p/go-libp2p-core/peer"
 	relaydaemon "github.com/libp2p/go-libp2p-relay-daemon"
+	"github.com/libp2p/go-libp2p/core/crypto"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 	relayv2 "github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/relay"
 	clusterv1alpha1 "github.com/redhat-et/ipfs-operator/api/v1alpha1"
 	"github.com/redhat-et/ipfs-operator/controllers/utils"

controllers/ipfs_cluster_service.go

@@ -0,0 +1,20 @@
+package controllers
+
+import (
+	"github.com/ipfs-cluster/ipfs-cluster/cmdutils"
+	ma "github.com/multiformats/go-multiaddr"
+)
+
+func GetDefaultServiceConfig() *cmdutils.ConfigHelper {
+	cfgHelper := cmdutils.NewConfigHelper("", "", "crdt", "badger")
+	err := cfgHelper.Manager().Default()
+	if err != nil {
+		return nil
+	}
+	return cfgHelper
+}
+
+func EnableMetrics(serviceConfig *cmdutils.Configs) {
+	serviceConfig.Metrics.EnableStats = true
+	serviceConfig.Metrics.PrometheusEndpoint, _ = ma.NewMultiaddr("/ip4/0.0.0.0/tcp/8888")
+}

controllers/ipfs_util.go

@@ -6,8 +6,8 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	ci "github.com/libp2p/go-libp2p-core/crypto"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	ci "github.com/libp2p/go-libp2p/core/crypto"
+	peer "github.com/libp2p/go-libp2p/core/peer"
 )
 
 func newClusterSecret() (string, error) {

controllers/ipfscluster_controller.go

@@ -32,7 +32,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	ctrllog "sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 	clusterv1alpha1 "github.com/redhat-et/ipfs-operator/api/v1alpha1"
 	"github.com/redhat-et/ipfs-operator/controllers/utils"
 )

controllers/ipfscluster_controller_test.go

@@ -46,7 +46,7 @@ var _ = Describe("IPFS Reconciler", func() {
 			// should not have errored
 			Expect(fn()).NotTo(HaveOccurred())
 			// the configmap should be populated with the following scripts
-			Expect(len(configMapScripts.Data)).To(Equal(2))
+			Expect(len(configMapScripts.Data)).To(Equal(3))
 
 			expectedKeys := []string{
 				controllers.ScriptConfigureIPFS,

controllers/scripts.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/alecthomas/units"
 	"github.com/ipfs/kubo/config"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 	ma "github.com/multiformats/go-multiaddr"
 	clusterv1alpha1 "github.com/redhat-et/ipfs-operator/api/v1alpha1"
 	"github.com/redhat-et/ipfs-operator/controllers/scripts"
@@ -101,6 +101,17 @@ func (r *IpfsClusterReconciler) ConfigMapScripts(
 		string(reproviderStrategy),
 	)
 
+	serviceConfig := GetDefaultServiceConfig()
+	if m.Spec.Stats {
+		EnableMetrics(serviceConfig.Configs())
+	}
+
+	serviceConfigFile, err := serviceConfig.Manager().ToJSON()
+	if err != nil {
+		log.Error(err, "could not marshal service config file")
+		return utils.ErrFunc(fmt.Errorf("error converting serviceConfig to JSON: %w", err)), ""
+	}
+
 	expected := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      cmName,
@@ -109,6 +120,7 @@ func (r *IpfsClusterReconciler) ConfigMapScripts(
 		Data: map[string]string{
 			"entrypoint.sh":     scripts.IPFSClusterEntrypoint,
 			"configure-ipfs.sh": configScript,
+			"service.json":      string(serviceConfigFile),
 		},
 	}
 	expected.DeepCopyInto(cm)

controllers/scripts/config.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/alecthomas/units"
 	"github.com/ipfs/kubo/config"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 type configureIpfsOpts struct {
@@ -92,6 +92,8 @@ run_ipfs_cluster() {
 	log "🔍 reading hostname"
 	PEER_HOSTNAME=$(cat /proc/sys/kernel/hostname)
 	log "starting ipfs-cluster on ${PEER_HOSTNAME}"
+	cp /custom/service.json /data/ipfs-cluster/
+	sed -i '/peername/c\   \"peername\" : \"'$PEER_HOSTNAME'\",' /data/ipfs-cluster/service.json
 
 	grep -q ".*-0$" /proc/sys/kernel/hostname
 	if [ $? -eq 0 ]; then
@@ -236,7 +238,10 @@ func applyIPFSClusterK8sDefaults(conf *config.Config, storageMax string, peers [
 	conf.Bootstrap = config.DefaultBootstrapAddresses
 	conf.Addresses.API = config.Strings{"/ip4/0.0.0.0/tcp/5001"}
 	conf.Addresses.Gateway = config.Strings{"/ip4/0.0.0.0/tcp/8080"}
-	conf.Swarm.ConnMgr.HighWater = 2000
+	highWater := &config.OptionalInteger{}
+	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"}

controllers/statefulset.go

@@ -54,7 +54,7 @@ const (
 	// ipfsMountPath Defines where the IPFS volume is mounted.
 	ipfsMountPath = "/data/ipfs"
 	// ipfsImage Defines which image we should pull when running IPFS containers.
-	ipfsImage = "docker.io/ipfs/kubo:v0.14.0"
+	ipfsImage = "docker.io/ipfs/kubo:v0.17.0"
 )
 
 // StatefulSet Returns a mutate function that creates a StatefulSet for the