Merge pull request #21 from coryschwartz/feat/follow

ipfs cluster follow

Author: RobotSail

api/v1alpha1/ipfs_types.go

@@ -31,17 +31,23 @@ const (
 	ReconciledReasonError string = "ReconcileError"
 )
 
+type followParams struct {
+	Name     string `json:"name"`
+	Template string `json:"template"`
+}
+
 type networkConfig struct {
 	CircuitRelays int32 `json:"circuitRelays"`
 }
 
 type IpfsSpec struct {
-	URL            string        `json:"url"`
-	Public         bool          `json:"public"`
-	IpfsStorage    string        `json:"ipfsStorage"`
-	ClusterStorage string        `json:"clusterStorage"`
-	Replicas       int32         `json:"replicas"`
-	Networking     networkConfig `json:"networking"`
+	URL            string         `json:"url"`
+	Public         bool           `json:"public"`
+	IpfsStorage    string         `json:"ipfsStorage"`
+	ClusterStorage string         `json:"clusterStorage"`
+	Replicas       int32          `json:"replicas"`
+	Networking     networkConfig  `json:"networking"`
+	Follows        []followParams `json:"follows"`
 }
 
 type IpfsStatus struct {

api/v1alpha1/zz_generated.deepcopy.go

@@ -36,6 +36,18 @@ spec:
             properties:
               clusterStorage:
                 type: string
+              follows:
+                items:
+                  properties:
+                    name:
+                      type: string
+                    template:
+                      type: string
+                  required:
+                  - name
+                  - template
+                  type: object
+                type: array
               ipfsStorage:
                 type: string
               networking:
@@ -55,6 +67,7 @@ spec:
                 type: string
             required:
             - clusterStorage
+            - follows
             - ipfsStorage
             - networking
             - public

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

@@ -29,7 +29,7 @@ user=ipfs
 
 
 if [ ! -f /data/ipfs-cluster/service.json ]; then
-	ipfs-cluster-service init
+	ipfs-cluster-service init --consensus crdt
 fi
 
 PEER_HOSTNAME=$(cat /proc/sys/kernel/hostname)

controllers/scripts.go

@@ -1,6 +1,9 @@
 package controllers
 
 import (
+	"regexp"
+	"strings"
+
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -12,6 +15,14 @@ import (
 	clusterv1alpha1 "github.com/redhat-et/ipfs-operator/api/v1alpha1"
 )
 
+var (
+	// objects need to be RFC-1123 compliant, and k8s uses this regex to test.
+	// https://github.com/kubernetes/apimachinery/blob/v0.24.2/pkg/util/validation/validation.go
+	// dns1123LabelFmt "[a-z0-9]([-a-z0-9]*[a-z0-9])?"
+	// We want to match the opposite.
+	notdns *regexp.Regexp = regexp.MustCompile("[[:^alnum:]]")
+)
+
 func (r *IpfsReconciler) statefulSet(m *clusterv1alpha1.Ipfs,
 	sts *appsv1.StatefulSet,
 	serviceName string,
@@ -255,6 +266,30 @@ func (r *IpfsReconciler) statefulSet(m *clusterv1alpha1.Ipfs,
 			ServiceName: serviceName,
 		},
 	}
+
+	// Add a follower container for each follow.
+	for _, follow := range m.Spec.Follows {
+		container := corev1.Container{
+			Name:            "ipfs-cluster-follow-" + notdns.ReplaceAllString(strings.ToLower(follow.Name), "-"),
+			Image:           "ipfs/ipfs-cluster:v1.0.1",
+			ImagePullPolicy: corev1.PullIfNotPresent,
+			Command: []string{
+				"ipfs-cluster-follow",
+				follow.Name,
+				"run",
+				"--init",
+				follow.Template,
+			},
+			VolumeMounts: []corev1.VolumeMount{
+				{
+					Name:      "cluster-storage",
+					MountPath: "/data/ipfs-cluster",
+				},
+			},
+		}
+		expected.Spec.Template.Spec.Containers = append(expected.Spec.Template.Spec.Containers, container)
+	}
+
 	expected.DeepCopyInto(sts)
 	ctrl.SetControllerReference(m, sts, r.Scheme)
 	return func() error {

controllers/statefulset.go

@@ -0,0 +1,24 @@
+---
+apiVersion: cluster.ipfs.io/v1alpha1
+kind: Ipfs
+metadata:
+  name: ipfs-sample-collab
+spec:
+  url: apps.jephilli-4-11-04-28-0655.devcluster.openshift.com 
+  ipfsStorage: 5Ti
+  clusterStorage: 20Gi
+  public: true
+  replicas: 5
+  follows:
+    - name: filecoin
+      template: filecoin.collab.ipfscluster.io
+    - name: gutenberg_es
+      template: gutenberg-es.collab.ipfscluster.io
+    - name: ipfs-websites
+      template: ipfs-websites.collab.ipfscluster.io
+    - name: pkg.pacman.store
+      template: cluster.pkg.pacman.store
+    - name: ravencoin
+      template: ipfs-collab.ravencoin.network
+    - name: wikipedia
+      template: wikipedia.collab.ipfscluster.io

examples/collab-follow.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: cluster.ipfs.io/v1alpha1
 kind: Ipfs
 metadata:
@@ -7,6 +8,7 @@ spec:
   ipfsStorage: 50Gi
   clusterStorage: 5Gi
   public: true
-  replicas: 3
+  replicas: 2
+  follows: []
   networking:
     circuitRelays: 2

examples/ipfs.yaml

@@ -13,6 +13,7 @@ spec:
   clusterStorage: 2Gi
   public: false
   replicas: 2
+  follows: []
   networking:
     circuitRelays: 0
 EOF