update manifests && crds

RobotSail · RobotSail · commit c7b1f8fe53bf · 2023-01-19T12:43:27.000-05:00
Signed-off-by: Oleg S &lt;97077423+RobotSail@users.noreply.github.com&gt;
diff --git a/Makefile b/Makefile
@@ -137,7 +137,7 @@ test: lint manifests generate fmt vet lint envtest ginkgo ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" $(GINKGO) run $(GINKGO_ARGS) $(GINKGO_TARGETS)
 
 .PHONY: test-e2e
-test-e2e: kuttl ## Run e2e tests. Requires cluster w/ Scribe already installed
+test-e2e: kuttl ## Run e2e tests. Requires cluster w/ IPFS Operator already installed.
 	cd test-kuttl && $(KUTTL) test 
 	rm -f test-kuttl/kubeconfig
 
@@ -318,7 +318,8 @@ endef
 .PHONY: kuttl
 KUTTL := $(LOCALBIN)/kuttl
 KUTTL_URL := https://github.com/kudobuilder/kuttl/releases/download/v$(KUTTL_VERSION)/kubectl-kuttl_$(KUTTL_VERSION)_linux_x86_64
-kuttl: ## Download kuttl
+kuttl: $(KUTTL) ## Download kuttl
+$(KUTTL): $(LOCALBIN) 
 	$(call download-tool,$(KUTTL),$(KUTTL_URL))
 
 .PHONY: ginkgo
diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -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.22.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.26.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 
diff --git a/bundle/manifests/cluster.ipfs.io_ipfsclusters.yaml b/bundle/manifests/cluster.ipfs.io_ipfsclusters.yaml
@@ -102,10 +102,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.
@@ -128,15 +124,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:
diff --git a/bundle/manifests/ipfs-operator.clusterserviceversion.yaml b/bundle/manifests/ipfs-operator.clusterserviceversion.yaml
@@ -22,7 +22,8 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    operators.operatorframework.io/builder: operator-sdk-v1.22.0
+    createdAt: "2023-01-19T17:29:48Z"
+    operators.operatorframework.io/builder: operator-sdk-v1.26.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: ipfs-operator.v0.0.1
   namespace: placeholder
diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.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.22.0
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.26.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
 
diff --git a/helm/ipfs-operator/crds/CustomResourceDefinition-circuitrelays.cluster.ipfs.io.yaml b/helm/ipfs-operator/crds/CustomResourceDefinition-circuitrelays.cluster.ipfs.io.yaml
@@ -4,7 +4,6 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
   creationTimestamp: null
-  labels: {}
   name: circuitrelays.cluster.ipfs.io
 spec:
   group: cluster.ipfs.io
diff --git a/helm/ipfs-operator/crds/CustomResourceDefinition-ipfsclusters.cluster.ipfs.io.yaml b/helm/ipfs-operator/crds/CustomResourceDefinition-ipfsclusters.cluster.ipfs.io.yaml
@@ -4,7 +4,6 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
   creationTimestamp: null
-  labels: {}
   name: ipfsclusters.cluster.ipfs.io
 spec:
   group: cluster.ipfs.io
@@ -33,10 +32,19 @@ spec:
           metadata:
             type: object
           spec:
+            description: IpfsClusterSpec defines the desired state of the IpfsCluster.
             properties:
               clusterStorage:
-                type: string
+                anyOf:
+                - type: integer
+                - type: string
+                description: clusterStorage defines the amount of storage to be used
+                  by IPFS Cluster.
+                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                x-kubernetes-int-or-string: true
               follows:
+                description: follows defines the list of other IPFS Clusters this
+                  one should follow.
                 items:
                   properties:
                     name:
@@ -48,27 +56,59 @@ spec:
                   - template
                   type: object
                 type: array
+              ipfsResources:
+                description: ipfsResources specifies the resource requirements for
+                  each IPFS container. If this value is omitted, then the operator
+                  will automatically determine these settings based on the storage
+                  sizes used.
+                properties:
+                  limits:
+                    additionalProperties:
+                      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
+                    description: 'Limits describes the maximum amount of compute resources
+                      allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                    type: object
+                  requests:
+                    additionalProperties:
+                      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
+                    description: 'Requests describes the minimum amount of compute
+                      resources required. If Requests is omitted for a container,
+                      it defaults to Limits if that is explicitly specified, otherwise
+                      to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                    type: object
+                type: object
               ipfsStorage:
                 anyOf:
                 - type: integer
                 - type: string
+                description: ipfsStorage defines the total storage to be allocated
+                  by this resource.
                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                 x-kubernetes-int-or-string: true
               networking:
+                description: networking defines network configuration settings.
                 properties:
                   circuitRelays:
                     format: int32
                     type: integer
                 required:
                 - circuitRelays
                 type: object
-              public:
-                type: boolean
               replicas:
+                description: replicas sets the number of replicas of IPFS Cluster
+                  nodes we should be running.
                 format: int32
                 type: integer
               reprovider:
-                description: Reprovider Describes the settings that each IPFS node
+                description: reprovider Describes the settings that each IPFS node
                   should use when reproviding content.
                 properties:
                   interval:
@@ -84,14 +124,11 @@ spec:
                     - roots
                     type: string
                 type: object
-              url:
-                type: string
             required:
             - clusterStorage
             - follows
             - ipfsStorage
             - networking
-            - public
             - replicas
             type: object
           status:

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ metadata:`
`22`	`22`	`}`
`23`	`23`	`]`
`24`	`24`	`capabilities: Basic Install`
`25`		`- operators.operatorframework.io/builder: operator-sdk-v1.22.0`
	`25`	`+ createdAt: "2023-01-19T17:29:48Z"`
	`26`	`+ operators.operatorframework.io/builder: operator-sdk-v1.26.0`
`26`	`27`	`operators.operatorframework.io/project_layout: go.kubebuilder.io/v3`
`27`	`28`	`name: ipfs-operator.v0.0.1`
`28`	`29`	`namespace: placeholder`