Merge branch 'full-chart'

Author: Your Name

README.md

@@ -88,6 +88,18 @@ A lightweight single-container deployment for development and testing:
 
 [View Development Chart Documentation](./charts/opencloud-dev/README.md)
 
+### Full OpenCloud Chart (`charts/opencloud-full`)
+
+A comprehensive OpenCloud deployment with all components:
+- Full microservices architecture with LDAP integration
+- NATS for distributed messaging
+- Keycloak identity and access management
+- MinIO for S3-compatible object storage
+- API Gateway for routing and security
+- OnlyOffice for document editing
+
+[View Full OpenCloud Chart Documentation](./charts/opencloud-full/README.md)
+
 ## 📜 License
 
 This project is licensed under the **AGPLv3** licence. See the [LICENSE](LICENSE) file for more details.

charts/opencloud-full/Chart.yaml

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

charts/opencloud-full/README.md

@@ -97,27 +97,7 @@ The complete OpenCloud deployment with all components for production use:
 
 [View Full Chart Documentation](./charts/opencloud-full/README.md)
 
-### Production Chart (`charts/opencloud`)
-
-The complete OpenCloud deployment with all components for production use:
-
-- Full microservices architecture
-- Keycloak for authentication
-- MinIO for object storage
-- Document editing with Collabora and/or OnlyOffice
-- Full Gateway API integration
-
-[View Production Chart Documentation](./charts/opencloud/README.md)
-
-### Development Chart (`charts/opencloud-dev`)
-
-A lightweight single-container deployment for development and testing:
-
-- Simplified deployment (single Docker container)
-- Minimal resource requirements
-- Quick setup for testing
-
-[View Development Chart Documentation](./charts/opencloud-dev/README.md)
+#
 
 ## 🚀 Installation
 
@@ -130,7 +110,7 @@ You can install the Helm charts either directly from this Git repository or from
 git clone https://github.com/opencloud-eu/helm.git
 
 # Install Full Chart
-cd charts/opencloud-full/deployments
+cd charts/opencloud-full/deployments/helm
 helmfile sync
 ```
 You can also install it with timoni instead of helm:
@@ -139,24 +119,6 @@ kubectl apply -f ./charts/opencloud-full/deployments/timoni/ && \
 timoni bundle apply -f ./charts/opencloud-full/deployments/timoni/opencloud.cue --runtime ./charts/opencloud-full/deployments/timoni/runtime.cue
 ```
 
-```bash
-# Install Production Chart
-cd helm
-helm install opencloud ./charts/opencloud \
-  --namespace opencloud \
-  --create-namespace \
-  --set httpRoute.enabled=true \
-  --set httpRoute.gateway.name=opencloud-gateway \
-  --set httpRoute.gateway.namespace=kube-system
-
-
-
-# Or install Development Chart
-cd helm
-helm install opencloud ./charts/opencloud-dev \
-  --namespace opencloud \
-  --create-namespace
-```
 
 ### Installing from OCI Registry
 

charts/opencloud-full/deployments/helm/helmfile.yaml

@@ -33,11 +33,15 @@ releases:
             persistence:
               size: "40Gi"
       - onlyoffice:
-          enabled: true
+          enabled: false
           domain: onlyoffice.opencloud.test # Domain for OnlyOffice.
           persistence:
             size: "2Gi" # Added
 
+      - collabora:
+          enabled: true
+          domain: collabora.opencloud.test # Domain for Collabora.
+
       # --- Networking Configuration ---
       - ingress:
           enabled: false # Disable traditional Ingress as Gateway API is used.
@@ -85,7 +89,7 @@ releases:
               officeSuites:
                 - name: Collabora
                   product: Collabora
-                  enabled: false
+                  enabled: true
                   uri: "https://collabora.opencloud.test"
                   insecure: true
                   disableProof: false
@@ -102,7 +106,7 @@ releases:
                           - wopi-collabora.kube.opencloud.test
                 - name: OnlyOffice
                   product: OnlyOffice
-                  enabled: true
+                  enabled: false
                   uri: "https://onlyoffice.opencloud.test"
                   insecure: true
                   disableProof: false

charts/opencloud-full/templates/_common/_tplvalues.tpl

@@ -98,6 +98,7 @@ Adds the app names to the scope and set the name of the app based on the input p
   {{- $_ := set .scope "appNameOcm" "ocm" -}}
   {{- $_ := set .scope "appNameOcs" "ocs" -}}
   {{- $_ := set .scope "appNameOnlyOffice" "onlyoffice" -}}
+  {{- $_ := set .scope "appNameCollabora" "collabora" -}}
   {{- $_ := set .scope "appNamePolicies" "policies" -}}
   {{- $_ := set .scope "appNamePostprocessing" "postprocessing" -}}
   {{- $_ := set .scope "appNameProxy" "proxy" -}}

