create ipfsResources field in api

Signed-off-by: Oleg <97077423+RobotSail@users.noreply.github.com>

Author: RobotSail

api/v1alpha1/ipfscluster_types.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -59,20 +60,34 @@ type followParams struct {
 	Template string `json:"template"`
 }
 
+// networkConfig defines the configuration structure used for networking.
 type networkConfig struct {
 	CircuitRelays int32 `json:"circuitRelays"`
 }
 
+// IpfsClusterSpec defines the desired state of the IpfsCluster.
 type IpfsClusterSpec struct {
+	// url defines the URL to be using as an ingress controller.
 	// +kubebuilder:validation:Optional
-	URL            string            `json:"url"`
-	Public         bool              `json:"public"`
-	IpfsStorage    resource.Quantity `json:"ipfsStorage"`
-	ClusterStorage string            `json:"clusterStorage"`
-	Replicas       int32             `json:"replicas"`
-	Networking     networkConfig     `json:"networking"`
-	Follows        []followParams    `json:"follows"`
-	// Reprovider Describes the settings that each IPFS node
+	URL string `json:"url"`
+	// public determines whether or not we should be exposing this IPFS Cluster to the public.
+	Public bool `json:"public"`
+	// ipfsStorage defines the total storage to be allocated by this resource.
+	IpfsStorage resource.Quantity `json:"ipfsStorage"`
+	// clusterStorage defines the amount of storage to be used by IPFS Cluster.
+	ClusterStorage string `json:"clusterStorage"`
+	// replicas sets the number of replicas of IPFS Cluster nodes we should be running.
+	Replicas int32 `json:"replicas"`
+	// networking defines network configuration settings.
+	Networking networkConfig `json:"networking"`
+	// follows defines the list of other IPFS Clusters this one should follow.
+	Follows []followParams `json:"follows"`
+	// ipfsResources specifies the resource requirements for each IPFS container. If this
+	// value is omitted, then the operator will automatically determine these settings
+	// based on the storage sizes used.
+	// +optional
+	IPFSResources *corev1.ResourceRequirements `json:"ipfsResources,omitempty"`
+	// reprovider Describes the settings that each IPFS node
 	// should use when reproviding content.
 	// +optional
 	Reprovider ReprovideSettings `json:"reprovider,omitempty"`

controllers/statefulset.go

@@ -66,7 +66,14 @@ func (r *IpfsClusterReconciler) statefulSet(m *clusterv1alpha1.IpfsCluster,
 ) controllerutil.MutateFn {
 	ssName := "ipfs-cluster-" + m.Name
 
-	ipfsResources := utils.IPFSContainerResources(m.Spec.IpfsStorage.Value())
+	//
+	var ipfsResources corev1.ResourceRequirements
+	if m.Spec.IPFSResources == nil {
+		ipfsResources = *m.Spec.IPFSResources
+	} else {
+		ipfsResources = utils.IPFSContainerResources(m.Spec.IpfsStorage.Value())
+	}
+
 	expected := &appsv1.StatefulSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      ssName,

controllers/utils/utils.go

@@ -62,21 +62,16 @@ func IPFSContainerResources(ipfsStorageBytes int64) (ipfsResources corev1.Resour
 		ipfsRAMGBMin = 1
 	}
 
-	// // ipfsRAMMinQuantity := resource.NewScaledQuantity(ipfsRAMGBMin, resource.Giga)
-	// ipfsRAMMaxQuantity := resource.NewScaledQuantity(2*ipfsRAMGBMin, resource.Giga)
-	// // ipfsCoresMinQuantity := resource.NewScaledQuantity(ipfsMilliCoresMin, resource.Milli)
-	// ipfsCoresMaxQuantity := resource.NewScaledQuantity(2*ipfsMilliCoresMin, resource.Milli)
-
-	// ipfsRAMMinQuantity := resource.NewScaledQuantity(ipfsRAMGBMin, resource.Giga)
-	ipfsRAMMaxQuantity := resource.NewScaledQuantity(ipfsRAMGBMin, resource.Giga)
-	// ipfsCoresMinQuantity := resource.NewScaledQuantity(ipfsMilliCoresMin, resource.Milli)
-	ipfsCoresMaxQuantity := resource.NewScaledQuantity(ipfsMilliCoresMin, resource.Milli)
+	ipfsRAMMinQuantity := resource.NewScaledQuantity(ipfsRAMGBMin, resource.Giga)
+	ipfsRAMMaxQuantity := resource.NewScaledQuantity(2*ipfsRAMGBMin, resource.Giga)
+	ipfsCoresMinQuantity := resource.NewScaledQuantity(ipfsMilliCoresMin, resource.Milli)
+	ipfsCoresMaxQuantity := resource.NewScaledQuantity(2*ipfsMilliCoresMin, resource.Milli)
 
 	ipfsResources = corev1.ResourceRequirements{
-		// Requests: corev1.ResourceList{
-		// 	corev1.ResourceMemory: *ipfsRAMMinQuantity,
-		// 	corev1.ResourceCPU:    *ipfsCoresMinQuantity,
-		// },
+		Requests: corev1.ResourceList{
+			corev1.ResourceMemory: *ipfsRAMMinQuantity,
+			corev1.ResourceCPU:    *ipfsCoresMinQuantity,
+		},
 		Limits: corev1.ResourceList{
 			corev1.ResourceMemory: *ipfsRAMMaxQuantity,
 			corev1.ResourceCPU:    *ipfsCoresMaxQuantity,

test-kuttl/e2e/cluster-follow/00-create-cluster.yaml

@@ -10,6 +10,10 @@ spec:
   replicas: 1
   networking:
     circuitRelays: 1
+  ipfsResources:
+    limits:
+      cpu: 250m
+      memory: 512M
   follows:
   - name: gutenberg_es
     template: gutenberg-es.collab.ipfscluster.io 

test-kuttl/e2e/ipfs/05-create-ipfs-cluster.yaml

@@ -10,5 +10,9 @@ spec:
   public: false
   replicas: 2
   follows: []
+  ipfsResources:
+    limits:
+      cpu: 250m
+      memory: 512M
   networking:
     circuitRelays: 0