rename NetworkMode -> Public

Signed-off-by: Oleg S <[email protected]>

Author: RobotSail

api/v1alpha1/ipfscluster_types.go

@@ -44,17 +44,6 @@ const (
 	ReproviderStrategyRoots ReproviderStrategy = "roots"
 )
 
-type NetworkMode string
-
-const (
-	// NetworkModePublic Defines an IPFSCluster running in public mode with its
-	// content available to everyone.
-	NetworkModePublic NetworkMode = "public"
-	// NetworkModePrivate Defines an IPFSCluster running in a private network
-	// with its content only available to other authorized nodes.
-	NetworkModePrivate NetworkMode = "private"
-)
-
 type ReprovideSettings struct {
 	// Strategy specifies the reprovider strategy, defaults to 'all'.
 	// +kubebuilder:validation:Enum={all,pinned,roots}
@@ -75,10 +64,10 @@ type followParams struct {
 type NetworkConfig struct {
 	// circuitRelays defines how many CircuitRelays should be created.
 	CircuitRelays int32 `json:"circuitRelays"`
-	// networkMode is a switch which defines whether this IPFSCluster will use
+	// public is a switch which defines whether this IPFSCluster will use
 	// the global IPFS network or create its own.
-	// +kubebuilder:validation:Enum={public,private}
-	NetworkMode NetworkMode `json:"networkMode,omitempty"`
+	// +kubebuilder:default:=true
+	Public bool `json:"public,omitempty"`
 }
 
 // IpfsClusterSpec defines the desired state of the IpfsCluster.

bundle/manifests/cluster.ipfs.io_ipfsclusters.yaml

@@ -101,13 +101,11 @@ spec:
                       be created.
                     format: int32
                     type: integer
-                  networkMode:
-                    description: networkMode is a switch which defines whether this
-                      IPFSCluster will use the global IPFS network or create its own.
-                    enum:
-                    - public
-                    - private
-                    type: string
+                  public:
+                    default: true
+                    description: public is a switch which defines whether this IPFSCluster
+                      will use the global IPFS network or create its own.
+                    type: boolean
                 required:
                 - circuitRelays
                 type: object

bundle/manifests/ipfs-operator.clusterserviceversion.yaml

@@ -22,7 +22,7 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2023-02-07T20:51:55Z"
+    createdAt: "2023-02-15T21:07:11Z"
     operators.operatorframework.io/builder: operator-sdk-v1.26.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: ipfs-operator.v0.0.1

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

@@ -102,13 +102,11 @@ spec:
                       be created.
                     format: int32
                     type: integer
-                  networkMode:
-                    description: networkMode is a switch which defines whether this
-                      IPFSCluster will use the global IPFS network or create its own.
-                    enum:
-                    - public
-                    - private
-                    type: string
+                  public:
+                    default: true
+                    description: public is a switch which defines whether this IPFSCluster
+                      will use the global IPFS network or create its own.
+                    type: boolean
                 required:
                 - circuitRelays
                 type: object

controllers/ipfscluster_controller.go

@@ -34,7 +34,6 @@ import (
 
 	"github.com/libp2p/go-libp2p/core/peer"
 	ma "github.com/multiformats/go-multiaddr"
-	"github.com/redhat-et/ipfs-operator/api/v1alpha1"
 	clusterv1alpha1 "github.com/redhat-et/ipfs-operator/api/v1alpha1"
 )
 
@@ -122,7 +121,7 @@ func (r *IpfsClusterReconciler) createTrackedObjects(
 		return fmt.Errorf("could not retrieve information from the relay circuit: %w", err)
 	}
 	// initialize bootstrap peers if we are on a private network
-	if instance.Spec.Networking.NetworkMode == v1alpha1.NetworkModePrivate {
+	if !instance.Spec.Networking.Public {
 		if instance.Spec.Replicas < 1 {
 			return fmt.Errorf("number of replicas must be at least 1 to run in private mode")
 		}

controllers/statefulset.go

@@ -100,7 +100,7 @@ func (r *IpfsClusterReconciler) StatefulSet(
 			Name:  "IPFS_FD_MAX",
 			Value: "4096",
 		}}
-		if m.Spec.Networking.NetworkMode == clusterv1alpha1.NetworkModePrivate {
+		if !m.Spec.Networking.Public {
 			swarmKeySecret := corev1.EnvVar{
 				Name: EnvIPFSSwarmKey,
 				ValueFrom: &corev1.EnvVarSource{

examples/ipfs-medium-private.yaml

@@ -12,4 +12,4 @@ spec:
   follows: []
   networking:
     circuitRelays: 1
-    networkMode: private
+    public: false

examples/ipfs-small-private.yaml

@@ -12,4 +12,4 @@ spec:
   follows: []
   networking:
     circuitRelays: 1
-    networkMode: private
+    public: false

helm/ipfs-operator/crds/cluster.ipfs.io_ipfsclusters.yaml

@@ -102,13 +102,11 @@ spec:
                       be created.
                     format: int32
                     type: integer
-                  networkMode:
-                    description: networkMode is a switch which defines whether this
-                      IPFSCluster will use the global IPFS network or create its own.
-                    enum:
-                    - public
-                    - private
-                    type: string
+                  public:
+                    default: true
+                    description: public is a switch which defines whether this IPFSCluster
+                      will use the global IPFS network or create its own.
+                    type: boolean
                 required:
                 - circuitRelays
                 type: object

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

@@ -9,7 +9,7 @@ spec:
   replicas: 1
   networking:
     circuitRelays: 1
-    networkMode: public
+    public: false
   ipfsResources:
     limits:
       cpu: 250m

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

@@ -13,5 +13,5 @@ spec:
       cpu: 250m
       memory: 512M
   networking:
-    networkMode: public
+    public: true
     circuitRelays: 0

test-kuttl/e2e/private-network/00-create-ipfs-cluster.yaml

@@ -13,5 +13,5 @@ spec:
       cpu: 100m
       memory: 128M
   networking:
-    networkMode: private
+    public: false
     circuitRelays: 1