Skip to content

Commit 791bad5

Browse files
author
Your Name
committed
Merge remote-tracking branch 'upstream/main' into full-chart
2 parents b35a081 + 593c879 commit 791bad5

File tree

26 files changed

+3203
-790
lines changed

26 files changed

+3203
-790
lines changed

‎charts/opencloud/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
email: [email protected]
1111
url: https://opencloud.eu
1212
type: application
13-
version: 0.2.0
13+
version: 0.2.2
1414
# renovate: datasource=docker depName=opencloudeu/opencloud-rolling
1515
appVersion: latest
1616
kubeVersion: ""

‎charts/opencloud/README.md

Lines changed: 645 additions & 618 deletions
Large diffs are not rendered by default.

‎charts/opencloud/files/onlyoffice/local.json.gotmpl

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,9 @@
1515
"outbox": {
1616
"header": "Authorization"
1717
}
18-
},
19-
"secret": {
20-
"inbox": {
21-
"string": "{{ .Values.onlyoffice.config.coAuthoring.secret.inbox.string }}"
22-
},
23-
"outbox": {
24-
"string": "{{ .Values.onlyoffice.config.coAuthoring.secret.outbox.string }}"
25-
},
26-
"session": {
27-
"string": "{{ .Values.onlyoffice.config.coAuthoring.secret.session.string }}"
28-
}
2918
}
3019
}
3120
},
32-
"rabbitmq": {
33-
"url": "{{ .Values.onlyoffice.config.rabbitmq.url }}"
34-
},
3521
"FileConverter": {
3622
"converter": {
3723
"inputLimits": [

‎charts/opencloud/templates/NOTES.txt

Lines changed: 91 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,91 @@
1-
Thank you for installing {{ .Chart.Name }}.
2-
3-
Your release is named {{ .Release.Name }}.
4-
5-
To learn more about the release, try:
6-
7-
$ helm status {{ .Release.Name }}
8-
$ helm get all {{ .Release.Name }}
9-
10-
IMPORTANT: This is a development deployment. For production use, you MUST change the following default credentials:
11-
12-
1. Keycloak Admin: adminUser: admin, adminPassword: admin
13-
2. OpenCloud Admin: adminPassword: admin
14-
3. PostgreSQL: user: keycloak, password: keycloak
15-
4. MinIO: rootUser: opencloud, rootPassword: opencloud-secret-key
16-
5. OnlyOffice Database: sql.dbUser: onlyoffice, sql.dbPass: onlyoffice
17-
6. OnlyOffice Secret Keys: secret.inbox/outbox/session.string: B8LjkNqGxn6gf8bkuBUiMwyuCFwFddnu
18-
7. RabbitMQ: url: amqp://guest:guest@localhost
19-
20-
Using default credentials in production environments poses significant security risks.
21-
22-
The following services have been deployed:
23-
24-
1. OpenCloud (Main Application):
25-
- Service: {{ include "opencloud.opencloud.fullname" . }}
26-
- Port: 9200
27-
- Storage Driver: decomposeds3
28-
- System Storage Driver: decomposed
29-
- S3 Storage: {{ if .Values.opencloud.storage.s3.external.enabled }}{{ .Values.opencloud.storage.s3.external.endpoint }}{{ else if .Values.opencloud.storage.s3.internal.enabled }}MinIO ({{ include "opencloud.minio.fullname" . }}){{ else }}Not configured{{ end }}
30-
- S3 Bucket: {{ if .Values.opencloud.storage.s3.external.enabled }}{{ .Values.opencloud.storage.s3.external.bucket }}{{ else if .Values.opencloud.storage.s3.internal.enabled }}{{ .Values.opencloud.storage.s3.internal.bucketName }}{{ else }}Not configured{{ end }}
31-
32-
{{- if .Values.keycloak.enabled }}
33-
2. Keycloak (Authentication):
34-
- Service: {{ include "opencloud.keycloak.fullname" . }}
35-
- Port: 8080
36-
- Username: {{ .Values.keycloak.adminUser }}
37-
- Password: {{ .Values.keycloak.adminPassword }}
38-
{{- end }}
39-
40-
{{- if .Values.opencloud.storage.s3.internal.enabled }}
41-
3. MinIO (Object Storage):
42-
- Service: {{ include "opencloud.minio.fullname" . }}
43-
- API Port: 9000
44-
- Console Port: 9001
45-
- Username: {{ .Values.opencloud.storage.s3.internal.rootUser }}
46-
- Password: {{ .Values.opencloud.storage.s3.internal.rootPassword }}
47-
{{- end }}
48-
49-
{{- if and .Values.onlyoffice.collaboration.enabled .Values.onlyoffice.enabled }}
50-
4. OnlyOffice Collaboration Service:
51-
- Service: {{ include "opencloud.fullname" . }}-collaboration
52-
- HTTP Port: 9300
53-
- gRPC Port: 9301
54-
{{- end }}
55-
56-
57-
{{- if .Values.httpRoute.enabled }}
58-
IMPORTANT: This chart includes HTTPRoute resources that route traffic to the OpenCloud, Keycloak, and MinIO services.
59-
All HTTPRoutes are configured to use the Gateway named "{{ .Values.httpRoute.gateway.name }}" in the
60-
{{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }} namespace.
61-
62-
Make sure the Gateway exists and is properly configured to accept traffic for the following domains:
63-
- OpenCloud: {{ include "opencloud.domain" . }} (Service: {{ include "opencloud.opencloud.fullname" . }}, Port: 9200)
64-
{{- if .Values.keycloak.enabled }}
65-
- Keycloak: {{ include "opencloud.keycloak.domain" . }} (Service: {{ include "opencloud.keycloak.fullname" . }}, Port: 8080)
66-
{{- end }}
67-
{{- if .Values.opencloud.storage.s3.internal.enabled }}
68-
- MinIO Console: {{ include "opencloud.minio.domain" . }} (Service: {{ include "opencloud.minio.fullname" . }}, Port: 9001)
69-
{{- end }}
70-
{{- if and .Values.onlyoffice.collaboration.enabled .Values.onlyoffice.enabled }}
71-
- OnlyOffice Collaboration: {{ .Values.global.domain.wopi }} (Service: {{ include "opencloud.fullname" . }}-collaboration, Port: 9300)
72-
{{- end }}
73-
74-
{{- else }}
75-
IMPORTANT: The HTTPRoutes are disabled. You need to configure your own ingress controller
76-
to expose these services externally.
77-
78-
Example domains for your ingress configuration:
79-
- OpenCloud: {{ include "opencloud.domain" . }} (Service: {{ include "opencloud.opencloud.fullname" . }}, Port: 9200)
80-
{{- if .Values.keycloak.enabled }}
81-
- Keycloak: {{ include "opencloud.keycloak.domain" . }} (Service: {{ include "opencloud.keycloak.fullname" . }}, Port: 8080)
82-
{{- end }}
83-
{{- if .Values.opencloud.storage.s3.internal.enabled }}
84-
- MinIO Console: {{ include "opencloud.minio.domain" . }} (Service: {{ include "opencloud.minio.fullname" . }}, Port: 9001)
85-
{{- end }}
86-
{{- if and .Values.onlyoffice.collaboration.enabled .Values.onlyoffice.enabled }}
87-
- OnlyOffice Collaboration: {{ .Values.global.domain.wopi }} (Service: {{ include "opencloud.fullname" . }}-collaboration, Port: 9300)
88-
{{- end }}
89-
{{- end }}
90-
91-
For more information, please refer to the OpenCloud documentation:
92-
https://docs.opencloud.eu/
1+
Thank you for installing {{ .Chart.Name }}.
2+
3+
Your release is named {{ .Release.Name }}.
4+
5+
To learn more about the release, try:
6+
7+
$ helm status {{ .Release.Name }}
8+
$ helm get all {{ .Release.Name }}
9+
10+
IMPORTANT: This is a development deployment. For production use, you MUST change the following default credentials:
11+
12+
1. Keycloak Admin: adminUser: admin, adminPassword: admin
13+
2. OpenCloud Admin: adminPassword: admin
14+
3. PostgreSQL: user: keycloak, password: keycloak
15+
4. MinIO: rootUser: opencloud, rootPassword: opencloud-secret-key
16+
5. OnlyOffice Database: sql.dbUser: onlyoffice, sql.dbPass: onlyoffice
17+
6. RabbitMQ: url: amqp://guest:guest@localhost
18+
19+
Using default credentials in production environments poses significant security risks.
20+
21+
The following services have been deployed:
22+
23+
1. OpenCloud (Main Application):
24+
- Service: {{ include "opencloud.opencloud.fullname" . }}
25+
- Port: 9200
26+
- Storage Driver: decomposeds3
27+
- System Storage Driver: decomposed
28+
- S3 Storage: {{ if .Values.opencloud.storage.s3.external.enabled }}{{ .Values.opencloud.storage.s3.external.endpoint }}{{ else if .Values.opencloud.storage.s3.internal.enabled }}MinIO ({{ include "opencloud.minio.fullname" . }}){{ else }}Not configured{{ end }}
29+
- S3 Bucket: {{ if .Values.opencloud.storage.s3.external.enabled }}{{ .Values.opencloud.storage.s3.external.bucket }}{{ else if .Values.opencloud.storage.s3.internal.enabled }}{{ .Values.opencloud.storage.s3.internal.bucketName }}{{ else }}Not configured{{ end }}
30+
31+
{{- if .Values.keycloak.internal.enabled }}
32+
2. Keycloak (Authentication):
33+
- Service: {{ include "opencloud.keycloak.fullname" . }}
34+
- Port: 8080
35+
- Username: {{ .Values.keycloak.internal.adminUser }}
36+
- Password: {{ .Values.keycloak.internal.adminPassword }}
37+
{{- end }}
38+
39+
{{- if .Values.opencloud.storage.s3.internal.enabled }}
40+
3. MinIO (Object Storage):
41+
- Service: {{ include "opencloud.minio.fullname" . }}
42+
- API Port: 9000
43+
- Console Port: 9001
44+
- Username: {{ .Values.opencloud.storage.s3.internal.rootUser }}
45+
- Password: {{ .Values.opencloud.storage.s3.internal.rootPassword }}
46+
{{- end }}
47+
48+
{{- if and .Values.onlyoffice.collaboration.enabled .Values.onlyoffice.enabled }}
49+
4. OnlyOffice Collaboration Service:
50+
- Service: {{ include "opencloud.fullname" . }}-collaboration
51+
- HTTP Port: 9300
52+
- gRPC Port: 9301
53+
{{- end }}
54+
55+
56+
{{- if .Values.httpRoute.enabled }}
57+
IMPORTANT: This chart includes HTTPRoute resources that route traffic to the OpenCloud, Keycloak, and MinIO services.
58+
All HTTPRoutes are configured to use the Gateway named "{{ .Values.httpRoute.gateway.name }}" in the
59+
{{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }} namespace.
60+
61+
Make sure the Gateway exists and is properly configured to accept traffic for the following domains:
62+
- OpenCloud: {{ include "opencloud.domain" . }} (Service: {{ include "opencloud.opencloud.fullname" . }}, Port: 9200)
63+
{{- if .Values.keycloak.internal.enabled }}
64+
- Keycloak: {{ include "opencloud.keycloak.domain" . }} (Service: {{ include "opencloud.keycloak.fullname" . }}, Port: 8080)
65+
{{- end }}
66+
{{- if .Values.opencloud.storage.s3.internal.enabled }}
67+
- MinIO Console: {{ include "opencloud.minio.domain" . }} (Service: {{ include "opencloud.minio.fullname" . }}, Port: 9001)
68+
{{- end }}
69+
{{- if and .Values.onlyoffice.collaboration.enabled .Values.onlyoffice.enabled }}
70+
- OnlyOffice Collaboration: {{ .Values.global.domain.wopi }} (Service: {{ include "opencloud.fullname" . }}-collaboration, Port: 9300)
71+
{{- end }}
72+
73+
{{- else }}
74+
IMPORTANT: The HTTPRoutes are disabled. You need to configure your own ingress controller
75+
to expose these services externally.
76+
77+
Example domains for your ingress configuration:
78+
- OpenCloud: {{ include "opencloud.domain" . }} (Service: {{ include "opencloud.opencloud.fullname" . }}, Port: 9200)
79+
{{- if .Values.keycloak.internal.enabled }}
80+
- Keycloak: {{ include "opencloud.keycloak.domain" . }} (Service: {{ include "opencloud.keycloak.fullname" . }}, Port: 8080)
81+
{{- end }}
82+
{{- if .Values.opencloud.storage.s3.internal.enabled }}
83+
- MinIO Console: {{ include "opencloud.minio.domain" . }} (Service: {{ include "opencloud.minio.fullname" . }}, Port: 9001)
84+
{{- end }}
85+
{{- if and .Values.onlyoffice.collaboration.enabled .Values.onlyoffice.enabled }}
86+
- OnlyOffice Collaboration: {{ .Values.global.domain.wopi }} (Service: {{ include "opencloud.fullname" . }}-collaboration, Port: 9300)
87+
{{- end }}
88+
{{- end }}
89+
90+
For more information, please refer to the OpenCloud documentation:
91+
https://docs.opencloud.eu/

‎charts/opencloud/templates/collabora/deployment.yaml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,23 @@ spec:
3838
--o:welcome.enable=false \
3939
--o:net.frame_ancestors={{ include "opencloud.domain" . }}
4040
- name: username
41-
value: "{{ .Values.collabora.admin.user | default "admin" }}"
41+
valueFrom:
42+
secretKeyRef:
43+
name: {{- if .Values.collabora.existingSecret }}
44+
{{ .Values.collabora.existingSecret }}
45+
{{- else }}
46+
{{ include "opencloud.fullname" . }}-collabora
47+
{{- end }}
48+
key: username
4249
- name: password
43-
value: "{{ .Values.collabora.admin.password | default "admin" }}"
50+
valueFrom:
51+
secretKeyRef:
52+
name: {{- if .Values.collabora.existingSecret }}
53+
{{ .Values.collabora.existingSecret }}
54+
{{- else }}
55+
{{ include "opencloud.fullname" . }}-collabora
56+
{{- end }}
57+
key: password
4458
ports:
4559
- containerPort: 9980
4660
name: http

‎charts/opencloud/templates/collabora/secrets.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{{- if and (not .Values.collabora.existingSecret) .Values.collabora.enabled }}
2+
apiVersion: v1
3+
kind: Secret
4+
metadata:
5+
name: {{ include "opencloud.fullname" . }}-collabora
6+
type: Opaque
7+
stringData:
8+
username: {{ .Values.collabora.username }}
9+
password: {{ .Values.collabora.password }}
10+
{{- end }}

‎charts/opencloud/templates/collaboration/deployment.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,15 @@ spec:
6868
value: "0.0.0.0:9300"
6969
- name: MICRO_REGISTRY
7070
value: "nats-js-kv"
71+
{{- if .Values.opencloud.nats.external.enabled }}
72+
- name: OC_PERSISTENT_STORE_NODES
73+
value: {{ .Values.opencloud.nats.external.endpoint | quote }}
74+
- name: MICRO_REGISTRY_ADDRESS
75+
value: {{ .Values.opencloud.nats.external.endpoint | quote }}
76+
{{- else }}
7177
- name: MICRO_REGISTRY_ADDRESS
7278
value: "{{ include "opencloud.opencloud.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:9233"
79+
{{- end }}
7380
{{- if .Values.onlyoffice.enabled }}
7481
- name: COLLABORATION_WOPI_SRC
7582
# onlyoffice has to connect to the wopi server from the web

‎charts/opencloud/templates/gateway/gateway.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
selector:
4343
matchLabels:
4444
kubernetes.io/metadata.name: {{ .Values.httpRoute.gateway.namespace | default .Release.Namespace }}
45-
{{- if .Values.keycloak.enabled }}
45+
{{- if .Values.keycloak.internal.enabled }}
4646
{{- if .Values.global.tls.enabled }}
4747
- name: keycloak-https
4848
{{- else }}

‎charts/opencloud/templates/keycloak/deployment.yaml

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,43 @@ spec:
5252
- name: KC_DB_URL
5353
value: jdbc:postgresql://{{ include "opencloud.postgres.fullname" . }}:5432/{{ .Values.postgres.database }}
5454
- name: KC_DB_USERNAME
55-
value: {{ .Values.postgres.user }}
55+
valueFrom:
56+
secretKeyRef:
57+
name: {{- if .Values.postgres.existingSecret }}
58+
{{ .Values.postgres.existingSecret }}
59+
{{- else }}
60+
{{ include "opencloud.postgres.fullname" . }}
61+
{{- end }}
62+
key: username
5663
- name: KC_DB_PASSWORD
57-
value: {{ .Values.postgres.password }}
64+
valueFrom:
65+
secretKeyRef:
66+
name: {{- if .Values.postgres.existingSecret }}
67+
{{ .Values.postgres.existingSecret }}
68+
{{- else }}
69+
{{ include "opencloud.postgres.fullname" . }}
70+
{{- end }}
71+
key: password
5872
- name: KC_FEATURES
5973
value: impersonation
6074
- name: KEYCLOAK_ADMIN
61-
value: {{ .Values.keycloak.internal.adminUser }}
75+
valueFrom:
76+
secretKeyRef:
77+
name: {{- if .Values.keycloak.internal.existingSecret }}
78+
{{ .Values.keycloak.internal.existingSecret }}
79+
{{- else }}
80+
{{ include "opencloud.keycloak.fullname" . }}
81+
{{- end }}
82+
key: adminUser
6283
- name: KEYCLOAK_ADMIN_PASSWORD
63-
value: {{ .Values.keycloak.internal.adminPassword }}
84+
valueFrom:
85+
secretKeyRef:
86+
name: {{- if .Values.keycloak.internal.existingSecret }}
87+
{{ .Values.keycloak.internal.existingSecret }}
88+
{{- else }}
89+
{{ include "opencloud.keycloak.fullname" . }}
90+
{{- end }}
91+
key: adminPassword
6492
{{- if .Values.keycloak.internal.cors.enabled }}
6593
- name: KC_SPI_CORS_ENABLED
6694
value: "true"

‎charts/opencloud/templates/keycloak/secrets.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{{- if and (not .Values.keycloak.internal.existingSecret) .Values.keycloak.internal.enabled }}
2+
apiVersion: v1
3+
kind: Secret
4+
metadata:
5+
name: {{ include "opencloud.keycloak.fullname" . }}
6+
type: Opaque
7+
stringData:
8+
adminUser: {{ .Values.keycloak.internal.adminUser }}
9+
adminPassword: {{ .Values.keycloak.internal.adminPassword }}
10+
{{- end }}

0 commit comments

Comments
 (0)