Skip to content

Commit b03b6f4

Browse files
author
Your Name
committed
Merge branch 'full-chart'
2 parents 206f18a + 2537b2c commit b03b6f4

File tree

12 files changed

+227
-16
lines changed

12 files changed

+227
-16
lines changed

‎charts/opencloud-full/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ maintainers:
99
email: [email protected]
1010
url: https://opencloud.eu
1111
type: application
12-
version: 2.0.3
12+
version: 2.0.4
1313
# renovate: datasource=docker depName=opencloudeu/opencloud-rolling
14-
appVersion: 2.0.2
14+
appVersion: 2.3.0
1515
kubeVersion: ""
1616
sources:
1717
- https://github.com/opencloud-eu/opencloud

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@ 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.
38+
persistence:
39+
size: "2Gi" # Added
3240

3341
# --- Networking Configuration ---
3442
- ingress:
@@ -103,26 +111,32 @@ releases:
103111
nats:
104112
persistence:
105113
enabled: true
114+
size: "10Gi"
106115
search:
107116
persistence:
108117
enabled: true
118+
size: "10Gi"
109119
extractor:
110120
type: tika
111121
storagesystem:
112122
persistence:
113123
enabled: true
124+
size: "5Gi"
114125
storageusers:
115126
persistence:
116127
enabled: true
128+
size: "50Gi"
117129
storageBackend:
118130
driver: decomposeds3
119131

120132
thumbnails:
121133
persistence:
122134
enabled: true
135+
size: "10Gi"
123136
web:
124137
persistence:
125138
enabled: true
139+
size: "1Gi"
126140
config:
127141
oidc:
128142
webClientID: web
@@ -194,6 +208,11 @@ releases:
194208
idm:
195209
persistence:
196210
enabled: false
211+
size: "10Gi"
212+
ocm:
213+
persistence:
214+
enabled: false
215+
size: "1Gi"
197216
- extraResources:
198217
- |
199218
apiVersion: v1

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

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,36 +17,46 @@ data:
1717
APPS_INTEGRATION_ENABLED: "true"
1818
WEB_OIDC_WEB_CLIENT_ID: "web"
1919
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-
20+
IDM_PERSISTENCE_SIZE: "10Gi"
2621
NATS_PERSISTENCE_ENABLED: "true"
22+
NATS_PERSISTENCE_SIZE: "10Gi"
23+
OCM_PERSISTENCE_ENABLED: "false"
24+
OCM_PERSISTENCE_SIZE: "1Gi"
25+
ONLYOFFICE_PERSISTENCE_SIZE: "2Gi"
26+
SEARCH_EXTRACTOR_TYPE: "tika"
2727
SEARCH_PERSISTENCE_ENABLED: "true"
28+
SEARCH_PERSISTENCE_SIZE: "10Gi"
29+
STORAGE_USERS_BACKEND_DRIVER: "decomposeds3"
2830
STORAGE_SYSTEM_PERSISTENCE_ENABLED: "true"
31+
STORAGE_SYSTEM_PERSISTENCE_SIZE: "5Gi"
2932
STORAGE_USERS_PERSISTENCE_ENABLED: "true"
33+
STORAGE_USERS_PERSISTENCE_SIZE: "50Gi"
3034
THUMBNAILS_PERSISTENCE_ENABLED: "true"
35+
THUMBNAILS_PERSISTENCE_SIZE: "10Gi"
3136
WEB_PERSISTENCE_ENABLED: "true"
37+
WEB_PERSISTENCE_SIZE: "1Gi"
38+
39+
OIDC_IDP_INSECURE: "true"
40+
OC_HTTP_API_INSECURE: "true"
3241

3342
###############################################################################
3443
# Keycloak Configuration
3544
###############################################################################
3645
KEYCLOAK_DOMAIN: "keycloak.opencloud.test"
3746
KEYCLOAK_ENABLED: "true"
38-
# KEYCLOAK_ADMIN_PASSWORD: "admin" # Removed from configmap
47+
3948

4049
###############################################################################
4150
# Minio Configuration
4251
###############################################################################
4352
MINIO_DOMAIN: "minio.opencloud.test"
4453
MINIO_ENABLED: "true"
54+
MINIO_PERSISTENCE_SIZE: "40Gi"
4555