charts/opencloud-full/templates/collabora/deployment.yaml

@@ -0,0 +1,57 @@
+{{- include "oc.basicServiceTemplates" (dict "scope" . "appName" "appNameCollabora" "appNameSuffix" "") -}}
+{{- if .Values.collabora.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+{{ include "oc.metadata" . | nindent 0 }}
+spec:
+  {{- include "oc.selector" . | nindent 2 }}
+  replicas: 1
+  template:
+    {{- include "oc.templateMetadata" (dict "scope" $ "configCheck" false) | nindent 4 }}
+    spec:
+      containers:
+        - name: collabora
+          image: {{ .Values.collabora.repository }}:{{ .Values.collabora.tag | default "latest" }}
+          imagePullPolicy: {{ .Values.collabora.pullPolicy | default "IfNotPresent" }}
+          command: ['/bin/bash', '-c']
+          args:
+            - 'coolconfig generate-proof-key && /start-collabora-online.sh'
+          env:
+            - name: aliasgroup1
+              value: 'http://collaboration-collabora:9300,https://{{ .Values.collabora.domain }},http://collaboration-collabora.{{ template "oc.namespace" $ }}.svc.cluster.local:9300'
+            - name: DONT_GEN_SSL_CERT
+              value: "YES"
+            - name: extra_params
+              value: |
+                --o:ssl.enable={{ .Values.collabora.ssl.enabled }} \
+                --o:ssl.ssl_verification={{ .Values.collabora.ssl.verification }} \
+                --o:ssl.termination=true \
+                --o:welcome.enable=false \
+                --o:net.frame_ancestors={{ .Values.externalDomain }}
+            - name: username
+              value: "{{ .Values.collabora.admin.user | default "admin" }}"
+            - name: password
+              value: "{{ .Values.collabora.admin.password | default "admin" }}"
+          ports:
+            - containerPort: 9980
+              name: http
+              protocol: TCP
+          resources:
+            {{- toYaml .Values.collabora.resources | nindent 12 }}
+          livenessProbe:
+            httpGet:
+              path: /hosting/discovery
+              port: http
+            initialDelaySeconds: 60
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /hosting/discovery
+              port: http
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          securityContext:
+            capabilities:
+              add:
+                - MKNOD
+{{- end }}

charts/opencloud-full/templates/collabora/httproute.yaml

@@ -0,0 +1,27 @@
+{{- include "oc.basicServiceTemplates" (dict "scope" . "appName" "appNameCollabora" "appNameSuffix" "") -}}
+{{- if and .Values.collabora.enabled .Values.gateway.httproute.enabled }}
+apiVersion: gateway.networking.k8s.io/v1beta1
+kind: HTTPRoute
+metadata:
+  name: {{ .Release.Name }}-collabora
+  namespace: {{ template "oc.namespace" . }}
+  labels:
+    app: {{ .appName }}
+    oc-metrics: enabled
+    {{- include "oc.labels" . | nindent 4 }}
+spec:
+  parentRefs:
+    - name: {{ .Values.gateway.httproute.gateway.name }}
+      namespace: {{ .Values.gateway.httproute.gateway.namespace }}
+      sectionName: oc-collabora-https
+  hostnames:
+    - {{ .Values.collabora.domain }}
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /
+      backendRefs:
+        - name: {{ .appName }}
+          port: 9980
+{{- end }}

charts/opencloud-full/templates/collabora/ingress.yaml

@@ -0,0 +1,29 @@
+{{- if and .Values.ingress.enabled .Values.collabora.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "opencloud.fullname" . }}-collabora
+  annotations:
+    {{- toYaml .Values.ingress.annotations | nindent 4 }}
+spec:
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
+  {{- end }}
+  {{- if .Values.global.tls.enabled }}
+  tls:
+    - hosts:
+        - {{ .Values.global.domain.collabora | quote }}
+      secretName: {{ .Values.global.tls.secretName }}
+  {{- end }}
+  rules:
+    - host: {{ .Values.global.domain.collabora | quote }}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ include "opencloud.fullname" . }}-collabora
+                port:
+                  number: 9980
+{{- end }}

charts/opencloud-full/templates/collabora/service.yaml

@@ -0,0 +1,15 @@
+{{- include "oc.basicServiceTemplates" (dict "scope" . "appName" "appNameCollabora" "appNameSuffix" "") -}}
+{{- if .Values.collabora.enabled }}
+apiVersion: v1
+kind: Service
+{{ include "oc.metadata" . | nindent 0 }}
+spec:
+  type: ClusterIP
+  ports:
+    - port: 9980
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ .appName }}
+{{- end }}