Fix oci url and fluxcd config values

Your Name · Your Name · commit edff3e53b986 · 2025-07-28T12:53:16.000Z
diff --git a/charts/opencloud-microservices/README.md b/charts/opencloud-microservices/README.md
@@ -174,6 +174,8 @@ timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/openc
 
 The charts are also available in the GitHub Container Registry (GHCR) as OCI artifacts:
 
+Change the repo url to:  ghcr.io/opencloud-eu/helm-charts/opencloud-microservices
+
 ```bash
 cd charts/opencloud-microservices/deployments
 helmfile sync
diff --git a/charts/opencloud-microservices/deployments/helm/helmfile.yaml b/charts/opencloud-microservices/deployments/helm/helmfile.yaml
@@ -13,8 +13,8 @@ repositories:
 releases:
   # --- OpenCloud Microservice Chart Release ---
   # Deploys the main OpenCloud application with all its integrated services.
-  - name: opencloud-helm
-    namespace: opencloud-helm # Dedicated namespace for the OpenCloud deployment.
+  - name: opencloud
+    namespace: opencloud # Dedicated namespace for the OpenCloud deployment.
     chart: ../../ # Path to the OpenCloud Helm chart.
     values:
       # --- General Settings ---
diff --git a/charts/opencloud-microservices/deployments/timoni/README.md b/charts/opencloud-microservices/deployments/timoni/README.md
@@ -1,5 +1,4 @@
-# Install
-
+# Install/Upgrate
 kubectl apply -f ./charts/opencloud-microservices/deployments/timoni/ && \
 timoni bundle apply -f ./charts/opencloud-microservices/deployments/timoni/opencloud.cue --runtime ./charts/opencloud-microservices/deployments/timoni/runtime.cue
 
diff --git a/charts/opencloud-microservices/deployments/timoni/configmap.yaml b/charts/opencloud-microservices/deployments/timoni/configmap.yaml
@@ -93,6 +93,7 @@ data:
   # Collabora Configuration
   ###############################################################################
   COLLABORA_URI: "https://collabora.opencloud.test"
+  COLLABORA_DOMAIN: "collabora.opencloud.test"
   COLLABORA_ICON_URI: "https://collabora.opencloud.test/favicon.ico"
   COLLABORA_ENABLED: "true"
   COLLABORA_INSECURE: "true"
diff --git a/charts/opencloud-microservices/deployments/timoni/opencloud.cue b/charts/opencloud-microservices/deployments/timoni/opencloud.cue
@@ -21,11 +21,11 @@ bundle: {
             namespace: "opencloud"
             values: {
                 repository: {
-                    url: "oci://ghcr.io/suse-coder/helm-charts"
+                    url: "oci://ghcr.io/opencloud-eu/helm-charts"
                 }
                 chart: {
                     name:    "opencloud-microservices"
-                    version: "*"
+                    version: "0.1.0"
                 }
                 sync: {
                     timeout: 10
@@ -56,7 +56,12 @@ bundle: {
                             }
                         }
                     }
+                    collabora: {
+                        enabled: bool @timoni(runtime:bool:COLLABORA_ENABLED)
+                        domain: string @timoni(runtime:string:COLLABORA_DOMAIN)
+                    }
                     onlyoffice: {
+                        enabled: bool @timoni(runtime:bool:ONLYOFFICE_ENABLED)
                         domain: string @timoni(runtime:string:ONLYOFFICE_DOMAIN)
                         persistence: {
                             size: string @timoni(runtime:string:ONLYOFFICE_PERSISTENCE_SIZE)
@@ -499,3 +504,4 @@ bundle: {
         }
     }
 }
+
diff --git a/charts/opencloud-microservices/deployments/timoni/runtime.cue b/charts/opencloud-microservices/deployments/timoni/runtime.cue
@@ -51,6 +51,7 @@ runtime: {
                 "LDAP_URI":                  "obj.data.LDAP_URI"
                 "OIDC_ISSUER_URI":           "obj.data.OIDC_ISSUER_URI"
                 "COLLABORA_URI":             "obj.data.COLLABORA_URI"
+                "COLLABORA_DOMAIN":          "obj.data.COLLABORA_DOMAIN"
                 "COLLABORA_ICON_URI":        "obj.data.COLLABORA_ICON_URI"
                 "WOPI_INGRESS_DOMAIN":       "obj.data.WOPI_INGRESS_DOMAIN"
                 "WOPI_COLLABORA_TLS_HOST":   "obj.data.WOPI_COLLABORA_TLS_HOST"
@@ -135,6 +136,7 @@ runtime: {
         LDAP_URI: "ldap://openldap.openldap.svc.cluster.local:389"
         OIDC_ISSUER_URI: "https://keycloak.opencloud.test/realms/openCloud"
         COLLABORA_URI: "https://collabora.opencloud.test"
+        COLLABORA_DOMAIN: "collabora.opencloud.test"
         COLLABORA_ICON_URI: "https://collabora.opencloud.test/favicon.ico"
         WOPI_INGRESS_DOMAIN: "wopi.opencloud.test"
         WOPI_COLLABORA_TLS_HOST: "wopi-collabora.kube.opencloud.test"
diff --git a/charts/opencloud-microservices/templates/minio/deployment.yaml b/charts/opencloud-microservices/templates/minio/deployment.yaml
@@ -13,7 +13,8 @@ spec:
         fsGroup: 1000
       initContainers:
         - name: init-minio-bucket
-          image: busybox
+          image: "{{ .Values.minio.image.registry }}/busybox:{{ .Values.minio.image.tag }}"
+          imagePullPolicy: {{.Values.minio.image.pullPolicy | default "IfNotPresent" }}
           securityContext:
             runAsUser: 1000
             runAsGroup: 1000

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ bundle: {`
`21`	`21`	`namespace: "opencloud"`
`22`	`22`	`values: {`
`23`	`23`	`repository: {`
`24`		`- url: "oci://ghcr.io/suse-coder/helm-charts"`
	`24`	`+ url: "oci://ghcr.io/opencloud-eu/helm-charts"`
`25`	`25`	`}`
`26`	`26`	`chart: {`
`27`	`27`	`name: "opencloud-microservices"`
`28`		`- version: "*"`
	`28`	`+ version: "0.1.0"`
`29`	`29`	`}`
`30`	`30`	`sync: {`
`31`	`31`	`timeout: 10`
`@@ -56,7 +56,12 @@ bundle: {`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`
	`59`	`+ collabora: {`
	`60`	`+ enabled: bool @timoni(runtime:bool:COLLABORA_ENABLED)`
	`61`	`+ domain: string @timoni(runtime:string:COLLABORA_DOMAIN)`
	`62`	`+ }`
`59`	`63`	`onlyoffice: {`
	`64`	`+ enabled: bool @timoni(runtime:bool:ONLYOFFICE_ENABLED)`
`60`	`65`	`domain: string @timoni(runtime:string:ONLYOFFICE_DOMAIN)`
`61`	`66`	`persistence: {`
`62`	`67`	`size: string @timoni(runtime:string:ONLYOFFICE_PERSISTENCE_SIZE)`
`@@ -499,3 +504,4 @@ bundle: {`
`499`	`504`	`}`
`500`	`505`	`}`
`501`	`506`	`}`
	`507`	`+`