Merge pull request #94 from patilsuraj767/remove-fields

Removes unused fields

Author: RobotSail

Makefile

@@ -2,6 +2,7 @@
 GOLANGCI_VERSION := v1.46.1
 HELM_VERSION := v3.8.2
 KUTTL_VERSION := 0.10.0
+GINKGO_VERSION := v2.7.0
 
 
 OS := $(shell go env GOOS)
@@ -322,7 +323,7 @@ kuttl: ## Download kuttl
 
 .PHONY: ginkgo
 GINKGO := $(LOCALBIN)/ginkgo
-GINKGO_URL := github.com/onsi/ginkgo/v2/ginkgo
+GINKGO_URL := github.com/onsi/ginkgo/v2/ginkgo@$(GINKGO_VERSION)
 ginkgo: $(GINKGO) ## Install ginkgo
 $(GINKGO): $(LOCALBIN)
 	$(call go-install-mod-tool,$(LOCALBIN),$(GINKGO_URL))

README.md

@@ -23,10 +23,8 @@ kind: Ipfs
 metadata:
   name: ipfs-sample-1
 spec:
-  url: apps.jephilli-4-11-04-28-0655.devcluster.openshift.com 
   ipfsStorage: 2Gi
   clusterStorage: 2Gi
-  public: true
 ```
 Once the values match your environment run the following.
 ```bash

api/v1alpha1/ipfscluster_types.go

@@ -67,11 +67,6 @@ type networkConfig struct {
 
 // 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 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.

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

@@ -103,10 +103,6 @@ spec:
                 required:
                 - circuitRelays
                 type: object
-              public:
-                description: public determines whether or not we should be exposing
-                  this IPFS Cluster to the public.
-                type: boolean
               replicas:
                 description: replicas sets the number of replicas of IPFS Cluster
                   nodes we should be running.
@@ -129,15 +125,11 @@ spec:
                     - roots
                     type: string
                 type: object
-              url:
-                description: url defines the URL to be using as an ingress controller.
-                type: string
             required:
             - clusterStorage
             - follows
             - ipfsStorage
             - networking
-            - public
             - replicas
             type: object
           status:

docs/source/your_first_cluster.rst

@@ -12,11 +12,9 @@ Create a file with the following information
    metadata:
      name: ipfs-sample-1
    spec:
-     url: apps.example.com 
      ipfsStorage: 2Gi
      clusterStorage: 2Gi
      replicas: 5
-     public: true
      follows: []
      networking:
        circuitRelays: 1
@@ -28,11 +26,11 @@ Once you have made the necessary adjustments, apply it to your cluster with kube
 
 .. code-block:: bash
 
-  kubectl create namespace my_cluster
-  kubectl -n my_cluster apply -f ipfs.yaml
+  kubectl create namespace mycluster
+  kubectl -n mycluster apply -f ipfs.yaml
 
 Verify that the cluster has started by viewing the status of the cluster.
 
 .. code-block:: bash
 
-  kubectl -n my_namespace status ipfs-sample-1
+  kubectl -n mycluster status ipfs-sample-1

examples/collab-follow-small.yaml

@@ -5,10 +5,8 @@ kind: Ipfs
 metadata:
   name: ipfs-sample-collab
 spec:
-  url: apps.jephilli-4-11-04-28-0655.devcluster.openshift.com 
   ipfsStorage: 2Gi
   clusterStorage: 1Gi
-  public: true
   replicas: 1
   networking:
     circuitRelays: 1

examples/collab-follow.yaml

@@ -4,10 +4,8 @@ kind: IpfsCluster
 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

examples/ipfs-small.yaml

@@ -8,7 +8,6 @@ metadata:
 spec:
   ipfsStorage: 2Gi
   clusterStorage: 1Gi
-  public: false
   replicas: 1
   follows: []
   networking:

examples/ipfs.yaml

@@ -4,10 +4,8 @@ kind: IpfsCluster
 metadata:
   name: ipfs-sample
 spec:
-  url: apps.jephilli-4-11-04-28-0655.devcluster.openshift.com 
   ipfsStorage: 50Gi
   clusterStorage: 5Gi
-  public: true
   replicas: 2
   follows: []
   networking:

go.mod

@@ -9,8 +9,8 @@ require (
 	github.com/libp2p/go-libp2p-core v0.16.1
 	github.com/libp2p/go-libp2p-relay-daemon v0.1.1-0.20220720133550-bd5627c90f06
 	github.com/multiformats/go-multiaddr v0.5.0
-	github.com/onsi/ginkgo/v2 v2.1.4
-	github.com/onsi/gomega v1.20.0
+	github.com/onsi/ginkgo/v2 v2.7.0
+	github.com/onsi/gomega v1.24.1
 	k8s.io/apimachinery v0.25.0
 	k8s.io/client-go v0.25.0
 	sigs.k8s.io/controller-runtime v0.12.3
@@ -78,7 +78,7 @@ require (
 	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/whyrusleeping/cbor-gen v0.0.0-20210219115102-f37d292932f2 // indirect
-	golang.org/x/tools v0.1.12 // indirect
+	golang.org/x/tools v0.4.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
 	lukechampine.com/blake3 v1.1.7 // indirect
 )
@@ -100,7 +100,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
@@ -118,11 +118,11 @@ require (
 	go.uber.org/multierr v1.8.0 // indirect
 	go.uber.org/zap v1.21.0 // indirect
 	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
-	golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
+	golang.org/x/net v0.3.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 // indirect
-	golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64 // indirect
-	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/term v0.3.0 // indirect
+	golang.org/x/text v0.5.0 // indirect
 	golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect