Skip to content

Commit 99c0c28

Browse files
author
Your Name
committed
Merge branch 'full-chart'
2 parents 9152ae1 + 4725600 commit 99c0c28

File tree

12 files changed

+414
-122
lines changed

12 files changed

+414
-122
lines changed

‎charts/opencloud-full/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ maintainers:
99
email: [email protected]
1010
url: https://opencloud.eu
1111
type: application
12-
version: 2.0.2
12+
version: 2.0.3
1313
# renovate: datasource=docker depName=opencloudeu/opencloud-rolling
1414
appVersion: 2.0.2
1515
kubeVersion: ""

‎charts/opencloud-full/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ helmfile sync
135135
```
136136
You can also install it with timoni instead of helm:
137137
```bash
138-
kubectl apply -f ./charts/opencloud-full/deployment/timoni/ && \
139-
timoni bundle apply -f ./charts/opencloud-full/deployment/timoni/opencloud.cue --runtime ./charts/opencloud-full/deployment/timoni/runtime.cue
138+
kubectl apply -f ./charts/opencloud-full/deployments/timoni/ && \
139+
timoni bundle apply -f ./charts/opencloud-full/deployments/timoni/opencloud.cue --runtime ./charts/opencloud-full/deployments/timoni/runtime.cue
140140
```
141141

142142
```bash
@@ -169,8 +169,8 @@ helmfile sync
169169
```
170170
You can also install it with timoni instead of helm:
171171
```bash
172-
kubectl apply -f ./charts/opencloud-full/deployment/timoni/ && \
173-
timoni bundle apply -f ./charts/opencloud-full/deployment/timoni/opencloud.cue --runtime ./charts/opencloud-full/deployment/timoni/runtime.cue
172+
kubectl apply -f ./charts/opencloud-full/deployments/timoni/ && \
173+
timoni bundle apply -f ./charts/opencloud-full/deployments/timoni/opencloud.cue --runtime ./charts/opencloud-full/deployments/timoni/runtime.cue
174174
```
175175

176176
```bash

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ repositories:
1313
releases:
1414
# --- OpenCloud Full Chart Release ---
1515
# Deploys the main OpenCloud application with all its integrated services.
16-
- name: opencloud-4
17-
namespace: opencloud-4 # Dedicated namespace for the OpenCloud deployment.
16+
- name: opencloud-helm
17+
namespace: opencloud-helm # Dedicated namespace for the OpenCloud deployment.
1818
chart: ../../ # Path to the OpenCloud Helm chart.
1919
values:
2020
# --- General Settings ---

‎charts/opencloud-full/deployments/timoni/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Install
22

3-
kubectl apply -f ./charts/opencloud-full/deployment/timoni/ && \
4-
timoni bundle apply -f ./charts/opencloud-full/deployment/timoni/opencloud.cue --runtime ./charts/opencloud-full/deployment/timoni/runtime.cue
3+
kubectl apply -f ./charts/opencloud-full/deployments/timoni/ && \
4+
timoni bundle apply -f ./charts/opencloud-full/deployments/timoni/opencloud.cue --runtime ./charts/opencloud-full/deployments/timoni/runtime.cue
55

66

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

