Skip to content

Commit 7a23c2b

Browse files
author
Your Name
committed
Bump Version number
1 parent 8373036 commit 7a23c2b

File tree

6 files changed

+38
-4
lines changed

6 files changed

+38
-4
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ releases:
2929
- minio:
3030
enabled: true # Enable MinIO for object storage.
3131
domain: minio.opencloud.test # Domain for MinIO.
32+
config:
33+
persistence:
34+
size: "40Gi"
35+
- onlyoffice:
36+
enabled: true
37+
domain: onlyoffice.opencloud.test # Domain for OnlyOffice.
3238

3339
# --- Networking Configuration ---
3440
- ingress:

charts/opencloud-full/deployments/timoni/configmap.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,19 @@ data:
3535
###############################################################################
3636
KEYCLOAK_DOMAIN: "keycloak.opencloud.test"
3737
KEYCLOAK_ENABLED: "true"
38-
# KEYCLOAK_ADMIN_PASSWORD: "admin" # Removed from configmap
38+
3939

4040
###############################################################################
4141
# Minio Configuration
4242
###############################################################################
4343
MINIO_DOMAIN: "minio.opencloud.test"
4444
MINIO_ENABLED: "true"
45+
MINIO_PERSISTENCE_SIZE: "40Gi"
4546

4647
###############################################################################
4748
# LDAP Configuration
4849
###############################################################################
49-
LDAP_URI: "ldaps://openldap.openldap.svc.cluster.local:389"
50+
LDAP_URI: "ldaps://openldap.openldap.svc.cluster.local:636"
5051
LDAP_GLOBAL_DOMAIN: "opencloud.eu"
5152
LDAP_WRITEABLE: "true"
5253
LDAP_INSECURE: "true"
@@ -84,6 +85,7 @@ data:
8485
# OnlyOffice Configuration
8586
###############################################################################
8687
ONLYOFFICE_URI: "https://onlyoffice.opencloud.test"
88+
ONLYOFFICE_DOMAIN: "onlyoffice.opencloud.test"
8789
ONLYOFFICE_ICON_URI: "https://onlyoffice.opencloud.test/web-apps/apps/documenteditor/main/resources/img/favicon.ico"
8890
ONLYOFFICE_ENABLED: "true"
8991
ONLYOFFICE_INSECURE: "true"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@ bundle: {
3838
minio: {
3939
enabled: bool @timoni(runtime:bool:MINIO_ENABLED)
4040
domain: string @timoni(runtime:string:MINIO_DOMAIN)
41+
persistenceSize: string @timoni(runtime:string:MINIO_PERSISTENCE_SIZE)
4142
config: {
4243
rootPassword: string @timoni(runtime:string:MINIO_ROOT_PASSWORD)
4344
}
4445
}
4546
onlyoffice: {
47+
domain: string @timoni(runtime:string:ONLYOFFICE_DOMAIN)
4648
config: {
4749
coAuthoring: {
4850
secret: {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ runtime: {
4747
"EXTERNAL_DOMAIN": "obj.data.EXTERNAL_DOMAIN"
4848
"KEYCLOAK_DOMAIN": "obj.data.KEYCLOAK_DOMAIN"
4949
"MINIO_DOMAIN": "obj.data.MINIO_DOMAIN"
50+
"MINIO_PERSISTENCE_SIZE": "obj.data.MINIO_PERSISTENCE_SIZE"
5051
"LDAP_URI": "obj.data.LDAP_URI"
5152
"OIDC_ISSUER_URI": "obj.data.OIDC_ISSUER_URI"
5253
"COLLABORA_URI": "obj.data.COLLABORA_URI"
@@ -132,6 +133,8 @@ runtime: {
132133
OPENCLOUD_LOGGING_LEVEL: "debug"
133134
KEYCLOAK_ENABLED: true
134135
MINIO_ENABLED: true
136+
MINIO_PERSISTENCE_SIZE: "40Gi"
137+
ONLYOFFICE_DOMAIN: strings.TrimPrefix(strings.TrimPrefix(parameter.ONLYOFFICE_URI, "https://"), "http://")
135138
INGRESS_ENABLED: false
136139
INGRESS_CLASS_NAME: "nginx"
137140
INGRESS_PROXY_BODY_SIZE: "1024m"

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
apiVersion: gateway.networking.k8s.io/v1beta1
22
kind: HTTPRoute
3+
metadata:
4+
name: {{ .Release.Name }}-proxy-http-redirect
5+
namespace: {{ template "oc.namespace" . }}
6+
labels:
7+
{{- include "oc.labels" . | nindent 4 }}
8+
spec:
9+
parentRefs:
10+
- name: cilium-gateway
11+
namespace: kube-system
12+
sectionName: oc-proxy-http
13+
hostnames:
14+
- {{ .Values.externalDomain}}
15+
rules:
16+
- filters:
17+
- type: RequestRedirect
18+
requestRedirect:
19+
scheme: https
20+
hostname: {{ .Values.externalDomain}}
21+
statusCode: 301
22+
---
23+
apiVersion: gateway.networking.k8s.io/v1beta1
24+
kind: HTTPRoute
325
metadata:
426
# TODO make like minio
527
name: {{ .Release.Name }}-proxy
@@ -21,4 +43,3 @@ spec:
2143
backendRefs:
2244
- name: proxy
2345
port: 9200
24-

charts/opencloud-full/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6348,7 +6348,7 @@ minio:
63486348
# required: true
63496349
# @schema
63506350
# -- Size of the persistent volume
6351-
size: 5Gi
6351+
size: 40Gi
63526352
# @schema
63536353
# type: object
63546354
# required: true

0 commit comments

Comments
 (0)