Skip to content

Commit 9152ae1

Browse files
author
Your Name
committed
Merge branch 'full-chart'
2 parents c906442 + 25f5c77 commit 9152ae1

File tree

8 files changed

+32
-31
lines changed

8 files changed

+32
-31
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ releases:
131131
config:
132132
sites:
133133
- name: openCloud
134-
url: https://www.opencloud.com
134+
url: https://www.opencloud.eu
135135
target: external
136136
color: "#0D856F"
137137
icon: cloud
@@ -246,7 +246,6 @@ releases:
246246
objectClass: person
247247
cn: admin
248248
sn: admin
249-
uid: ldapadmin
250249
251250
dn: ou=groups,dc=opencloud,dc=eu
252251
objectClass: organizationalUnit

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ data:
1515
WOPI_COLLABORA_TLS_HOST: "wopi-collabora.kube.opencloud.test"
1616
ONLYOFFICE_URI: "https://onlyoffice.opencloud.test"
1717
ONLYOFFICE_ICON_URI: "https://onlyoffice.opencloud.test/web-apps/apps/documenteditor/main/resources/img/favicon.ico"
18-
OPENCLOUD_WEB_URL: "https://www.opencloud.com"
18+
OPENCLOUD_WEB_URL: "https://www.opencloud.eu"
1919
LDAP_GLOBAL_DOMAIN: "opencloud.eu"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ bundle: {
296296
version: "4.3.3"
297297
}
298298
sync: {
299-
timeout: 25
299+
timeout: 5
300300
createNamespace: true
301301
}
302302
helmValues: {
@@ -328,7 +328,6 @@ bundle: {
328328
objectClass: person
329329
cn: admin
330330
sn: admin
331-
uid: ldapadmin
332331
333332
dn: ou=groups,dc=opencloud,dc=eu
334333
objectClass: organizationalUnit

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ runtime: {
3333
"WOPI_COLLABORA_TLS_HOST": "wopi-collabora.kube.opencloud.test"
3434
"ONLYOFFICE_URI": "https://onlyoffice.opencloud.test"
3535
"ONLYOFFICE_ICON_URI": "https://onlyoffice.opencloud.test/web-apps/apps/documenteditor/main/resources/img/favicon.ico"
36-
"OPENCLOUD_WEB_URL": "https://www.opencloud.com"
36+
"OPENCLOUD_WEB_URL": "https://www.opencloud.eu"
3737
"LDAP_GLOBAL_DOMAIN": "opencloud.eu"
3838
}
3939
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ kind: PersistentVolumeClaim
55
metadata:
66
name: {{ .appName }}
77
namespace: {{ template "oc.namespace" . }}
8+
annotations:
9+
helm.sh/resource-policy: "keep"
810
labels:
911
app: {{ .appName }}
1012
oc-metrics: enabled

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ kind: PersistentVolumeClaim
55
metadata:
66
name: {{ .appName }}-data
77
namespace: {{ template "oc.namespace" . }}
8+
annotations:
89
labels:
910
app: {{ .appName }}
1011
oc-metrics: enabled

charts/opencloud-full/values.schema.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"backup": {
3333
"additionalProperties": false,
34-
"description": "Backup related settings\nCompare to https://doc.opencloud.com/opencloud/next/maintenance/b-r/backup_considerations.html",
34+
"description": "Backup related settings\nCompare to https://doc.opencloud.eu/opencloud/next/maintenance/b-r/backup_considerations.html",
3535
"properties": {
3636
"configMapLabels": {
3737
"additionalProperties": false,
@@ -106,7 +106,7 @@
106106
},
107107
"configRefs": {
108108
"additionalProperties": false,
109-
"description": "References to ConfigMaps.\nThe ConfigMaps need to be manually created.\nLeave these empty to have them autogenerated by the Helm chart.\nNote that ConfigMaps generated by the helm chart will be removed once the helm chart is uninstalled.\nFurthermore, if you already had ConfigMaps at the default locations, they will be NOT be overwritten,\nbut the helm chart will claim ownership of them. If this is a problem, fill in the configRefs below\nwith the names of your existing secrets.\nSee https://doc.opencloud.com/opencloud/next/deployment/container/orchestration/orchestration.html#customize-the-generic-setup[doc.opencloud.com] for how to generate them.",
109+
"description": "References to ConfigMaps.\nThe ConfigMaps need to be manually created.\nLeave these empty to have them autogenerated by the Helm chart.\nNote that ConfigMaps generated by the helm chart will be removed once the helm chart is uninstalled.\nFurthermore, if you already had ConfigMaps at the default locations, they will be NOT be overwritten,\nbut the helm chart will claim ownership of them. If this is a problem, fill in the configRefs below\nwith the names of your existing secrets.\nSee https://doc.opencloud.eu/opencloud/next/deployment/container/orchestration/orchestration.html#customize-the-generic-setup[doc.opencloud.eu] for how to generate them.",
110110
"properties": {
111111
"authServiceConfigRef": {
112112
"default": "",
@@ -1538,7 +1538,7 @@
15381538
},
15391539
"providersConfigRef": {
15401540
"default": "",
1541-
"description": "Required reference to an existing provider config.\nWill be mounted to /etc/opencloud\nDoes not get autogenerated.\nDocumentation can be found at https://doc.opencloud.com/opencloud/next/deployment/services/s-list/opencloudm.html#trust-between-instances",
1541+
"description": "Required reference to an existing provider config.\nWill be mounted to /etc/opencloud\nDoes not get autogenerated.\nDocumentation can be found at https://doc.opencloud.eu/opencloud/next/deployment/services/s-list/opencloudm.html#trust-between-instances",
15421542
"required": [],
15431543
"title": "providersConfigRef",
15441544
"type": [
@@ -1581,7 +1581,7 @@
15811581
"type": "string"
15821582
},
15831583
"policies": {
1584-
"description": "Sets the policies. Each policy file is defined by a `fileName` and a `content`. The content takes the rego script as text.\nFor further information, please have a look at https://doc.opencloud.com/opencloud/next/deployment/services/s-list/policies.html\nAttention: All scripts provided here will end up in a ConfigMap. The data stored in a ConfigMap cannot exceed 1 MiB. see\nhttps://kubernetes.io/docs/concepts/configuration/configmap/#:~:text=The%20data%20stored%20in%20a,separate%20database%20or%20file%20service.",
1584+
"description": "Sets the policies. Each policy file is defined by a `fileName` and a `content`. The content takes the rego script as text.\nFor further information, please have a look at https://doc.opencloud.eu/opencloud/next/deployment/services/s-list/policies.html\nAttention: All scripts provided here will end up in a ConfigMap. The data stored in a ConfigMap cannot exceed 1 MiB. see\nhttps://kubernetes.io/docs/concepts/configuration/configmap/#:~:text=The%20data%20stored%20in%20a,separate%20database%20or%20file%20service.",
15851585
"items": {
15861586
"additionalProperties": false,
15871587
"properties": {
@@ -1659,7 +1659,7 @@
16591659
"description": "Define custom roles here. Note that the definition will be either or. So you cannot provide a ConfigMap name and text at once.",
16601660
"properties": {
16611661
"availableUnifiedRoles": {
1662-
"description": "Define a list of unified roles to make them available.\nThe default of an empty list means all unified roles are available.\nYou can read about unified roles in https://doc.opencloud.com/opencloud/next/deployment/services/s-list/graph.html.\nThe IDs of the roles and a description can be found by running:\nkubectl -n oc exec deployments/graph -- oc graph list-unified-roles",
1662+
"description": "Define a list of unified roles to make them available.\nThe default of an empty list means all unified roles are available.\nYou can read about unified roles in https://doc.opencloud.eu/opencloud/next/deployment/services/s-list/graph.html.\nThe IDs of the roles and a description can be found by running:\nkubectl -n oc exec deployments/graph -- oc graph list-unified-roles",
16631663
"items": {
16641664
"required": [],
16651665
"type": "string"
@@ -2773,7 +2773,7 @@
27732773
},
27742774
"secretRefs": {
27752775
"additionalProperties": false,
2776-
"description": "References to secrets.\nLeave these empty to have them autogenerated by the Helm chart.\nNote that secrets generated by the helm chart will be removed once the helm chart is uninstalled.\nFurthermore, if you already had secrets at the default locations, they will be NOT be overwritten,\nbut the helm chart will claim ownership of them. If this is a problem, fill in the secretRefs below\nwith the names of your existing secrets.\nTODO: Update https://doc.opencloud.com/opencloud/next/deployment/container/orchestration/orchestration.html#customize-the-generic-setup[doc.opencloud.com] for how to generate them.",
2776+
"description": "References to secrets.\nLeave these empty to have them autogenerated by the Helm chart.\nNote that secrets generated by the helm chart will be removed once the helm chart is uninstalled.\nFurthermore, if you already had secrets at the default locations, they will be NOT be overwritten,\nbut the helm chart will claim ownership of them. If this is a problem, fill in the secretRefs below\nwith the names of your existing secrets.\nTODO: Update https://doc.opencloud.eu/opencloud/next/deployment/container/orchestration/orchestration.html#customize-the-generic-setup[doc.opencloud.eu] for how to generate them.",
27772777
"properties": {
27782778
"adminUserSecretRef": {
27792779
"default": "",
@@ -7967,7 +7967,7 @@
79677967
"properties": {
79687968
"sizeLimit": {
79697969
"default": "",
7970-
"description": "Image pull policy\nConfigures the maximum file size in bytes that is allowed for content extraction.\nFor the default value see https://doc.opencloud.com/opencloud/next/deployment/services/s-list/search.html",
7970+
"description": "Image pull policy\nConfigures the maximum file size in bytes that is allowed for content extraction.\nFor the default value see https://doc.opencloud.eu/opencloud/next/deployment/services/s-list/search.html",
79717971
"required": [],
79727972
"title": "sizeLimit",
79737973
"type": [

charts/opencloud-full/values.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ features:
900900
# @schema
901901
# -- Mimetype configuration.
902902
# Let's you configure a mimetypes' default application, if it is allowed to create a new file and more.
903-
# @default -- default configuration of OC, see https://doc.opencloud.com/opencloud/next/deployment/services/s-list/app-registry.html#yaml-example[doc.opencloud.com]
903+
# @default -- default configuration of OC, see https://doc.opencloud.eu/opencloud/next/deployment/services/s-list/app-registry.html#yaml-example[doc.opencloud.eu]
904904
mimetypes:
905905
- mime_type: application/vnd.oasis.opendocument.text
906906
extension: odt
@@ -970,15 +970,15 @@ features:
970970
# Note: Enabling `roleAssignment` will disable `adminUUID`.
971971
adminUUID: "0ab77e6d-23b4-4ba3-9843-a3b3efdcfc53"
972972
# Autoprovisioning of user accounts via OIDC
973-
autoprovisionAccounts:
973+
autoprovisionAccounts:
974974
# @schema
975975
# type: boolean
976976
# required: true
977977
# @schema
978978
# -- Enables account auto provisioning.
979979
# It will create missing users on the LDAP server from OIDC information.
980980
# Needs `features.externalUserManagement.ldap.writeable` to be be set to `true`.
981-
enabled: false
981+
enabled: true
982982
# @schema
983983
# type: string
984984
# required: true
@@ -1155,12 +1155,12 @@ features:
11551155
# @schema
11561156
# -- If the LDAP server is set to writable in general, some user attributes can be restricted to read only in the UI.
11571157
# Note: This only disables editing in the UI. The readonly permissions need to be enforced in the LDAP server itself.
1158-
readOnlyAttributes: []
1159-
# - user.onPremisesSamAccountName # username
1160-
# - user.displayName # display name
1161-
# - user.mail # mail
1162-
# - user.passwordProfile # password
1163-
# - user.memberOf
1158+
readOnlyAttributes:
1159+
- user.onPremisesSamAccountName # username
1160+
- user.displayName # display name
1161+
- user.mail # mail
1162+
- user.passwordProfile # password
1163+
- user.memberOf
11641164
# - user.appRoleAssignments # role
11651165
# - user.accountEnabled # login allowed
11661166
# - drive.quota # quota
@@ -1279,7 +1279,7 @@ features:
12791279
# required: false
12801280
# @schema
12811281
# -- LDAP filter to add to the default filters for user search like `(objectclass=openCloud)`.
1282-
filter:
1282+
filter: (objectclass=inetOrgPerson)
12831283
# @schema
12841284
# type: string
12851285
# required: true
@@ -1344,7 +1344,7 @@ features:
13441344
# All existing groups with a DN outside the `features.externalUserManagement.ldap.group.createBaseDN` will be treated as read-only groups.
13451345
# Defaults to the value `features.externalUserManagement.ldap.group.baseDN`.
13461346
# Only applicable if `features.externalUserManagement.ldap.writeable` is set to `true`
1347-
createBaseDN:
1347+
createBaseDN: ou=custom,ou=groups,dc=opencloud,dc=eu
13481348
# @schema
13491349
# type: string
13501350
# required: true
@@ -1451,7 +1451,7 @@ features:
14511451
# @schema
14521452
# -- Define a list of unified roles to make them available.
14531453
# The default of an empty list means all unified roles are available.
1454-
# You can read about unified roles in https://doc.opencloud.com/opencloud/next/deployment/services/s-list/graph.html.
1454+
# You can read about unified roles in https://doc.opencloud.eu/opencloud/next/deployment/services/s-list/graph.html.
14551455
# The IDs of the roles and a description can be found by running:
14561456
# kubectl -n oc exec deployments/graph -- oc graph list-unified-roles
14571457
availableUnifiedRoles: []
@@ -1560,7 +1560,7 @@ features:
15601560
# required: true
15611561
# @schema
15621562
# -- Sets the policies. Each policy file is defined by a `fileName` and a `content`. The content takes the rego script as text.
1563-
# For further information, please have a look at https://doc.opencloud.com/opencloud/next/deployment/services/s-list/policies.html
1563+
# For further information, please have a look at https://doc.opencloud.eu/opencloud/next/deployment/services/s-list/policies.html
15641564
# Attention: All scripts provided here will end up in a ConfigMap. The data stored in a ConfigMap cannot exceed 1 MiB. see
15651565
# https://kubernetes.io/docs/concepts/configuration/configmap/#:~:text=The%20data%20stored%20in%20a,separate%20database%20or%20file%20service.
15661566
policies: []
@@ -1623,7 +1623,7 @@ features:
16231623
# -- Required reference to an existing provider config.
16241624
# Will be mounted to /etc/opencloud
16251625
# Does not get autogenerated.
1626-
# Documentation can be found at https://doc.opencloud.com/opencloud/next/deployment/services/s-list/opencloudm.html#trust-between-instances
1626+
# Documentation can be found at https://doc.opencloud.eu/opencloud/next/deployment/services/s-list/opencloudm.html#trust-between-instances
16271627
providersConfigRef:
16281628

16291629
# Ingress for OC.
@@ -1687,7 +1687,7 @@ gateway:
16871687
# Furthermore, if you already had ConfigMaps at the default locations, they will be NOT be overwritten,
16881688
# but the helm chart will claim ownership of them. If this is a problem, fill in the configRefs below
16891689
# with the names of your existing secrets.
1690-
# See https://doc.opencloud.com/opencloud/next/deployment/container/orchestration/orchestration.html#customize-the-generic-setup[doc.opencloud.com] for how to generate them.
1690+
# See https://doc.opencloud.eu/opencloud/next/deployment/container/orchestration/orchestration.html#customize-the-generic-setup[doc.opencloud.eu] for how to generate them.
16911691
configRefs:
16921692
# @schema
16931693
# type: [string, null]
@@ -1732,7 +1732,7 @@ configRefs:
17321732
# Furthermore, if you already had secrets at the default locations, they will be NOT be overwritten,
17331733
# but the helm chart will claim ownership of them. If this is a problem, fill in the secretRefs below
17341734
# with the names of your existing secrets.
1735-
# TODO: Update https://doc.opencloud.com/opencloud/next/deployment/container/orchestration/orchestration.html#customize-the-generic-setup[doc.opencloud.com] for how to generate them.
1735+
# TODO: Update https://doc.opencloud.eu/opencloud/next/deployment/container/orchestration/orchestration.html#customize-the-generic-setup[doc.opencloud.eu] for how to generate them.
17361736
secretRefs:
17371737
# @schema
17381738
# type: [string, null]
@@ -1923,7 +1923,7 @@ extraLabels: {}
19231923
extraAnnotations: {}
19241924

19251925
# Backup related settings
1926-
# Compare to https://doc.opencloud.com/opencloud/next/maintenance/b-r/backup_considerations.html
1926+
# Compare to https://doc.opencloud.eu/opencloud/next/maintenance/b-r/backup_considerations.html
19271927
backup:
19281928
# @schema
19291929
# $ref: schema/templates.json#/labelsTemplate
@@ -3888,7 +3888,7 @@ services:
38883888
# @schema
38893889
# -- Image pull policy
38903890
# -- Configures the maximum file size in bytes that is allowed for content extraction.
3891-
# For the default value see https://doc.opencloud.com/opencloud/next/deployment/services/s-list/search.html
3891+
# For the default value see https://doc.opencloud.eu/opencloud/next/deployment/services/s-list/search.html
38923892
sizeLimit:
38933893
tika:
38943894
# @schema

0 commit comments

Comments
 (0)