Lines changed: 82 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,94 @@ metadata:
44
name: opencloud-config
55
namespace: opencloud
66
data:
7+
###############################################################################
8+
# Global Configuration
9+
###############################################################################
710
EXTERNAL_DOMAIN: "cloud.opencloud.test"
11+
OPENCLOUD_WEB_URL: "https://www.opencloud.eu"
12+
OPENCLOUD_LOGGING_LEVEL: "debug"
13+
INGRESS_ENABLED: "false"
14+
INGRESS_CLASS_NAME: "nginx"
15+
INGRESS_PROXY_BODY_SIZE: "1024m"
16+
GATEWAY_HTTPROUTE_ENABLED: "true"
17+
APPS_INTEGRATION_ENABLED: "true"
18+
WEB_OIDC_WEB_CLIENT_ID: "web"
19+
IDM_PERSISTENCE_ENABLED: "false"
20+
SEARCH_EXTRACTOR_TYPE: "tika"
21+
STORAGE_USERS_BACKEND_DRIVER: "decomposeds3"
22+
23+
OIDC_IDP_INSECURE: "true"
24+
OC_HTTP_API_INSECURE: "true"
25+
26+
NATS_PERSISTENCE_ENABLED: "true"
27+
SEARCH_PERSISTENCE_ENABLED: "true"
28+
STORAGE_SYSTEM_PERSISTENCE_ENABLED: "true"
29+
STORAGE_USERS_PERSISTENCE_ENABLED: "true"
30+
THUMBNAILS_PERSISTENCE_ENABLED: "true"
31+
WEB_PERSISTENCE_ENABLED: "true"
32+
33+
###############################################################################
34+
# Keycloak Configuration
35+
###############################################################################
836
KEYCLOAK_DOMAIN: "keycloak.opencloud.test"
37+
KEYCLOAK_ENABLED: "true"
38+
# KEYCLOAK_ADMIN_PASSWORD: "admin" # Removed from configmap
39+
40+
###############################################################################
41+
# Minio Configuration
42+
###############################################################################
943
MINIO_DOMAIN: "minio.opencloud.test"
44+
MINIO_ENABLED: "true"
45+
46+
###############################################################################
47+
# LDAP Configuration
48+
###############################################################################
1049
LDAP_URI: "ldap://openldap.openldap.svc.cluster.local:389"
50+
LDAP_GLOBAL_DOMAIN: "opencloud.eu"
51+
LDAP_WRITEABLE: "true"
52+
LDAP_INSECURE: "true"
53+
LDAP_BIND_DN: "cn=admin,dc=opencloud,dc=eu"
54+
LDAP_USER_NAME_MATCH: "none"
55+
LDAP_USER_SCHEMA_ID: "openCloudUUID"
56+
LDAP_GROUP_SCHEMA_ID: "openCloudUUID"
57+
OPENLDAP_LTB_PASSWD_ENABLED: "false"
58+
OPENLDAP_REPLICATION_ENABLED: "true"
59+
60+
###############################################################################
61+
# OIDC Configuration
62+
###############################################################################
1163
OIDC_ISSUER_URI: "https://keycloak.opencloud.test/realms/openCloud"
64+
EXTERNAL_USER_MANAGEMENT_ENABLED: "true"
65+
EXTERNAL_USER_MANAGEMENT_ADMIN_UUID: "0ab77e6d-23b4-4ba3-9843-a3b3efdcfc53"
66+
AUTOPROVISION_ACCOUNTS_ENABLED: "true"
67+
AUTOPROVISION_ACCOUNTS_CLAIM_USER_NAME: "sub"
68+
OIDC_USER_ID_CLAIM: "sub"
69+
OIDC_USER_ID_CLAIM_ATTRIBUTE_MAPPING: "username"
70+
71+
###############################################################################
72+
# Collabora Configuration
73+
###############################################################################
1274
COLLABORA_URI: "https://collabora.opencloud.test"
1375
COLLABORA_ICON_URI: "https://collabora.opencloud.test/favicon.ico"
14-
WOPI_INGRESS_DOMAIN: "wopi.opencloud.test"
15-
WOPI_COLLABORA_TLS_HOST: "wopi-collabora.kube.opencloud.test"
76+
COLLABORA_ENABLED: "false"
77+
COLLABORA_INSECURE: "true"
78+
COLLABORA_DISABLE_PROOF: "false"
79+
COLLABORA_INGRESS_ENABLED: "false"
80+
COLLABORA_INGRESS_CLASS_NAME: "nginx"
81+
COLLABORA_INGRESS_PROXY_BODY_SIZE: "1024m"
82+
83+
###############################################################################
84+
# OnlyOffice Configuration
85+
###############################################################################
1686
ONLYOFFICE_URI: "https://onlyoffice.opencloud.test"
1787
ONLYOFFICE_ICON_URI: "https://onlyoffice.opencloud.test/web-apps/apps/documenteditor/main/resources/img/favicon.ico"
18-
OPENCLOUD_WEB_URL: "https://www.opencloud.eu"
19-
LDAP_GLOBAL_DOMAIN: "opencloud.eu"
88+
ONLYOFFICE_ENABLED: "true"
89+
ONLYOFFICE_INSECURE: "true"
90+
ONLYOFFICE_DISABLE_PROOF: "false"
91+
ONLYOFFICE_INGRESS_ENABLED: "false"
92+
93+
###############################################################################
94+
# WOPI Configuration
95+
###############################################################################
96+
WOPI_INGRESS_DOMAIN: "wopi.opencloud.test"
97+
WOPI_COLLABORA_TLS_HOST: "wopi-collabora.kube.opencloud.test"

0 commit comments

Comments
 (0)