Skip to content

Commit 3d3ef62

Browse files
author
Your Name
committed
Merge branch 'posixfs-support-3'
2 parents ee336b3 + 75589ed commit 3d3ef62

File tree

6 files changed

+30
-11
lines changed

6 files changed

+30
-11
lines changed

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@ The complete OpenCloud deployment with all components for production use:
8888
- NATS service discovery required
8989
- Keycloak for authentication
9090
- MinIO for object storage
91-
- Integrated LDAP
91+
- Integrated OpenLDAP
92+
- Integrated ClamAV
93+
- Posix support
94+
- Helm and Timoni Chart for FluxCD
9295
- Document editing with Collabora and/or OnlyOffice
9396
- Slightly higher resource usage due to microservices pod overhead
9497
- See [architectural warnings](./charts/opencloud-microservices/README.md#architectural-considerations)

charts/opencloud-microservices/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ maintainers:
1212
1313
url: https://opencloud.eu
1414
type: application
15-
version: 0.3.1
15+
version: 0.3.2
1616
# renovate: datasource=docker depName=opencloudeu/opencloud-rolling
1717
appVersion: 3.4.0
1818
kubeVersion: ""

charts/opencloud-microservices/README.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,10 @@ This repository contains the following chart:
132132
- NATS service discovery required
133133
- Keycloak for authentication
134134
- MinIO for object storage
135-
- Integrated LDAP
135+
- Integrated OpenLDAP
136+
- Integrated ClamAV
137+
- Posix support
138+
- Helm and Timoni Chart for FluxCD
136139
- Document editing with Collabora and/or OnlyOffice
137140
- Slightly higher resource usage due to microservices pod overhead
138141
- See [architectural warnings](./charts/opencloud-microservices/README.md#architectural-considerations)
@@ -1113,7 +1116,7 @@ spec:
11131116
- type: IPAddress
11141117
value: 192.168.178.77 # Replace with your desired IP
11151118
listeners:
1116-
- name: oc-proxy-https
1119+
- name: opencloud-proxy-https
11171120
protocol: HTTPS
11181121
port: 443
11191122
hostname: "cloud.opencloud.test"
@@ -1125,7 +1128,7 @@ spec:
11251128
allowedRoutes:
11261129
namespaces:
11271130
from: All
1128-
- name: oc-minio-https
1131+
- name: opencloud-minio-https
11291132
protocol: HTTPS
11301133
port: 443
11311134
hostname: "minio.opencloud.test"
@@ -1137,7 +1140,7 @@ spec:
11371140
allowedRoutes:
11381141
namespaces:
11391142
from: All
1140-
- name: oc-minio-console-https
1143+
- name: opencloud-minio-console-https
11411144
protocol: HTTPS
11421145
port: 443
11431146
hostname: "console.minio.opencloud.test"
@@ -1149,7 +1152,7 @@ spec:
11491152
allowedRoutes:
11501153
namespaces:
11511154
from: All
1152-
- name: oc-keycloak-https
1155+
- name: opencloud-keycloak-https
11531156
protocol: HTTPS
11541157
port: 443
11551158
hostname: "keycloak.opencloud.test"
@@ -1161,7 +1164,7 @@ spec:
11611164
allowedRoutes:
11621165
namespaces:
11631166
from: All
1164-
- name: oc-wopi-https
1167+
- name: opencloud-wopi-https
11651168
protocol: HTTPS
11661169
port: 443
11671170
hostname: "wopiserver.opencloud.test"
@@ -1173,7 +1176,7 @@ spec:
11731176
allowedRoutes:
11741177
namespaces:
11751178
from: All
1176-
- name: oc-collabora-https
1179+
- name: opencloud-collabora-https
11771180
protocol: HTTPS
11781181
port: 443
11791182
hostname: "collabora.opencloud.test"
@@ -1185,7 +1188,7 @@ spec:
11851188
allowedRoutes:
11861189
namespaces:
11871190
from: All
1188-
- name: oc-collaboration-https
1191+
- name: opencloud-collaboration-https
11891192
protocol: HTTPS
11901193
port: 443
11911194
hostname: "collaboration.opencloud.test"
@@ -1197,7 +1200,7 @@ spec:
11971200
allowedRoutes:
11981201
namespaces:
11991202
from: All
1200-
- name: oc-onlyoffice-https
1203+
- name: opencloud-onlyoffice-https
12011204
protocol: HTTPS
12021205
port: 443
12031206
hostname: "onlyoffice.opencloud.test"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ data:
1515
EXTERNAL_DOMAIN: "cloud.opencloud.test"
1616
TAG: ""
1717

18+
###############################################################################
19+
# Flux RBAC Configuration
20+
###############################################################################
21+
SERVICE_ACCOUNT_ENABLED: "true"
22+
1823
###############################################################################
1924
# Deployment Strategy
2025
###############################################################################

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ bundle: {
1414
}
1515
chart: {
1616
name: "opencloud-microservices"
17+
<<<<<<< HEAD
1718
version: "0.3.0"
19+
=======
20+
version: "0.3.2"
21+
>>>>>>> posixfs-support-3
1822
}
1923
sync: {
2024
timeout: 10
@@ -37,6 +41,9 @@ bundle: {
3741
level: string @timoni(runtime:string:OPENCLOUD_LOGGING_LEVEL)
3842
}
3943
externalDomain: string @timoni(runtime:string:EXTERNAL_DOMAIN)
44+
serviceAccount: {
45+
enabled: bool @timoni(runtime:bool:SERVICE_ACCOUNT_ENABLED)
46+
}
4047
image: {
4148
tag: string @timoni(runtime:string:TAG)
4249
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ 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+
"SERVICE_ACCOUNT_ENABLED": "obj.data.SERVICE_ACCOUNT_ENABLED"
119120
}
120121
}
121122
]

0 commit comments

Comments
 (0)