Skip to content

Commit 7429654

Browse files
author
Your Name
committed
Merge branch 'posixfs-support-3'
2 parents a032521 + a2a8b39 commit 7429654

File tree

15 files changed

+109
-42
lines changed

15 files changed

+109
-42
lines changed

‎charts/opencloud-microservices/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ maintainers:
1212
email: [email protected]
1313
url: https://opencloud.eu
1414
type: application
15-
version: 0.3.4
15+
version: 0.3.5
1616
# renovate: datasource=docker depName=opencloudeu/opencloud-rolling
17-
appVersion: 3.4.0
17+
appVersion: 3.6.0
1818
kubeVersion: ""
1919
sources:
2020
- https://github.com/opencloud-eu/helm

‎charts/opencloud-microservices/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ The charts are also available in the GitHub Container Registry (GHCR) as OCI art
223223
Change the repo url to: ghcr.io/opencloud-eu/helm-charts/opencloud-microservices
224224

225225
```bash
226-
cd charts/opencloud-microservices/deployments
226+
cd charts/opencloud-microservices/deployments/helm
227227
helmfile sync
228228

229229
```

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

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ releases:
2121
- logging:
2222
level: debug # Set logging level for OpenCloud components.
2323
- externalDomain: cloud.opencloud.test # Main domain for OpenCloud access.
24-
24+
- image:
25+
tag: "3.6.0"
2526
# --- Core Components Configuration ---
2627
- keycloak:
2728
enabled: true # Enable Keycloak for authentication.
@@ -89,6 +90,18 @@ releases:
8990
group:
9091
schema:
9192
id: openCloudUUID
93+
quotas:
94+
roles:
95+
# User Role set to 2GB
96+
'd7beeea8-8ff4-406b-8fb6-ab2dd81e6b11': 2000000000
97+
# Space Administrator Role set to 100GB
98+
'2aadd357-682c-406b-8874-293091995fdd': 100000000000
99+
virusscan:
100+
enabled: false
101+
infectedFileHandling: "abort"
102+
icap:
103+
url: "http://clamav-icap.clamav:1344"
104+
service: "avscan"
92105
appsIntegration:
93106
enabled: true
94107
wopiIntegration:
@@ -182,7 +195,7 @@ releases:
182195
priority: 50
183196
additionalInitContainers:
184197
- name: external-sites
185-
image: opencloudeu/web-extensions:external-sites-latest
198+
image: opencloudeu/web-extensions:external-sites-1.0.0
186199
command:
187200
- /bin/sh
188201
- -c
@@ -191,7 +204,7 @@ releases:
191204
- name: apps
192205
mountPath: /apps
193206
- name: drawio
194-
image: opencloudeu/web-extensions:draw-io-latest
207+
image: opencloudeu/web-extensions:draw-io-1.0.0
195208
command:
196209
- /bin/sh
197210
- -c
@@ -200,7 +213,7 @@ releases:
200213
- name: apps
201214
mountPath: /apps
202215
- name: importer
203-
image: opencloudeu/web-extensions:importer-latest
216+
image: opencloudeu/web-extensions:importer-1.0.0
204217
command:
205218
- /bin/sh
206219
- -c
@@ -209,7 +222,7 @@ releases:
209222
- name: apps
210223
mountPath: /apps
211224
- name: jsonviewer
212-
image: opencloudeu/web-extensions:json-viewer-latest
225+
image: opencloudeu/web-extensions:json-viewer-1.0.0
213226
command:
214227
- /bin/sh
215228
- -c
@@ -218,7 +231,7 @@ releases:
218231
- name: apps
219232
mountPath: /apps
220233
- name: progressbars
221-
image: opencloudeu/web-extensions:progress-bars-latest
234+
image: opencloudeu/web-extensions:progress-bars-1.0.0
222235
command:
223236
- /bin/sh
224237
- -c
@@ -227,7 +240,7 @@ releases:
227240
- name: apps
228241
mountPath: /apps
229242
- name: unzip
230-
image: opencloudeu/web-extensions:unzip-latest
243+
image: opencloudeu/web-extensions:unzip-1.0.0
231244
command:
232245
- /bin/sh
233246
- -c

