Merge pull request #60 from coryschwartz/feat/rename-crd

rename CRD

Author: Cory Schwartz

PROJECT

@@ -13,7 +13,7 @@ resources:
   controller: true
   domain: ipfs.io
   group: cluster
-  kind: Ipfs
+  kind: CircuitRelay
   path: github.com/redhat-et/ipfs-operator/api/v1alpha1
   version: v1alpha1
 - api:
@@ -22,7 +22,7 @@ resources:
   controller: true
   domain: ipfs.io
   group: cluster
-  kind: CircuitRelay
+  kind: IpfsCluster
   path: github.com/redhat-et/ipfs-operator/api/v1alpha1
   version: v1alpha1
 version: "3"

api/v1alpha1/groupversion_info.go

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 // Package v1alpha1 contains API Schema definitions for the cluster v1alpha1 API group
-//+kubebuilder:object:generate=true
-//+groupName=cluster.ipfs.io
+// +kubebuilder:object:generate=true
+// +groupName=cluster.ipfs.io
 package v1alpha1
 
 import (

api/v1alpha1/ipfs_types.go api/v1alpha1/ipfscluster_types.goapi/v1alpha1/ipfs_types.go renamed to api/v1alpha1/ipfscluster_types.go

@@ -63,7 +63,7 @@ type networkConfig struct {
 	CircuitRelays int32 `json:"circuitRelays"`
 }
 
-type IpfsSpec struct {
+type IpfsClusterSpec struct {
 	// +kubebuilder:validation:Optional
 	URL            string            `json:"url"`
 	Public         bool              `json:"public"`
@@ -78,32 +78,32 @@ type IpfsSpec struct {
 	Reprovider ReprovideSettings `json:"reprovider,omitempty"`
 }
 
-type IpfsStatus struct {
+type IpfsClusterStatus struct {
 	Conditions    []metav1.Condition `json:"conditions,omitempty"`
 	CircuitRelays []string           `json:"circuitRelays,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
-// Ipfs is the Schema for the ipfs API.
-type Ipfs struct {
+// IpfsCluster is the Schema for the ipfs API.
+type IpfsCluster struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   IpfsSpec   `json:"spec,omitempty"`
-	Status IpfsStatus `json:"status,omitempty"`
+	Spec   IpfsClusterSpec   `json:"spec,omitempty"`
+	Status IpfsClusterStatus `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 
 // IpfsList contains a list of Ipfs.
-type IpfsList struct {
+type IpfsClusterList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Ipfs `json:"items"`
+	Items           []IpfsCluster `json:"items"`
 }
 
 func init() {
-	SchemeBuilder.Register(&Ipfs{}, &IpfsList{})
+	SchemeBuilder.Register(&IpfsCluster{}, &IpfsClusterList{})
 }

api/v1alpha1/zz_generated.deepcopy.go

@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=ipfs-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.19.0+git
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-unknown
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

bundle.Dockerfile

@@ -17,7 +17,7 @@ spec:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: CircuitRelay is the Schema for the circuitrelays API
+        description: CircuitRelay is the Schema for the circuitrelays API.
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -36,7 +36,7 @@ spec:
           status:
             properties:
               addrInfo:
-                description: This is intended to mimic peer.AddrInfo
+                description: This is intended to mimic peer.AddrInfo.
                 properties:
                   addrs:
                     items:

bundle/manifests/cluster.ipfs.io_circuitrelays.yaml

@@ -4,20 +4,20 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
   creationTimestamp: null
-  name: ipfs.cluster.ipfs.io
+  name: ipfsclusters.cluster.ipfs.io
 spec:
   group: cluster.ipfs.io
   names:
-    kind: Ipfs
-    listKind: IpfsList
-    plural: ipfs
-    singular: ipfs
+    kind: IpfsCluster
+    listKind: IpfsClusterList
+    plural: ipfsclusters
+    singular: ipfscluster
   scope: Namespaced
   versions:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: Ipfs is the Schema for the ipfs API
+        description: IpfsCluster is the Schema for the ipfs API.
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -35,8 +35,24 @@ spec:
             properties:
               clusterStorage:
                 type: string
+              follows:
+                items:
+                  properties:
+                    name:
+                      type: string
+                    template:
+                      type: string
+                  required:
+                  - name
+                  - template
+                  type: object
+                type: array
               ipfsStorage:
-                type: string
+                anyOf:
+                - type: integer
+                - type: string
+                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                x-kubernetes-int-or-string: true
               networking:
                 properties:
                   circuitRelays:
@@ -50,15 +66,32 @@ 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:
             - clusterStorage
+            - follows
             - ipfsStorage
             - networking
             - public
             - replicas
-            - url
             type: object
           status:
             properties:
@@ -71,8 +104,8 @@ spec:
                   description: "Condition contains details for one aspect of the current
                     state of this API Resource. --- This struct is intended for direct
                     use as an array at the field path .status.conditions.  For example,
-                    type FooStatus struct{ // Represents the observations of a foo's
-                    current state. // Known .status.conditions.type are: \"Available\",
+                    \n type FooStatus struct{ // Represents the observations of a
+                    foo's current state. // Known .status.conditions.type are: \"Available\",
                     \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
                     // +listType=map // +listMapKey=type Conditions []metav1.Condition
                     `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"