Merge branch 'full-chart'

Author: Your Name

charts/opencloud-full/Chart.yaml

@@ -9,7 +9,7 @@ maintainers:
     email: [email protected]
     url: https://opencloud.eu
 type: application
-version: 2.0.4
+version: 2.0.5
 # renovate: datasource=docker depName=opencloudeu/opencloud-rolling
 appVersion: 2.3.0
 kubeVersion: ""

charts/opencloud-full/deployments/timoni/opencloud.cue

@@ -10,7 +10,7 @@ bundle: {
             namespace: "opencloud"
             values: {
                 repository: {
-                    url: "oci://ghcr.io/suse-coder/helm-charts" 
+                    url: "oci://ghcr.io/suse-coder/helm-charts"
                 }
                 chart: {
                     name:    "opencloud-full"
@@ -38,9 +38,11 @@ bundle: {
                     minio: {
                         enabled: bool @timoni(runtime:bool:MINIO_ENABLED)
                         domain: string @timoni(runtime:string:MINIO_DOMAIN)
-                        persistenceSize: string @timoni(runtime:string:MINIO_PERSISTENCE_SIZE)
                         config: {
                             rootPassword: string @timoni(runtime:string:MINIO_ROOT_PASSWORD)
+                            persistence: {
+                                size: string @timoni(runtime:string:MINIO_PERSISTENCE_SIZE)
+                            }
                         }
                     }
                     onlyoffice: {
@@ -113,7 +115,7 @@ bundle: {
                                 }
                             }
                         }
-                        
+
                         appsIntegration: {
                             enabled: bool @timoni(runtime:bool:APPS_INTEGRATION_ENABLED)
                             wopiIntegration: {
@@ -132,7 +134,7 @@ bundle: {
                                             ingressClassName: string @timoni(runtime:string:COLLABORA_INGRESS_CLASS_NAME)
                                             annotations: {
                                                 "nginx.ingress.kubernetes.io/proxy-body-size": string @timoni(runtime:string:COLLABORA_INGRESS_PROXY_BODY_SIZE)
-                                            }                                         
+                                            }
                                         }
                                     },
                                     {

charts/opencloud-full/deployments/timoni/runtime.cue

@@ -85,6 +85,7 @@ runtime: {
                 "COLLABORA_INGRESS_CLASS_NAME": "obj.data.COLLABORA_INGRESS_CLASS_NAME"
                 "COLLABORA_INGRESS_PROXY_BODY_SIZE": "obj.data.COLLABORA_INGRESS_PROXY_BODY_SIZE"
                 "ONLYOFFICE_ENABLED": "obj.data.ONLYOFFICE_ENABLED"
+                "ONLYOFFICE_DOMAIN": "obj.data.ONLYOFFICE_DOMAIN"
                 "ONLYOFFICE_INSECURE": "obj.data.ONLYOFFICE_INSECURE"
                 "ONLYOFFICE_DISABLE_PROOF": "obj.data.ONLYOFFICE_DISABLE_PROOF"
                 "ONLYOFFICE_INGRESS_ENABLED": "obj.data.ONLYOFFICE_INGRESS_ENABLED"
@@ -144,7 +145,7 @@ runtime: {
         KEYCLOAK_ENABLED: true
         MINIO_ENABLED: true
         MINIO_PERSISTENCE_SIZE: "40Gi"
-        ONLYOFFICE_DOMAIN: strings.TrimPrefix(strings.TrimPrefix(parameter.ONLYOFFICE_URI, "https://"), "http://")
+        ONLYOFFICE_DOMAIN: ""
         INGRESS_ENABLED: false
         INGRESS_CLASS_NAME: "nginx"
         INGRESS_PROXY_BODY_SIZE: "1024m"

charts/opencloud-full/templates/auth-app/deployment.yaml

@@ -1,3 +1,4 @@
+{{- /*
 {{- include "oc.basicServiceTemplates" (dict "scope" . "appName" "appNameAuthApp" "appNameSuffix" "") -}}
 apiVersion: apps/v1
 kind: Deployment
@@ -85,3 +86,4 @@ spec:
         - name: tmp-volume
           emptyDir: {}
         {{- include "oc.caVolume" $ | nindent 8}}
+*/ -}}