‎charts/opencloud-microservices/deployments/timoni/clamav/clamav.cue‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
bundle: {
22
apiVersion: "v1alpha1"
3-
name: "opencloud"
3+
name: "clamav"
44
instances: {
55
// "service-account": {
66
// module: url: "oci://ghcr.io/stefanprodan/modules/flux-tenant"
@@ -65,12 +65,39 @@ bundle: {
6565
}
6666
icap: {
6767
image: {
68-
registry: string @timoni(runtime:string:CLAMAV_ICAP_IMAGE_REGISTRY)
68+
registry: string @timoni(runtime:string:CLAMAV_ICAP_IMAGE_REGISTRY)
6969
repository: string @timoni(runtime:string:CLAMAV_ICAP_IMAGE_REPOSITORY)
70-
tag: string @timoni(runtime:string:CLAMAV_ICAP_IMAGE_TAG)
70+
tag: string @timoni(runtime:string:CLAMAV_ICAP_IMAGE_TAG)
7171
}
72+
7273
settings: {
7374
clamdModClamdHost: string @timoni(runtime:string:CLAMAV_ICAP_CLAMD_HOST)
75+
tmpDir: "/icap-tmp"
76+
}
77+
78+
extraVolumes: [
79+
{
80+
name: "icap-tmp"
81+
emptyDir: {}
82+
}
83+
]
84+
85+
extraVolumeMounts: [
86+
{
87+
name: "icap-tmp"
88+
mountPath: "/icap-tmp"
89+
}
90+
]
91+
92+
lifecycleHooks: {
93+
postStart: {
94+
exec: {
95+
command: [
96+
"sh", "-c",
97+
"rm -f /var/run/c-icap/c-icap.* /var/tmp/c-icap.* || true"
98+
]
99+
}
100+
}
74101
}
75102
}
76103
milter: {

‎charts/opencloud-microservices/deployments/timoni/clamav/configmap.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ apiVersion: v1
77
kind: ConfigMap
88
metadata:
99
name: opencloud-config
10-
namespace: opencloud
10+
namespace: clamav
1111
data:
1212
###############################################################################
1313
# Persistence StorageClass and AccessModes (global defaults)

‎charts/opencloud-microservices/deployments/timoni/clamav/runtime.cue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
runtime: {
22
apiVersion: "v1alpha1"
3-
name: "opencloud"
3+
name: "clamav"
44
values: [
55
{
6-
query: "k8s:v1:ConfigMap:opencloud:opencloud-config"
6+
query: "k8s:v1:ConfigMap:clamav:opencloud-config"
77
for: {
88
"PERSISTENCE_STORAGE_CLASS_NAME": "obj.data.PERSISTENCE_STORAGE_CLASS_NAME"
99
"PERSISTENCE_ACCESS_MODES": "obj.data.PERSISTENCE_ACCESS_MODES"

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@ data:
3333
INGRESS_PROXY_BODY_SIZE: "1024m"
3434
GATEWAY_HTTPROUTE_ENABLED: "true"
3535

36-
###############################################################################
37-
# OIDC Configuration
38-
###############################################################################
39-
OIDC_IDP_INSECURE: "true"
40-
OC_HTTP_API_INSECURE: "true"
41-
APPS_INTEGRATION_ENABLED: "true"
42-
WEB_OIDC_WEB_CLIENT_ID: "web"
43-
4436
###############################################################################
4537
# Persistence StorageClass and AccessModes (global defaults)
4638
###############################################################################
@@ -73,6 +65,13 @@ data:
7365
# NATS specific persistence options
7466
# When true, a root init container will chown the NATS data volume before the main container starts.
7567
NATS_PERSISTENCE_CHOWN_INIT_CONTAINER: "false"
68+
69+
###############################################################################
70+
# Quotas
71+
###############################################################################
72+
QUOTAS_DEFAULT: "300000000000"
73+
QUOTAS_USER: "300000000000"
74+
QUOTAS_SPACE_ADMIN: "10000000000000"
7675

7776
###############################################################################
7877
# Internal Keycloak (for testing only)
@@ -109,6 +108,10 @@ data:
109108
OIDC_USER_ID_CLAIM: "sub"
110109
OIDC_USER_ID_CLAIM_ATTRIBUTE_MAPPING: "username"
111110
OIDC_ROLE_ASSIGNMENT_CLAIM: "roles"
111+
OIDC_IDP_INSECURE: "true"
112+
OC_HTTP_API_INSECURE: "true"
113+
APPS_INTEGRATION_ENABLED: "true"
114+
WEB_OIDC_WEB_CLIENT_ID: "web"
112115

113116
###############################################################################
114117
# Search Configuration

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

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,15 @@ bundle: {
113113
service: string @timoni(runtime:string:ANTIVIRUS_ICAP_SERVICE)
114114
}
115115
}
116+
quotas: {
117+
default: string @timoni(runtime:string:QUOTAS_DEFAULT)
118+
roles: {
119+
// User Role set to 300GB
120+
"d7beeea8-8ff4-406b-8fb6-ab2dd81e6b11": int @timoni(runtime:number:QUOTAS_USER)
121+
// Space Administrator Role set to 100TB
122+
"2aadd357-682c-406b-8874-293091995fdd": int @timoni(runtime:number:QUOTAS_SPACE_ADMIN)
123+
}
124+
}
116125
externalUserManagement: {
117126
enabled: bool @timoni(runtime:bool:EXTERNAL_USER_MANAGEMENT_ENABLED)
118127
adminUUID: string @timoni(runtime:string:EXTERNAL_USER_MANAGEMENT_ADMIN_UUID)
@@ -264,7 +273,7 @@ bundle: {
264273
additionalInitContainers: [
265274
{
266275
name: "external-sites"
267-
image: "opencloudeu/web-extensions:external-sites-latest"
276+
image: "opencloudeu/web-extensions:external-sites-1.0.0"
268277
command: [
269278
"/bin/sh",
270279
"-c",
@@ -279,7 +288,7 @@ bundle: {
279288
},
280289
{
281290
name: "drawio"
282-
image: "opencloudeu/web-extensions:draw-io-latest"
291+
image: "opencloudeu/web-extensions:draw-io-1.0.0"
283292
command: [
284293
"/bin/sh",
285294
"-c",
@@ -294,7 +303,7 @@ bundle: {
294303
},
295304
{
296305
name: "importer"
297-
image: "opencloudeu/web-extensions:importer-latest"
306+
image: "opencloudeu/web-extensions:importer-1.0.0"
298307
command: [
299308
"/bin/sh",
300309
"-c",
@@ -309,7 +318,7 @@ bundle: {
309318
},
310319
{
311320
name: "jsonviewer"
312-
image: "opencloudeu/web-extensions:json-viewer-latest"
321+
image: "opencloudeu/web-extensions:json-viewer-1.0.0"
313322
command: [
314323
"/bin/sh",
315324
"-c",
@@ -324,7 +333,7 @@ bundle: {
324333
},
325334
{
326335
name: "progressbars"
327-
image: "opencloudeu/web-extensions:progress-bars-latest"
336+
image: "opencloudeu/web-extensions:progress-bars-1.0.0"
328337
command: [
329338
"/bin/sh",
330339
"-c",
@@ -339,7 +348,7 @@ bundle: {
339348
},
340349
{
341350
name: "unzip"
342-
image: "opencloudeu/web-extensions:unzip-latest"
351+
image: "opencloudeu/web-extensions:unzip-1.0.0"
343352
command: [
344353
"/bin/sh",
345354
"-c",

‎charts/opencloud-microservices/deployments/timoni/opencloud/runtime.cue‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ runtime: {
116116
"ANTIVIRUS_INFECTED_FILE_HANDLING": "obj.data.ANTIVIRUS_INFECTED_FILE_HANDLING"
117117
"ANTIVIRUS_ICAP_URL": "obj.data.ANTIVIRUS_ICAP_URL"
118118
"ANTIVIRUS_ICAP_SERVICE": "obj.data.ANTIVIRUS_ICAP_SERVICE"
119+
"QUOTAS_DEFAULT": "obj.data.QUOTAS_DEFAULT"
120+
"QUOTAS_USER": "obj.data.QUOTAS_USER"
121+
"QUOTAS_SPACE_ADMIN": "obj.data.QUOTAS_SPACE_ADMIN"
119122
}
120123
}
121124
]
@@ -206,5 +209,8 @@ runtime: {
206209
ANTIVIRUS_INFECTED_FILE_HANDLING: "abort"
207210
ANTIVIRUS_ICAP_URL: "http://opendesk-clamav-icap.clamav:1344"
208211
ANTIVIRUS_ICAP_SERVICE: "avscan"
212+
QUOTAS_DEFAULT: "300000000000"
213+
QUOTAS_USER: "300000000000"
214+
QUOTAS_SPACE_ADMIN: "10000000000000"
209215
}
210216
}

‎charts/opencloud-microservices/deployments/timoni/openldap/configmap.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ apiVersion: v1
77
kind: ConfigMap
88
metadata:
99
name: opencloud-config
10-
namespace: opencloud
10+
namespace: openldap
1111
data:
1212
###############################################################################
1313
# LDAP Configuration

0 commit comments

Comments
 (0)