Skip to content

Commit c906442

Browse files
author
Your Name
committed
Merge branch 'full-chart'
2 parents f34f54e + 103491d commit c906442

File tree

8 files changed

+19
-32
lines changed

8 files changed

+19
-32
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@ apiVersion: v1
22
kind: Namespace
33
metadata:
44
name: opencloud
5+
---
6+
apiVersion: v1
7+
kind: Namespace
8+
metadata:
9+
name: openldap

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

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ bundle: {
1414
}
1515
chart: {
1616
name: "opencloud-full"
17-
version: "0.2.9"
17+
version: "2.0.2"
1818
}
1919
sync: {
2020
timeout: 5
@@ -296,11 +296,11 @@ bundle: {
296296
version: "4.3.3"
297297
}
298298
sync: {
299-
timeout: 5
299+
timeout: 25
300300
createNamespace: true
301301
}
302302
helmValues: {
303-
ltb_passwd: {
303+
"ltb-passwd": {
304304
enabled: false
305305
}
306306
replication: {
@@ -312,7 +312,7 @@ bundle: {
312312
configPassword: "config"
313313
}
314314
customLdifFiles: {
315-
opencloud_root_ldif: """
315+
"opencloud_root.ldif": """
316316
dn: dc=opencloud,dc=eu
317317
objectClass: organization
318318
objectClass: dcObject
@@ -338,82 +338,64 @@ bundle: {
338338
objectClass: organizationalUnit
339339
ou: custom
340340
"""
341-
users_ldif: ""
342-
groups_ldif: """
341+
"users.ldif": """
342+
"""
343+
"groups.ldif": """
343344
dn: cn=users,ou=groups,dc=opencloud,dc=eu
344345
objectClass: groupOfNames
345346
objectClass: top
346347
cn: users
347-
description: Users
348-
member: uid=alan,ou=users,dc=opencloud,dc=eu
349-
member: uid=mary,ou=users,dc=opencloud,dc=eu
350-
member: uid=margaret,ou=users,dc=opencloud,dc=eu
351-
member: uid=dennis,ou=users,dc=opencloud,dc=eu
352-
member: uid=lynn,ou=users,dc=opencloud,dc=eu
353-
member: uid=admin,ou=users,dc=opencloud,dc=eu
354-
355348
dn: cn=chess-lovers,ou=groups,dc=opencloud,dc=eu
356349
objectClass: groupOfNames
357350
objectClass: top
358351
cn: chess-lovers
359352
description: Chess lovers
360-
member: uid=alan,ou=users,dc=opencloud,dc=eu
361353
362354
dn: cn=machine-lovers,ou=groups,dc=opencloud,dc=eu
363355
objectClass: groupOfNames
364356
objectClass: top
365357
cn: machine-lovers
366358
description: Machine Lovers
367-
member: uid=alan,ou=users,dc=opencloud,dc=eu
368359
369360
dn: cn=bible-readers,ou=groups,dc=opencloud,dc=eu
370361
objectClass: groupOfNames
371362
objectClass: top
372363
cn: bible-readers
373364
description: Bible readers
374-
member: uid=mary,ou=users,dc=opencloud,dc=eu
375365
376366
dn: cn=apollos,ou=groups,dc=opencloud,dc=eu
377367
objectClass: groupOfNames
378368
objectClass: top
379369
cn: apollos
380370
description: Contributors to the Appollo mission
381-
member: uid=margaret,ou=users,dc=opencloud,dc=eu
382371
383372
dn: cn=unix-lovers,ou=groups,dc=opencloud,dc=eu
384373
objectClass: groupOfNames
385374
objectClass: top
386375
cn: unix-lovers
387376
description: Unix lovers
388-
member: uid=dennis,ou=users,dc=opencloud,dc=eu
389377
390378
dn: cn=basic-haters,ou=groups,dc=opencloud,dc=eu
391379
objectClass: groupOfNames
392380
objectClass: top
393381
cn: basic-haters
394382
description: Haters of the Basic programming language
395-
member: uid=dennis,ou=users,dc=opencloud,dc=eu
396383
397384
dn: cn=vlsi-lovers,ou=groups,dc=opencloud,dc=eu
398385
objectClass: groupOfNames
399386
objectClass: top
400387
cn: vlsi-lovers
401388
description: Lovers of VLSI microchip design
402-
member: uid=lynn,ou=users,dc=opencloud,dc=eu
403389
404390
dn: cn=programmers,ou=groups,dc=opencloud,dc=eu
405391
objectClass: groupOfNames
406392
objectClass: top
407393
cn: programmers
408394
description: Computer Programmers
409-
member: uid=alan,ou=users,dc=opencloud,dc=eu
410-
member: uid=margaret,ou=users,dc=opencloud,dc=eu
411-
member: uid=dennis,ou=users,dc=opencloud,dc=eu
412-
member: uid=lynn,ou=users,dc=opencloud,dc=eu
413395
"""
414396
}
415397
customSchemaFiles: {
416-
"10_opencloud_schema_ldif": """
398+
"10_opencloud_schema.ldif": """
417399
dn: cn=opencloud,cn=schema,cn=config
418400
objectClass: olcSchemaConfig
419401
cn: opencloud

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
apiVersion: gateway.networking.k8s.io/v1beta1
44
kind: HTTPRoute
55
metadata:
6-
name: {{ .appName }}
6+
name: {{ .Release.Name }}-keycloak
77
namespace: {{ template "oc.namespace" . }}
88
labels:
99
app: {{ .appName }}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ data:
500500
"id" : "0ab77e6d-23b4-4ba3-9843-a3b3efdcfc53",
501501
"username" : "admin",
502502
"firstName" : "Admin",
503+
"lastName" : "Admin",
503504
"email" : "[email protected]",
504505
"emailVerified" : true,
505506
"createdTimestamp" : 1743086161853,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
apiVersion: gateway.networking.k8s.io/v1beta1
44
kind: HTTPRoute
55
metadata:
6-
name: {{ .appName }}
6+
name: {{ .Release.Name }}-minio
77
namespace: {{ template "oc.namespace" . }}
88
labels:
99
app: {{ .appName }}
@@ -28,7 +28,7 @@ spec:
2828
apiVersion: gateway.networking.k8s.io/v1beta1
2929
kind: HTTPRoute
3030
metadata:
31-
name: {{ include "oc.minio.fullname" . }}-console
31+
name: {{ .Release.Name }}-minio-console
3232
labels:
3333
{{- include "oc.labels" . | nindent 4 }}
3434
app.kubernetes.io/component: minio

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
apiVersion: gateway.networking.k8s.io/v1beta1
44
kind: HTTPRoute
55
metadata:
6-
name: {{ .appName }}
6+
name: {{ .Release.Name }}-oo
77
namespace: {{ template "oc.namespace" . }}
88
labels:
99
app: {{ .appName }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: gateway.networking.k8s.io/v1beta1
22
kind: HTTPRoute
33
metadata:
44
# TODO make like minio
5-
name: {{ .Release.Name }}-oc-proxy
5+
name: {{ .Release.Name }}-proxy
66
namespace: {{ template "oc.namespace" . }}
77
labels:
88
{{- include "oc.labels" . | nindent 4 }}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,6 @@
489489
"id" : "0ab77e6d-23b4-4ba3-9843-a3b3efdcfc53",
490490
"username" : "admin",
491491
"firstName" : "Admin",
492-
"lastName" : "Admin",
493492
"email" : "[email protected]",
494493
"emailVerified" : false,
495494
"createdTimestamp" : 1743086161853,

0 commit comments

Comments
 (0)