minimal collabora on Openshift and Kind

Signed-off-by: Nicolas Bigler <nicolas.bigler@vshn.ch>
vshn · Oct 22, 2024 · 72b4b09 · 72b4b09
1 parent fe04df7
commit 72b4b09
Show file tree

Hide file tree

Showing 10 changed files with 1,626 additions and 95 deletions.
diff --git a/apis/vshn/v1/vshn_nextcloud.go b/apis/vshn/v1/vshn_nextcloud.go
@@ -13,6 +13,7 @@ import (
 //go:generate yq -i e ../../generated/vshn.appcat.vshn.io_vshnnextclouds.yaml --expression "with(.spec.versions[]; .schema.openAPIV3Schema.properties.spec.properties.parameters.properties.service.properties.postgreSQLParameters.default={})"
 //go:generate yq -i e ../../generated/vshn.appcat.vshn.io_vshnnextclouds.yaml --expression "with(.spec.versions[]; .schema.openAPIV3Schema.properties.spec.properties.parameters.properties.backup.default={})"
 //go:generate yq -i e ../../generated/vshn.appcat.vshn.io_vshnnextclouds.yaml --expression "with(.spec.versions[]; .schema.openAPIV3Schema.properties.spec.properties.parameters.properties.security.default={})"
+//go:generate yq -i e ../../generated/vshn.appcat.vshn.io_vshnnextclouds.yaml --expression "with(.spec.versions[]; .schema.openAPIV3Schema.properties.spec.properties.parameters.properties.service.collabora.default={})"
 
 // +kubebuilder:object:root=true
 
@@ -172,8 +173,10 @@ func (v *VSHNNextcloud) SetInstanceNamespaceStatus() {
 }
 
 type CollaboraSpec struct {
-	FQDN string       `json:"fqdn,omitempty"`
-	Size VSHNSizeSpec `json:"size,omitempty"`
+	//+kubebuilder:default=false
+	Enabled bool `json:"enabled"`
+	//+kubebuilder:validation:Required
+	FQDN string `json:"fqdn,omitempty"`
 }
 
 // +kubebuilder:object:generate=true

diff --git a/apis/vshn/v1/zz_generated.deepcopy.go b/apis/vshn/v1/zz_generated.deepcopy.go
diff --git a/crds/vshn.appcat.vshn.io_vshnnextclouds.yaml b/crds/vshn.appcat.vshn.io_vshnnextclouds.yaml
@@ -4853,34 +4853,13 @@ spec:
                       properties:
                         collabora:
                           properties:
+                            enabled:
+                              default: false
+                              type: boolean
                             fqdn:
                               type: string
-                            size:
-                              description: VSHNSizeSpec contains settings to control the sizing of a service.
-                              properties:
-                                cpu:
-                                  description: CPU defines the amount of Kubernetes CPUs for an instance.
-                                  type: string
-                                disk:
-                                  description: Disk defines the amount of disk space for an instance.
-                                  type: string
-                                memory:
-                                  description: Memory defines the amount of memory in units of bytes for an instance.
-                                  type: string
-                                plan:
-                                  description: Plan is the name of the resource plan that defines the compute resources.
-                                  type: string
-                                requests:
-                                  description: Requests defines CPU and memory requests for an instance
-                                  properties:
-                                    cpu:
-                                      description: CPU defines the amount of Kubernetes CPUs for an instance.
-                                      type: string
-                                    memory:
-                                      description: Memory defines the amount of memory in units of bytes for an instance.
-                                      type: string
-                                  type: object
-                              type: object
+                          required:
+                            - enabled
                           type: object
                         fqdn:
                           description: |-
@@ -9953,6 +9932,8 @@ spec:
                       required:
                         - fqdn
                       type: object
+                      collabora:
+                        default: {}
                     size:
                       description: Size contains settings to control the sizing of a service.
                       properties:

diff --git a/crds/vshn.appcat.vshn.io_xvshnnextclouds.yaml b/crds/vshn.appcat.vshn.io_xvshnnextclouds.yaml
@@ -5577,42 +5577,13 @@ spec:
                     properties:
                       collabora:
                         properties:
+                          enabled:
+                            default: false
+                            type: boolean
                           fqdn:
                             type: string
-                          size:
-                            description: VSHNSizeSpec contains settings to control
-                              the sizing of a service.
-                            properties:
-                              cpu:
-                                description: CPU defines the amount of Kubernetes
-                                  CPUs for an instance.
-                                type: string
-                              disk:
-                                description: Disk defines the amount of disk space
-                                  for an instance.
-                                type: string
-                              memory:
-                                description: Memory defines the amount of memory in
-                                  units of bytes for an instance.
-                                type: string
-                              plan:
-                                description: Plan is the name of the resource plan
-                                  that defines the compute resources.
-                                type: string
-                              requests:
-                                description: Requests defines CPU and memory requests
-                                  for an instance
-                                properties:
-                                  cpu:
-                                    description: CPU defines the amount of Kubernetes
-                                      CPUs for an instance.
-                                    type: string
-                                  memory:
-                                    description: Memory defines the amount of memory
-                                      in units of bytes for an instance.
-                                    type: string
-                                type: object
-                            type: object
+                        required:
+                        - enabled
                         type: object
                       fqdn:
                         description: |-

diff --git a/pkg/comp-functions/functions/vshnnextcloud/billing.go b/pkg/comp-functions/functions/vshnnextcloud/billing.go
@@ -3,9 +3,9 @@ package vshnnextcloud
 import (
 	"context"
 	"fmt"
+
 	xfnproto "github.com/crossplane/function-sdk-go/proto/v1beta1"
 	v1 "github.com/vshn/appcat/v4/apis/vshn/v1"
-	"github.com/vshn/appcat/v4/pkg/comp-functions/functions/common"
 	"github.com/vshn/appcat/v4/pkg/comp-functions/runtime"
 )
 
@@ -16,5 +16,6 @@ func AddServiceBillingLabel(ctx context.Context, comp *v1.VSHNNextcloud, svc *ru
 		return runtime.NewFatalResult(fmt.Errorf("can't get composite: %w", err))
 	}
 
-	return common.InjectBillingLabelToService(ctx, svc, comp)
+	//return common.InjectBillingLabelToService(ctx, svc, comp)
+	return runtime.NewNormalResult("Temporarly disabled")
 }