4656
###############################################################################
4757
# LDAP Configuration
4858
###############################################################################
49-
LDAP_URI: "ldaps://openldap.openldap.svc.cluster.local:389"
59+
LDAP_URI: "ldaps://openldap.openldap.svc.cluster.local:636"
5060
LDAP_GLOBAL_DOMAIN: "opencloud.eu"
5161
LDAP_WRITEABLE: "true"
5262
LDAP_INSECURE: "true"
@@ -84,6 +94,7 @@ data:
8494
# OnlyOffice Configuration
8595
###############################################################################
8696
ONLYOFFICE_URI: "https://onlyoffice.opencloud.test"
97+
ONLYOFFICE_DOMAIN: "onlyoffice.opencloud.test"
8798
ONLYOFFICE_ICON_URI: "https://onlyoffice.opencloud.test/web-apps/apps/documenteditor/main/resources/img/favicon.ico"
8899
ONLYOFFICE_ENABLED: "true"
89100
ONLYOFFICE_INSECURE: "true"

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bundle: {
1414
}
1515
chart: {
1616
name: "opencloud-full"
17-
version: "2.0.3"
17+
version: "2.0.4"
1818
}
1919
sync: {
2020
timeout: 5
@@ -38,11 +38,16 @@ 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)
48+
persistence: {
49+
size: string @timoni(runtime:string:ONLYOFFICE_PERSISTENCE_SIZE)
50+
}
4651
config: {
4752
coAuthoring: {
4853
secret: {
@@ -150,11 +155,13 @@ bundle: {
150155
nats: {
151156
persistence: {
152157
enabled: bool @timoni(runtime:bool:NATS_PERSISTENCE_ENABLED)
158+
size: string @timoni(runtime:string:NATS_PERSISTENCE_SIZE)
153159
}
154160
}
155161
search: {
156162
persistence: {
157163
enabled: bool @timoni(runtime:bool:SEARCH_PERSISTENCE_ENABLED)
164+
size: string @timoni(runtime:string:SEARCH_PERSISTENCE_SIZE)
158165
}
159166
extractor: {
160167
type: string @timoni(runtime:string:SEARCH_EXTRACTOR_TYPE)
@@ -163,11 +170,13 @@ bundle: {
163170
storagesystem: {
164171
persistence: {
165172
enabled: bool @timoni(runtime:bool:STORAGE_SYSTEM_PERSISTENCE_ENABLED)
173+
size: string @timoni(runtime:string:STORAGE_SYSTEM_PERSISTENCE_SIZE)
166174
}
167175
}
168176
storageusers: {
169177
persistence: {
170178
enabled: bool @timoni(runtime:bool:STORAGE_USERS_PERSISTENCE_ENABLED)
179+
size: string @timoni(runtime:string:STORAGE_USERS_PERSISTENCE_SIZE)
171180
}
172181
storageBackend: {
173182
driver: string @timoni(runtime:string:STORAGE_USERS_BACKEND_DRIVER)
@@ -176,11 +185,13 @@ bundle: {
176185
thumbnails: {
177186
persistence: {
178187
enabled: bool @timoni(runtime:bool:THUMBNAILS_PERSISTENCE_ENABLED)
188+
size: string @timoni(runtime:string:THUMBNAILS_PERSISTENCE_SIZE)
179189
}
180190
}
181191
web: {
182192
persistence: {
183193
enabled: bool @timoni(runtime:bool:WEB_PERSISTENCE_ENABLED)
194+
size: string @timoni(runtime:string:WEB_PERSISTENCE_SIZE)
184195
}
185196
config: {
186197
oidc: {
@@ -299,6 +310,13 @@ bundle: {
299310
idm: {
300311
persistence: {
301312
enabled: bool @timoni(runtime:bool:IDM_PERSISTENCE_ENABLED)
313+
size: string @timoni(runtime:string:IDM_PERSISTENCE_SIZE)
314+
}
315+
}
316+
ocm: {
317+
persistence: {
318+
enabled: bool @timoni(runtime:bool:OCM_PERSISTENCE_ENABLED)
319+
size: string @timoni(runtime:string:OCM_PERSISTENCE_SIZE)
302320
}
303321
}
304322
}

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

Lines changed: 23 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"
@@ -91,16 +92,26 @@ runtime: {
9192
"STORAGE_USERS_BACKEND_DRIVER": "obj.data.STORAGE_USERS_BACKEND_DRIVER"
9293
"WEB_OIDC_WEB_CLIENT_ID": "obj.data.WEB_OIDC_WEB_CLIENT_ID"
9394
"IDM_PERSISTENCE_ENABLED": "obj.data.IDM_PERSISTENCE_ENABLED"
95+
"IDM_PERSISTENCE_SIZE": "obj.data.IDM_PERSISTENCE_SIZE"
96+
"OCM_PERSISTENCE_ENABLED": "obj.data.OCM_PERSISTENCE_ENABLED"
97+
"OCM_PERSISTENCE_SIZE": "obj.data.OCM_PERSISTENCE_SIZE"
9498
"OPENLDAP_LTB_PASSWD_ENABLED": "obj.data.OPENLDAP_LTB_PASSWD_ENABLED"
9599
"OPENLDAP_REPLICATION_ENABLED": "obj.data.OPENLDAP_REPLICATION_ENABLED"
96100
"OIDC_IDP_INSECURE": "obj.data.OIDC_IDP_INSECURE"
97101
"OC_HTTP_API_INSECURE": "obj.data.OC_HTTP_API_INSECURE"
98102
"NATS_PERSISTENCE_ENABLED": "obj.data.NATS_PERSISTENCE_ENABLED"
103+
"NATS_PERSISTENCE_SIZE": "obj.data.NATS_PERSISTENCE_SIZE"
99104
"SEARCH_PERSISTENCE_ENABLED": "obj.data.SEARCH_PERSISTENCE_ENABLED"
105+
"SEARCH_PERSISTENCE_SIZE": "obj.data.SEARCH_PERSISTENCE_SIZE"
100106
"STORAGE_SYSTEM_PERSISTENCE_ENABLED": "obj.data.STORAGE_SYSTEM_PERSISTENCE_ENABLED"
107+
"STORAGE_SYSTEM_PERSISTENCE_SIZE": "obj.data.STORAGE_SYSTEM_PERSISTENCE_SIZE"
101108
"STORAGE_USERS_PERSISTENCE_ENABLED": "obj.data.STORAGE_USERS_PERSISTENCE_ENABLED"
109+
"STORAGE_USERS_PERSISTENCE_SIZE": "obj.data.STORAGE_USERS_PERSISTENCE_SIZE"
102110
"THUMBNAILS_PERSISTENCE_ENABLED": "obj.data.THUMBNAILS_PERSISTENCE_ENABLED"
111+
"THUMBNAILS_PERSISTENCE_SIZE": "obj.data.THUMBNAILS_PERSISTENCE_SIZE"
103112
"WEB_PERSISTENCE_ENABLED": "obj.data.WEB_PERSISTENCE_ENABLED"
113+
"WEB_PERSISTENCE_SIZE": "obj.data.WEB_PERSISTENCE_SIZE"
114+
"ONLYOFFICE_PERSISTENCE_SIZE": "obj.data.ONLYOFFICE_PERSISTENCE_SIZE"
104115
}
105116
}
106117
]
@@ -132,6 +143,8 @@ runtime: {
132143
OPENCLOUD_LOGGING_LEVEL: "debug"
133144
KEYCLOAK_ENABLED: true
134145
MINIO_ENABLED: true
146+
MINIO_PERSISTENCE_SIZE: "40Gi"
147+
ONLYOFFICE_DOMAIN: strings.TrimPrefix(strings.TrimPrefix(parameter.ONLYOFFICE_URI, "https://"), "http://")
135148
INGRESS_ENABLED: false
136149
INGRESS_CLASS_NAME: "nginx"
137150
INGRESS_PROXY_BODY_SIZE: "1024m"
@@ -174,6 +187,16 @@ runtime: {
174187
STORAGE_USERS_PERSISTENCE_ENABLED: true
175188
THUMBNAILS_PERSISTENCE_ENABLED: true
176189
WEB_PERSISTENCE_ENABLED: true
190+
IDM_PERSISTENCE_SIZE: "10Gi"
191+
OCM_PERSISTENCE_ENABLED: false
192+
OCM_PERSISTENCE_SIZE: "1Gi"
193+
NATS_PERSISTENCE_SIZE: "10Gi"
194+
SEARCH_PERSISTENCE_SIZE: "10Gi"
195+
STORAGE_SYSTEM_PERSISTENCE_SIZE: "5Gi"
196+
STORAGE_USERS_PERSISTENCE_SIZE: "50Gi"
197+
THUMBNAILS_PERSISTENCE_SIZE: "10Gi"
198+
WEB_PERSISTENCE_SIZE: "1Gi"
199+
ONLYOFFICE_PERSISTENCE_SIZE: "2Gi"
177200

178201
LDAP_ENABLED: true
179202
TIKA_ENABLED: true

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ Adds the app names to the scope and set the name of the app based on the input p
7777
{{- $_ := set .scope "appNameAppRegistry" "appregistry" -}}
7878
{{- $_ := set .scope "appNameAudit" "audit" -}}
7979
{{- $_ := set .scope "appNameAuthMachine" "authmachine" -}}
80+
{{- $_ := set .scope "appNameAuthApp" "authapp" -}}
8081
{{- $_ := set .scope "appNameAuthService" "authservice" -}}
8182
{{- $_ := set .scope "appNameAntivirus" "antivirus" -}}
8283
{{- $_ := set .scope "appNameClientlog" "clientlog" -}}

‎charts/opencloud-full/templates/auth-app/deployment.yaml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
{{- include "oc.basicServiceTemplates" (dict "scope" . "appName" "appNameAuthApp" "appNameSuffix" "") -}}
2+
apiVersion: apps/v1
3+
kind: Deployment
4+
{{ include "oc.metadata" . }}
5+
spec:
6+
{{- include "oc.selector" . | nindent 2 }}
7+
{{- if and (not .Values.autoscaling.enabled) (.Values.replicas) }}
8+
replicas: {{ .Values.replicas }}
9+
{{- end }}
10+
{{- include "oc.deploymentStrategy" . | nindent 2 }}
11+
template:
12+
{{- include "oc.templateMetadata" (dict "scope" $ "configCheck" false) | nindent 4 }}
13+
spec:
14+
{{- include "oc.affinity" $ | nindent 6 }}
15+
{{- include "oc.securityContextAndtopologySpreadConstraints" . | nindent 6 }}
16+
{{- include "oc.priorityClassName" $.priorityClassName | nindent 6 }}
17+
{{- include "oc.hostAliases" $ | nindent 6 }}
18+
nodeSelector: {{ toYaml $.nodeSelector | nindent 8 }}
19+
containers:
20+
- name: {{ .appName }}
21+
{{- include "oc.image" $ | nindent 10 }}
22+
command: ["opencloud"]
23+
args: ["auth-app", "server"]
24+
{{- include "oc.containerSecurityContext" . | nindent 10 }}
25+
env:
26+
{{- include "oc.serviceRegistry" . | nindent 12 }}
27+
28+
- name: AUTH_APP_LOG_COLOR
29+
value: {{ .Values.logging.color | quote }}
30+
- name: AUTH_APP_LOG_LEVEL
31+
value: {{ .Values.logging.level | quote }}
32+
- name: AUTH_APP_LOG_PRETTY
33+
value: {{ .Values.logging.pretty | quote }}
34+
35+
- name: AUTH_APP_TRACING_ENABLED
36+
value: "{{ .Values.tracing.enabled }}"
37+
- name: AUTH_APP_TRACING_TYPE
38+
value: {{ .Values.tracing.type | quote }}
39+
- name: AUTH_APP_TRACING_ENDPOINT
40+
value: {{ .Values.tracing.endpoint | quote }}
41+
- name: AUTH_APP_TRACING_COLLECTOR
42+
value: {{ .Values.tracing.collector | quote }}
43+
44+
- name: AUTH_APP_DEBUG_PPROF
45+
value: {{ .Values.debug.profiling | quote }}
46+
47+
- name: AUTH_APP_GRPC_ADDR
48+
value: 127.0.0.1:9246
49+
- name: AUTH_APP_DEBUG_ADDR
50+
value: 127.0.0.1:9245
51+
- name: AUTH_APP_HTTP_ADDR
52+
value: 127.0.0.1:9247
53+
- name: AUTH_APP_HTTP_ROOT
54+
value: /
55+
56+
- name: AUTH_APP_JWT_SECRET
57+
valueFrom:
58+
secretKeyRef:
59+
name: {{ include "secrets.jwtSecret" . }}
60+
key: jwt-secret
61+
62+
63+
64+
{{- include "oc.caEnv" $ | nindent 12}}
65+
66+
{{- include "oc.livenessProbe" . | nindent 10 }}
67+
68+
resources: {{ toYaml .resources | nindent 12 }}
69+
70+
ports:
71+
- name: grpc
72+
containerPort: 9246
73+
- name: http
74+
containerPort: 9247
75+
- name: metrics-debug
76+
containerPort: 9245
77+
78+
volumeMounts:
79+
- name: tmp-volume
80+
mountPath: /tmp
81+
{{- include "oc.caPath" $ | nindent 12}}
82+
83+
{{- include "oc.imagePullSecrets" $ | nindent 6 }}
84+
volumes:
85+
- name: tmp-volume
86+
emptyDir: {}
87+
{{- include "oc.caVolume" $ | nindent 8}}

‎charts/opencloud-full/templates/auth-app/hpa.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{{- include "oc.basicServiceTemplates" (dict "scope" . "appName" "appNameAuthApp" "appNameSuffix" "") -}}
2+
{{- $_ := set . "autoscaling" (default (default (dict) .Values.autoscaling) .Values.services.authmachine.autoscaling) -}}
3+
{{ include "oc.hpa" . }}

‎charts/opencloud-full/templates/auth-app/pdb.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{{- include "oc.basicServiceTemplates" (dict "scope" . "appName" "appNameAuthApp" "appNameSuffix" "") -}}
2+
{{ include "oc.pdb" . }}

0 commit comments

Comments
 (0)