Merge pull request #56 from RobotSail/RobotSail/issue37

Add Reprovider Settings to Spec

Author: RobotSail

api/v1alpha1/ipfs_types.go

@@ -32,6 +32,28 @@ const (
 	ReconciledReasonError string = "ReconcileError"
 )
 
+type ReproviderStrategy string
+
+const (
+	// ReproviderStrategyAll Announces the CID of every stored block.
+	ReproviderStrategyAll ReproviderStrategy = "all"
+	// ReproviderStrategyPinned Only announces the pinned CIDs recursively.
+	ReproviderStrategyPinned ReproviderStrategy = "pinned"
+	// ReproviderStrategyRoots Only announces the root block of explicitly pinned CIDs.
+	ReproviderStrategyRoots ReproviderStrategy = "roots"
+)
+
+type ReprovideSettings struct {
+	// Strategy specifies the reprovider strategy, defaults to 'all'.
+	// +kubebuilder:validation:Enum={all,pinned,roots}
+	// +optional
+	Strategy ReproviderStrategy `json:"strategy,omitempty"`
+	// Interval sets the time between rounds of reproviding
+	// local content to the routing system. Defaults to '12h'.
+	// +optional
+	Interval string `json:"interval,omitempty"`
+}
+
 type followParams struct {
 	Name     string `json:"name"`
 	Template string `json:"template"`
@@ -50,6 +72,10 @@ type IpfsSpec struct {
 	Replicas       int32             `json:"replicas"`
 	Networking     networkConfig     `json:"networking"`
 	Follows        []followParams    `json:"follows"`
+	// Reprovider Describes the settings that each IPFS node
+	// should use when reproviding content.
+	// +optional
+	Reprovider ReprovideSettings `json:"reprovider,omitempty"`
 }
 
 type IpfsStatus struct {

api/v1alpha1/zz_generated.deepcopy.go

@@ -63,6 +63,23 @@ spec:
               replicas:
                 format: int32
                 type: integer
+              reprovider:
+                description: Reprovider Describes the settings that each IPFS node
+                  should use when reproviding content.
+                properties:
+                  interval:
+                    description: Interval sets the time between rounds of reproviding
+                      local content to the routing system. Defaults to '12h'.
+                    type: string
+                  strategy:
+                    description: Strategy specifies the reprovider strategy, defaults
+                      to 'all'.
+                    enum:
+                    - all
+                    - pinned
+                    - roots
+                    type: string
+                type: object
               url:
                 type: string
             required:

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

@@ -80,12 +80,25 @@ func (r *IpfsReconciler) ConfigMapScripts(
 			return err
 		}, ""
 	}
+
+	// reprovider settings
+	reproviderStrategy := m.Spec.Reprovider.Strategy
+	if reproviderStrategy == "" {
+		reproviderStrategy = clusterv1alpha1.ReproviderStrategyAll
+	}
+	reproviderInterval := m.Spec.Reprovider.Interval
+	if reproviderInterval == "" {
+		reproviderInterval = "12h"
+	}
+
 	// get the config script
 	configScript, err := scripts.CreateConfigureScript(
 		maxStorageS,
 		relayPeers,
 		relayConfig,
 		bloomFilterSize,
+		reproviderInterval,
+		string(reproviderStrategy),
 	)
 
 	expected := &corev1.ConfigMap{

controllers/scripts.go

@@ -149,14 +149,21 @@ func CreateConfigureScript(
 	peers []peer.AddrInfo,
 	relayConfig config.RelayClient,
 	bloomFilterSize int64,
+	reproviderInterval string,
+	reproviderStrategy string,
 ) (string, error) {
+	// set settings
 	configureTmpl, _ := template.New("configureIpfs").Parse(configureIpfs)
 	config, err := createTemplateConfig(storageMax, peers, relayConfig)
 	if err != nil {
 		return "", err
 	}
 	config.Swarm.RelayClient = relayConfig
 	config.Datastore.BloomFilterSize = int(bloomFilterSize)
+	config.Reprovider.Interval = reproviderInterval
+	config.Reprovider.Strategy = reproviderStrategy
+
+	// convert config settings into json string
 	configBytes, err := json.Marshal(config)
 	if err != nil {
 		return "", err

controllers/scripts/config.go

@@ -63,6 +63,23 @@ spec:
               replicas:
                 format: int32
                 type: integer
+              reprovider:
+                description: Reprovider Describes the settings that each IPFS node
+                  should use when reproviding content.
+                properties:
+                  interval:
+                    description: Interval sets the time between rounds of reproviding
+                      local content to the routing system. Defaults to '12h'.
+                    type: string
+                  strategy:
+                    description: Strategy specifies the reprovider strategy, defaults
+                      to 'all'.
+                    enum:
+                    - all
+                    - pinned
+                    - roots
+                    type: string
+                type: object
               url:
                 type: string
             required:
@@ -72,7 +89,6 @@ spec:
             - networking
             - public
             - replicas
-            - url
             type: object
           status:
             properties: