Merge branch 'full-chart'

Author: Your Name

charts/opencloud-full/deployments/timoni/namespace.yaml

@@ -2,3 +2,8 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: opencloud
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: openldap

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

@@ -14,7 +14,7 @@ bundle: {
                 }
                 chart: {
                     name:    "opencloud-full"
-                    version: "0.2.9"
+                    version: "2.0.2"
                 }
                 sync: {
                     timeout: 5
@@ -296,11 +296,11 @@ bundle: {
                     version: "4.3.3"
                 }
                 sync: {
-                    timeout: 5
+                    timeout: 25
                     createNamespace: true
                 }
                 helmValues: {
-                    ltb_passwd: {
+                    "ltb-passwd": {
                         enabled: false
                     }
                     replication: {
@@ -312,7 +312,7 @@ bundle: {
                         configPassword: "config"
                     }
                     customLdifFiles: {
-                        opencloud_root_ldif: """
+                        "opencloud_root.ldif": """
                             dn: dc=opencloud,dc=eu
                             objectClass: organization
                             objectClass: dcObject
@@ -338,82 +338,64 @@ bundle: {
                             objectClass: organizationalUnit
                             ou: custom
                             """
-                        users_ldif: ""
-                        groups_ldif: """
+                        "users.ldif": """
+                            """
+                        "groups.ldif": """
                             dn: cn=users,ou=groups,dc=opencloud,dc=eu
                             objectClass: groupOfNames
                             objectClass: top
                             cn: users
-                            description: Users
-                            member: uid=alan,ou=users,dc=opencloud,dc=eu
-                            member: uid=mary,ou=users,dc=opencloud,dc=eu
-                            member: uid=margaret,ou=users,dc=opencloud,dc=eu
-                            member: uid=dennis,ou=users,dc=opencloud,dc=eu
-                            member: uid=lynn,ou=users,dc=opencloud,dc=eu
-                            member: uid=admin,ou=users,dc=opencloud,dc=eu
-
                             dn: cn=chess-lovers,ou=groups,dc=opencloud,dc=eu
                             objectClass: groupOfNames
                             objectClass: top
                             cn: chess-lovers
                             description: Chess lovers
-                            member: uid=alan,ou=users,dc=opencloud,dc=eu
 
                             dn: cn=machine-lovers,ou=groups,dc=opencloud,dc=eu
                             objectClass: groupOfNames
                             objectClass: top
                             cn: machine-lovers
                             description: Machine Lovers
-                            member: uid=alan,ou=users,dc=opencloud,dc=eu
 
                             dn: cn=bible-readers,ou=groups,dc=opencloud,dc=eu
                             objectClass: groupOfNames
                             objectClass: top
                             cn: bible-readers
                             description: Bible readers
-                            member: uid=mary,ou=users,dc=opencloud,dc=eu
 
                             dn: cn=apollos,ou=groups,dc=opencloud,dc=eu
                             objectClass: groupOfNames
                             objectClass: top
                             cn: apollos
                             description: Contributors to the Appollo mission
-                            member: uid=margaret,ou=users,dc=opencloud,dc=eu
 
                             dn: cn=unix-lovers,ou=groups,dc=opencloud,dc=eu
                             objectClass: groupOfNames
                             objectClass: top
                             cn: unix-lovers
                             description: Unix lovers
-                            member: uid=dennis,ou=users,dc=opencloud,dc=eu
 
                             dn: cn=basic-haters,ou=groups,dc=opencloud,dc=eu
                             objectClass: groupOfNames
                             objectClass: top
                             cn: basic-haters
                             description: Haters of the Basic programming language
-                            member: uid=dennis,ou=users,dc=opencloud,dc=eu
 
                             dn: cn=vlsi-lovers,ou=groups,dc=opencloud,dc=eu
                             objectClass: groupOfNames
                             objectClass: top
                             cn: vlsi-lovers
                             description: Lovers of VLSI microchip design
-                            member: uid=lynn,ou=users,dc=opencloud,dc=eu
 
                             dn: cn=programmers,ou=groups,dc=opencloud,dc=eu
                             objectClass: groupOfNames
                             objectClass: top
                             cn: programmers
                             description: Computer Programmers
-                            member: uid=alan,ou=users,dc=opencloud,dc=eu
-                            member: uid=margaret,ou=users,dc=opencloud,dc=eu
-                            member: uid=dennis,ou=users,dc=opencloud,dc=eu
-                            member: uid=lynn,ou=users,dc=opencloud,dc=eu
                             """
                     }
                     customSchemaFiles: {
-                        "10_opencloud_schema_ldif": """
+                        "10_opencloud_schema.ldif": """
                             dn: cn=opencloud,cn=schema,cn=config
                             objectClass: olcSchemaConfig
                             cn: opencloud

charts/opencloud-full/templates/keycloak/httproute.yaml

@@ -3,7 +3,7 @@
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
-  name: {{ .appName }}
+  name: {{ .Release.Name }}-keycloak
   namespace: {{ template "oc.namespace" . }}
   labels:
     app: {{ .appName }}

charts/opencloud-full/templates/keycloak/realm-configmap.yaml

@@ -500,6 +500,7 @@ data:
         "id" : "0ab77e6d-23b4-4ba3-9843-a3b3efdcfc53",
         "username" : "admin",
         "firstName" : "Admin",
+        "lastName" : "Admin",
         "email" : "[email protected]",
         "emailVerified" : true,
         "createdTimestamp" : 1743086161853,

charts/opencloud-full/templates/minio/httproute.yaml

@@ -3,7 +3,7 @@
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
-  name: {{ .appName }}
+  name: {{ .Release.Name }}-minio
   namespace: {{ template "oc.namespace" . }}
   labels:
     app: {{ .appName }}
@@ -28,7 +28,7 @@ spec:
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
-  name: {{ include "oc.minio.fullname" . }}-console
+  name: {{ .Release.Name }}-minio-console
   labels:
     {{- include "oc.labels" . | nindent 4 }}
     app.kubernetes.io/component: minio

charts/opencloud-full/templates/onlyoffice/httproute.yaml

@@ -3,7 +3,7 @@
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
-  name: {{ .appName }}
+  name: {{ .Release.Name }}-oo
   namespace: {{ template "oc.namespace" . }}
   labels:
     app: {{ .appName }}

charts/opencloud-full/templates/proxy/httproute.yaml

@@ -2,7 +2,7 @@ apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute
 metadata:
   # TODO make like minio
-  name: {{ .Release.Name }}-oc-proxy
+  name: {{ .Release.Name }}-proxy
   namespace: {{ template "oc.namespace" . }}
   labels:
     {{- include "oc.labels" . | nindent 4 }}

charts/opencloud/files/keycloak/opencloud-realm.json.gotmpl

@@ -489,7 +489,6 @@
     "id" : "0ab77e6d-23b4-4ba3-9843-a3b3efdcfc53",
     "username" : "admin",
     "firstName" : "Admin",
-    "lastName" : "Admin",
     "email" : "[email protected]",
     "emailVerified" : false,
     "createdTimestamp" : 1743086161853,