Skip to content

Commit edff3e5

Browse files
author
Your Name
committed
Fix oci url and fluxcd config values
1 parent c82a4bb commit edff3e5

File tree

7 files changed

+18
-7
lines changed

7 files changed

+18
-7
lines changed

charts/opencloud-microservices/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,8 @@ timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/openc
174174

175175
The charts are also available in the GitHub Container Registry (GHCR) as OCI artifacts:
176176

177+
Change the repo url to: ghcr.io/opencloud-eu/helm-charts/opencloud-microservices
178+
177179
```bash
178180
cd charts/opencloud-microservices/deployments
179181
helmfile sync

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ repositories:
1313
releases:
1414
# --- OpenCloud Microservice Chart Release ---
1515
# Deploys the main OpenCloud application with all its integrated services.
16-
- name: opencloud-helm
17-
namespace: opencloud-helm # Dedicated namespace for the OpenCloud deployment.
16+
- name: opencloud
17+
namespace: opencloud # Dedicated namespace for the OpenCloud deployment.
1818
chart: ../../ # Path to the OpenCloud Helm chart.
1919
values:
2020
# --- General Settings ---

charts/opencloud-microservices/deployments/timoni/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# Install
2-
1+
# Install/Upgrate
32
kubectl apply -f ./charts/opencloud-microservices/deployments/timoni/ && \
43
timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/opencloud.cue --runtime ./charts/opencloud-microservices/deployments/timoni/runtime.cue
54

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ data:
9393
# Collabora Configuration
9494
###############################################################################
9595
COLLABORA_URI: "https://collabora.opencloud.test"
96+
COLLABORA_DOMAIN: "collabora.opencloud.test"
9697
COLLABORA_ICON_URI: "https://collabora.opencloud.test/favicon.ico"
9798
COLLABORA_ENABLED: "true"
9899
COLLABORA_INSECURE: "true"

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ bundle: {
2121
namespace: "opencloud"
2222
values: {
2323
repository: {
24-
url: "oci://ghcr.io/suse-coder/helm-charts"
24+
url: "oci://ghcr.io/opencloud-eu/helm-charts"
2525
}
2626
chart: {
2727
name: "opencloud-microservices"
28-
version: "*"
28+
version: "0.1.0"
2929
}
3030
sync: {
3131
timeout: 10
@@ -56,7 +56,12 @@ bundle: {
5656
}
5757
}
5858
}
59+
collabora: {
60+
enabled: bool @timoni(runtime:bool:COLLABORA_ENABLED)
61+
domain: string @timoni(runtime:string:COLLABORA_DOMAIN)
62+
}
5963
onlyoffice: {
64+
enabled: bool @timoni(runtime:bool:ONLYOFFICE_ENABLED)
6065
domain: string @timoni(runtime:string:ONLYOFFICE_DOMAIN)
6166
persistence: {
6267
size: string @timoni(runtime:string:ONLYOFFICE_PERSISTENCE_SIZE)
@@ -499,3 +504,4 @@ bundle: {
499504
}
500505
}
501506
}
507+

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ runtime: {
5151
"LDAP_URI": "obj.data.LDAP_URI"
5252
"OIDC_ISSUER_URI": "obj.data.OIDC_ISSUER_URI"
5353
"COLLABORA_URI": "obj.data.COLLABORA_URI"
54+
"COLLABORA_DOMAIN": "obj.data.COLLABORA_DOMAIN"
5455
"COLLABORA_ICON_URI": "obj.data.COLLABORA_ICON_URI"
5556
"WOPI_INGRESS_DOMAIN": "obj.data.WOPI_INGRESS_DOMAIN"
5657
"WOPI_COLLABORA_TLS_HOST": "obj.data.WOPI_COLLABORA_TLS_HOST"
@@ -135,6 +136,7 @@ runtime: {
135136
LDAP_URI: "ldap://openldap.openldap.svc.cluster.local:389"
136137
OIDC_ISSUER_URI: "https://keycloak.opencloud.test/realms/openCloud"
137138
COLLABORA_URI: "https://collabora.opencloud.test"
139+
COLLABORA_DOMAIN: "collabora.opencloud.test"
138140
COLLABORA_ICON_URI: "https://collabora.opencloud.test/favicon.ico"
139141
WOPI_INGRESS_DOMAIN: "wopi.opencloud.test"
140142
WOPI_COLLABORA_TLS_HOST: "wopi-collabora.kube.opencloud.test"

charts/opencloud-microservices/templates/minio/deployment.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ spec:
1313
fsGroup: 1000
1414
initContainers:
1515
- name: init-minio-bucket
16-
image: busybox
16+
image: "{{ .Values.minio.image.registry }}/busybox:{{ .Values.minio.image.tag }}"
17+
imagePullPolicy: {{.Values.minio.image.pullPolicy | default "IfNotPresent" }}
1718
securityContext:
1819
runAsUser: 1000
1920
runAsGroup: 1000

0 commit comments

Comments
 (0)