Skip to content

Commit 4725600

Browse files
author
Your Name
committed
Bump up Version
1 parent e77fca1 commit 4725600

File tree

5 files changed

+359
-72
lines changed

5 files changed

+359
-72
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/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"

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

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -14,132 +14,132 @@ bundle: {
1414
}
1515
chart: {
1616
name: "opencloud-full"
17-
version: "2.0.2"
17+
version: "2.0.3"
1818
}
1919
sync: {
2020
timeout: 5
2121
createNamespace: true
2222
}
2323
helmValues: {
2424
logging: {
25-
level: "debug"
25+
level: string @timoni(runtime:string:OPENCLOUD_LOGGING_LEVEL)
2626
}
2727
externalDomain: string @timoni(runtime:string:EXTERNAL_DOMAIN)
2828
keycloak: {
29-
enabled: true
29+
enabled: bool @timoni(runtime:bool:KEYCLOAK_ENABLED)
3030
domain: string @timoni(runtime:string:KEYCLOAK_DOMAIN)
3131
postgresql: {
32-
password: "keycloak"
32+
password: string @timoni(runtime:string:KEYCLOAK_POSTGRESQL_PASSWORD)
3333
}
3434
config: {
35-
adminPassword: "admin"
35+
adminPassword: string @timoni(runtime:string:KEYCLOAK_ADMIN_PASSWORD)
3636
}
3737
}
3838
minio: {
39-
enabled: true
39+
enabled: bool @timoni(runtime:bool:MINIO_ENABLED)
4040
domain: string @timoni(runtime:string:MINIO_DOMAIN)
4141
config: {
42-
rootPassword: "opencloud-secret-key"
42+
rootPassword: string @timoni(runtime:string:MINIO_ROOT_PASSWORD)
4343
}
4444
}
4545
onlyoffice: {
4646
config: {
4747
coAuthoring: {
4848
secret: {
49-
inbox: "Dd0SXIe1k9oCfdffgrfNmA0TK1bb1B1d38OFSb"
50-
outbox: "Dd0SXIe1k9oCfdffgrfNmA0TK1bb1B1d38OFSb"
51-
session: "Dd0SXIe1k9oCfdffgrfNmA0TK1bb1B1d38OFSb"
49+
inbox: string @timoni(runtime:string:ONLYOFFICE_INBOX)
50+
outbox: string @timoni(runtime:string:ONLYOFFICE_OUTBOX)
51+
session: string @timoni(runtime:string:ONLYOFFICE_SESSION)
5252
}
5353
}
5454
rabbitmq: {
55-
url: "amqp://guest:Dd0SXIe1k9osdfjkmA0TK1bb1B1d38OFSb@localhost"
55+
url: string @timoni(runtime:string:AMQP_URL)
5656
}
5757
}
5858
}
5959
ingress: {
60-
enabled: false
61-
ingressClassName: "nginx"
60+
enabled: bool @timoni(runtime:bool:INGRESS_ENABLED)
61+
ingressClassName: string @timoni(runtime:string:INGRESS_CLASS_NAME)
6262
annotations: {
63-
"nginx.ingress.kubernetes.io/proxy-body-size": "1024m"
63+
"nginx.ingress.kubernetes.io/proxy-body-size": string @timoni(runtime:string:INGRESS_PROXY_BODY_SIZE)
6464
}
6565
}
6666
insecure: {
67-
oidcIdpInsecure: true
68-
ocHttpApiInsecure: true
67+
oidcIdpInsecure: bool @timoni(runtime:bool:OIDC_IDP_INSECURE)
68+
ocHttpApiInsecure: bool @timoni(runtime:bool:OC_HTTP_API_INSECURE)
6969
}
7070
secretRefs: {
7171
ldapSecretRef: "ldap-bind-secrets"
7272
s3CredentialsSecretRef: "s3secret"
7373
}
7474
gateway: {
7575
httproute: {
76-
enabled: true
76+
enabled: bool @timoni(runtime:bool:GATEWAY_HTTPROUTE_ENABLED)
7777
}
7878
}
7979
features: {
8080
externalUserManagement: {
81-
enabled: true
82-
adminUUID: "0ab77e6d-23b4-4ba3-9843-a3b3efdcfc53"
81+
enabled: bool @timoni(runtime:bool:EXTERNAL_USER_MANAGEMENT_ENABLED)
82+
adminUUID: string @timoni(runtime:string:EXTERNAL_USER_MANAGEMENT_ADMIN_UUID)
8383
autoprovisionAccounts: {
84-
enabled: true
85-
claimUserName: "sub"
84+
enabled: bool @timoni(runtime:bool:AUTOPROVISION_ACCOUNTS_ENABLED)
85+
claimUserName: string @timoni(runtime:string:AUTOPROVISION_ACCOUNTS_CLAIM_USER_NAME)
8686
}
8787
oidc: {
8888
domain: string @timoni(runtime:string:KEYCLOAK_DOMAIN)
8989
issuerURI: string @timoni(runtime:string:OIDC_ISSUER_URI)
90-
userIDClaim: "sub"
91-
userIDClaimAttributeMapping: "username"
90+
userIDClaim: string @timoni(runtime:string:OIDC_USER_ID_CLAIM)
91+
userIDClaimAttributeMapping: string @timoni(runtime:string:OIDC_USER_ID_CLAIM_ATTRIBUTE_MAPPING)
9292
}
9393
ldap: {
94-
writeable: true
94+
writeable: bool @timoni(runtime:bool:LDAP_WRITEABLE)
9595
uri: string @timoni(runtime:string:LDAP_URI)
96-
insecure: true
97-
bindDN: "cn=admin,dc=opencloud,dc=eu"
96+
insecure: bool @timoni(runtime:bool:LDAP_INSECURE)
97+
bindDN: string @timoni(runtime:string:LDAP_BIND_DN)
9898
user: {
99-
userNameMatch: "none"
99+
userNameMatch: string @timoni(runtime:string:LDAP_USER_NAME_MATCH)
100100
schema: {
101-
id: "openCloudUUID"
101+
id: string @timoni(runtime:string:LDAP_USER_SCHEMA_ID)
102102
}
103103
}
104104
group: {
105105
schema: {
106-
id: "openCloudUUID"
106+
id: string @timoni(runtime:string:LDAP_GROUP_SCHEMA_ID)
107107
}
108108
}
109109
}
110110
}
111111

112112
appsIntegration: {
113-
enabled: true
113+
enabled: bool @timoni(runtime:bool:APPS_INTEGRATION_ENABLED)
114114
wopiIntegration: {
115115
officeSuites: [
116116
{
117117
name: "Collabora",
118118
product: "Collabora",
119-
enabled: false,
119+
enabled: bool @timoni(runtime:bool:COLLABORA_ENABLED),
120120
uri: string @timoni(runtime:string:COLLABORA_URI),
121-
insecure: true,
122-
disableProof: false,
121+
insecure: bool @timoni(runtime:bool:COLLABORA_INSECURE),
122+
disableProof: bool @timoni(runtime:bool:COLLABORA_DISABLE_PROOF),
123123
iconURI: string @timoni(runtime:string:COLLABORA_ICON_URI),
124124
ingress: {
125-
enabled: false
125+
enabled: bool @timoni(runtime:bool:COLLABORA_INGRESS_ENABLED)
126126
domain: string @timoni(runtime:string:WOPI_INGRESS_DOMAIN)
127-
ingressClassName: "nginx"
127+
ingressClassName: string @timoni(runtime:string:COLLABORA_INGRESS_CLASS_NAME)
128128
annotations: {
129-
"nginx.ingress.kubernetes.io/proxy-body-size": "1024m"
129+
"nginx.ingress.kubernetes.io/proxy-body-size": string @timoni(runtime:string:COLLABORA_INGRESS_PROXY_BODY_SIZE)
130130
}
131131
}
132132
},
133133
{
134134
name: "OnlyOffice",
135135
product: "OnlyOffice",
136-
enabled: true,
136+
enabled: bool @timoni(runtime:bool:ONLYOFFICE_ENABLED),
137137
uri: string @timoni(runtime:string:ONLYOFFICE_URI),
138-
insecure: true,
139-
disableProof: false,
138+
insecure: bool @timoni(runtime:bool:ONLYOFFICE_INSECURE),
139+
disableProof: bool @timoni(runtime:bool:ONLYOFFICE_DISABLE_PROOF),
140140
iconURI: string @timoni(runtime:string:ONLYOFFICE_ICON_URI),
141141
ingress: {
142-
enabled: false
142+
enabled: bool @timoni(runtime:bool:ONLYOFFICE_INGRESS_ENABLED)
143143
}
144144
}
145145
]
@@ -149,42 +149,42 @@ bundle: {
149149
services: {
150150
nats: {
151151
persistence: {
152-
enabled: true
152+
enabled: bool @timoni(runtime:bool:NATS_PERSISTENCE_ENABLED)
153153
}
154154
}
155155
search: {
156156
persistence: {
157-
enabled: true
157+
enabled: bool @timoni(runtime:bool:SEARCH_PERSISTENCE_ENABLED)
158158
}
159159
extractor: {
160-
type: "tika"
160+
type: string @timoni(runtime:string:SEARCH_EXTRACTOR_TYPE)
161161
}
162162
}
163163
storagesystem: {
164164
persistence: {
165-
enabled: true
165+
enabled: bool @timoni(runtime:bool:STORAGE_SYSTEM_PERSISTENCE_ENABLED)
166166
}
167167
}
168168
storageusers: {
169169
persistence: {
170-
enabled: true
170+
enabled: bool @timoni(runtime:bool:STORAGE_USERS_PERSISTENCE_ENABLED)
171171
}
172172
storageBackend: {
173-
driver: "decomposeds3"
173+
driver: string @timoni(runtime:string:STORAGE_USERS_BACKEND_DRIVER)
174174
}
175175
}
176176
thumbnails: {
177177
persistence: {
178-
enabled: true
178+
enabled: bool @timoni(runtime:bool:THUMBNAILS_PERSISTENCE_ENABLED)
179179
}
180180
}
181181
web: {
182182
persistence: {
183-
enabled: true
183+
enabled: bool @timoni(runtime:bool:WEB_PERSISTENCE_ENABLED)
184184
}
185185
config: {
186186
oidc: {
187-
webClientID: "web"
187+
webClientID: string @timoni(runtime:string:WEB_OIDC_WEB_CLIENT_ID)
188188
}
189189
externalApps: {
190190
"external-sites": {
@@ -298,7 +298,7 @@ bundle: {
298298
}
299299
idm: {
300300
persistence: {
301-
enabled: false
301+
enabled: bool @timoni(runtime:bool:IDM_PERSISTENCE_ENABLED)
302302
}
303303
}
304304
}
@@ -325,15 +325,15 @@ bundle: {
325325
}
326326
helmValues: {
327327
"ltb-passwd": {
328-
enabled: false
328+
enabled: bool @timoni(runtime:bool:OPENLDAP_LTB_PASSWD_ENABLED)
329329
}
330330
replication: {
331-
enabled: true
331+
enabled: bool @timoni(runtime:bool:OPENLDAP_REPLICATION_ENABLED)
332332
}
333333
global: {
334334
ldapDomain: string @timoni(runtime:string:LDAP_GLOBAL_DOMAIN)
335-
adminPassword: "admin"
336-
configPassword: "config"
335+
adminPassword: string @timoni(runtime:string:LDAP_ADMIN_PASSWORD)
336+
configPassword: string @timoni(runtime:string:LDAP_CONFIG_PASSWORD)
337337
}
338338
customLdifFiles: {
339339
"opencloud_root.ldif": """

0 commit comments

Comments
 (0)