Merge pull request #11 from coryschwartz/experiment/relay

circuitrelay

Author: RobotSail

.gitignore

@@ -23,3 +23,9 @@ testbin/*
 *.swp
 *.swo
 *~
+
+# kubeconfig generated during test-e2e
+test-e2e/kubeconfig
+
+# don't include vendor/
+vendor/*

PROJECT

@@ -16,4 +16,13 @@ resources:
   kind: Ipfs
   path: github.com/redhat-et/ipfs-operator/api/v1alpha1
   version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: ipfs.io
+  group: cluster
+  kind: CircuitRelay
+  path: github.com/redhat-et/ipfs-operator/api/v1alpha1
+  version: v1alpha1
 version: "3"

api/v1alpha1/circuitrelay_types.go

@@ -0,0 +1,104 @@
+/*
+Copyright 2022.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"github.com/libp2p/go-libp2p-core/peer"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	ma "github.com/multiformats/go-multiaddr"
+)
+
+// This is intended to mimic peer.AddrInfo
+type AddrInfoBasicType struct {
+	ID       string        `json:"id"`
+	Addrs    []string      `json:"addrs"`
+	addrInfo peer.AddrInfo `json:"-"`
+}
+
+func (a *AddrInfoBasicType) Parse() error {
+	id, err := peer.IDB58Decode(a.ID)
+	if err != nil {
+		return err
+	}
+	addrs := make([]ma.Multiaddr, len(a.Addrs))
+	for i, addr := range a.Addrs {
+		maddr, err := ma.NewMultiaddr(addr)
+		if err != nil {
+			return err
+		}
+		addrs[i] = maddr
+	}
+	ai := peer.AddrInfo{
+		ID:    id,
+		Addrs: addrs,
+	}
+	a.addrInfo = ai
+	return nil
+}
+
+func (a *AddrInfoBasicType) AddrInfo() *peer.AddrInfo {
+	return &a.addrInfo
+}
+
+func (a *AddrInfoBasicType) DeepCopyInto(out *AddrInfoBasicType) {
+	out = new(AddrInfoBasicType)
+	addrs := make([]string, len(a.Addrs))
+	for i, addr := range a.Addrs {
+		addrs[i] = addr
+	}
+	out.ID = a.ID
+	out.Addrs = addrs
+}
+
+func (a *AddrInfoBasicType) DeepCopy() *AddrInfoBasicType {
+	var out *AddrInfoBasicType
+	a.DeepCopyInto(out)
+	return out
+}
+
+type CircuitRelaySpec struct {
+}
+
+type CircuitRelayStatus struct {
+	AddrInfo AddrInfoBasicType `json:"addrInfo"`
+}
+
+//+kubebuilder:object:root=true
+//+kubebuilder:subresource:status
+
+// CircuitRelay is the Schema for the circuitrelays API
+type CircuitRelay struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   CircuitRelaySpec   `json:"spec,omitempty"`
+	Status CircuitRelayStatus `json:"status,omitempty"`
+}
+
+//+kubebuilder:object:root=true
+
+// CircuitRelayList contains a list of CircuitRelay
+type CircuitRelayList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []CircuitRelay `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&CircuitRelay{}, &CircuitRelayList{})
+}

api/v1alpha1/ipfs_types.go

@@ -31,17 +31,22 @@ const (
 	ReconciledReasonError string = "ReconcileError"
 )
 
+type networkConfig struct {
+	CircuitRelays int32 `json:"circuitRelays"`
+}
+
 type IpfsSpec struct {
-	URL            string `json:"url"`
-	Public         bool   `json:"public"`
-	IpfsStorage    string `json:"ipfsStorage"`
-	ClusterStorage string `json:"clusterStorage"`
-	Replicas       int32  `json:"replicas"`
+	URL            string        `json:"url"`
+	Public         bool          `json:"public"`
+	IpfsStorage    string        `json:"ipfsStorage"`
+	ClusterStorage string        `json:"clusterStorage"`
+	Replicas       int32         `json:"replicas"`
+	Networking     networkConfig `json:"networking"`
 }
 
 type IpfsStatus struct {
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
-	Addresses  []string           `json:"addresses,omitempty"`
+	Conditions    []metav1.Condition `json:"conditions,omitempty"`
+	CircuitRelays []string           `json:"circuitRelays,omitempty"`
 }
 
 //+kubebuilder:object:root=true

api/v1alpha1/zz_generated.deepcopy.go

@@ -0,0 +1,64 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.8.0
+  creationTimestamp: null
+  name: circuitrelays.cluster.ipfs.io
+spec:
+  group: cluster.ipfs.io
+  names:
+    kind: CircuitRelay
+    listKind: CircuitRelayList
+    plural: circuitrelays
+    singular: circuitrelay
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: CircuitRelay is the Schema for the circuitrelays API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            type: object
+          status:
+            properties:
+              addrInfo:
+                description: This is intended to mimic peer.AddrInfo
+                properties:
+                  addrs:
+                    items:
+                      type: string
+                    type: array
+                  id:
+                    type: string
+                required:
+                - addrs
+                - id
+                type: object
+            required:
+            - addrInfo
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

bundle/manifests/cluster.ipfs.io_circuitrelays.yaml

@@ -37,6 +37,14 @@ spec:
                 type: string
               ipfsStorage:
                 type: string
+              networking:
+                properties:
+                  circuitRelays:
+                    format: int32
+                    type: integer
+                required:
+                - circuitRelays
+                type: object
               public:
                 type: boolean
               replicas:
@@ -47,13 +55,14 @@ spec:
             required:
             - clusterStorage
             - ipfsStorage
+            - networking
             - public
             - replicas
             - url
             type: object
           status:
             properties:
-              addresses:
+              circuitRelays:
                 items:
                   type: string
                 type: array