Merge pull request #5 from coryschwartz/cory/x

various

Author: cooktheryan

api/v1alpha1/ipfs_types.go

@@ -33,14 +33,15 @@ const (
 
 type IpfsSpec struct {
 	URL            string `json:"url"`
+	Public         bool   `json:"public"`
 	IpfsStorage    string `json:"ipfsStorage"`
 	ClusterStorage string `json:"clusterStorage"`
-	Public         bool   `json:"public"`
+	Replicas       int32  `json:"replicas"`
 }
 
 type IpfsStatus struct {
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
-	Address    string             `json:"address,omitempty"`
+	Addresses  []string           `json:"addresses,omitempty"`
 }
 
 //+kubebuilder:object:root=true

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.18.0+git
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.19.0+git
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

bundle.Dockerfile

@@ -39,18 +39,24 @@ spec:
                 type: string
               public:
                 type: boolean
+              replicas:
+                format: int32
+                type: integer
               url:
                 type: string
             required:
             - clusterStorage
             - ipfsStorage
             - public
+            - replicas
             - url
             type: object
           status:
             properties:
-              address:
-                type: string
+              addresses:
+                items:
+                  type: string
+                type: array
               conditions:
                 items:
                   description: "Condition contains details for one aspect of the current

bundle/manifests/cluster.ipfs.io_ipfs.yaml

@@ -19,7 +19,7 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    operators.operatorframework.io/builder: operator-sdk-v1.18.0+git
+    operators.operatorframework.io/builder: operator-sdk-v1.19.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: ipfs-operator.v0.0.1
   namespace: placeholder
@@ -86,6 +86,18 @@ spec:
           - get
           - patch
           - update
+        - apiGroups:
+          - ""
+          resources:
+          - configmaps
+          verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
         - apiGroups:
           - ""
           resources:
@@ -98,6 +110,18 @@ spec:
           - patch
           - update
           - watch
+        - apiGroups:
+          - ""
+          resources:
+          - secrets
+          verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
         - apiGroups:
           - ""
           resources:
@@ -148,7 +172,9 @@ spec:
           - create
         serviceAccountName: ipfs-operator-controller-manager
       deployments:
-      - name: ipfs-operator-controller-manager
+      - label:
+          control-plane: controller-manager
+        name: ipfs-operator-controller-manager
         spec:
           replicas: 1
           selector:

bundle/manifests/ipfs-operator.clusterserviceversion.yaml

@@ -5,7 +5,7 @@ annotations:
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: ipfs-operator
   operators.operatorframework.io.bundle.channels.v1: alpha
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.18.0+git
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.19.0+git
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
 

bundle/metadata/annotations.yaml

@@ -40,18 +40,24 @@ spec:
                 type: string
               public:
                 type: boolean
+              replicas:
+                format: int32
+                type: integer
               url:
                 type: string
             required:
             - clusterStorage
             - ipfsStorage
             - public
+            - replicas
             - url
             type: object
           status:
             properties:
-              address:
-                type: string
+              addresses:
+                items:
+                  type: string
+                type: array
               conditions:
                 items:
                   description: "Condition contains details for one aspect of the current

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

@@ -50,6 +50,18 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - ""
   resources:
@@ -62,6 +74,18 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - ""
   resources:

config/rbac/role.yaml

@@ -0,0 +1,28 @@
+package controllers
+
+import (
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	clusterv1alpha1 "github.com/redhat-et/ipfs-operator/api/v1alpha1"
+)
+
+func (r *IpfsReconciler) configMapConfig(m *clusterv1alpha1.Ipfs, cm *corev1.ConfigMap, peerid string) (controllerutil.MutateFn, string) {
+	cmName := "ipfs-cluster-" + m.Name
+	expected := &corev1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      cmName,
+			Namespace: m.Namespace,
+		},
+		Data: map[string]string{
+			"BOOTSTRAP_PEER_ID": peerid,
+		},
+	}
+	expected.DeepCopyInto(cm)
+	ctrl.SetControllerReference(m, cm, r.Scheme)
+	return func() error {
+		return nil
+	}, cmName
+}