diff --git a/docs/requirements.md b/docs/requirements.md index 31c26951..836688a8 100644 --- a/docs/requirements.md +++ b/docs/requirements.md @@ -24,7 +24,8 @@ openDesk is a Kubernetes-only solution and requires an existing Kubernetes (K8s) - K8s cluster >= 1.24, [CNCF Certified Kubernetes distribution](https://www.cncf.io/certification/software-conformance/) - Domain and DNS Service -- Ingress controller (Ingress NGINX) +- Ingress controller (Ingress NGINX) == [4.11.x/1.11.x](https://github.com/kubernetes/ingress-nginx/releases) - tested with 1.11.1 up to 1.11.4 + - **Note**: We are working on support for more recent versions, as issues have been reported with 1.12.x. - [Helm](https://helm.sh/) >= v3.9.0 - [Helmfile](https://helmfile.readthedocs.io/en/latest/) >= **v1.0.0-rc8** - [HelmDiff](https://github.com/databus23/helm-diff) >= 3.6.0 diff --git a/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl index 5bc7bcda..024190b7 100644 --- a/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl +++ b/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl @@ -102,6 +102,9 @@ aio: {{ .Values.seLinuxOptions.nextcloud | toYaml | nindent 6 }} cron: successfulJobsHistoryLimit: {{ if .Values.debug.enabled }}"3"{{ else }}"0"{{ end }} + resources: + {{ .Values.resources.nextcloudCron | toYaml | nindent 6 }} + debug: loglevel: {{ if .Values.debug.enabled }}"0"{{ else }}"2"{{ end }} {{- if .Values.certificate.selfSigned }} diff --git a/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl b/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl index 7572d41d..eadcc93d 100644 --- a/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl +++ b/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl @@ -13,7 +13,7 @@ images: nextcloud: registry: "registry.opencode.de" repository: "zendis/opendesk-enterprise/components/supplier/nextcloud/images/opendesk-nextcloud" - tag: "1.1.0@sha256:313bcb18590bca7c2792d2fa3a74dbb7d2ac2ac923374c021ff64138d2c2a2cb" + tag: "1.1.2@sha256:64f08ff9c9481e67b41bdcc70aeb278b6beba061ba1c989ba96cc471ff46dd9c" openxchangeCoreMW: registry: "registry.opencode.de" repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/core-mw" diff --git a/helmfile/environments/default/charts.yaml.gotmpl b/helmfile/environments/default/charts.yaml.gotmpl index b89eea61..b148acfb 100644 --- a/helmfile/environments/default/charts.yaml.gotmpl +++ b/helmfile/environments/default/charts.yaml.gotmpl @@ -251,7 +251,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud" name: "opendesk-nextcloud" - version: "3.9.0" + version: "3.9.2" verify: true nextcloudManagement: # providerCategory: "Platform" @@ -261,7 +261,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud" name: "opendesk-nextcloud-management" - version: "3.9.0" + version: "3.9.2" verify: true nginx: # providerCategory: "Community" diff --git a/helmfile/environments/default/images.yaml.gotmpl b/helmfile/environments/default/images.yaml.gotmpl index cc55ff57..89ef4ad4 100644 --- a/helmfile/environments/default/images.yaml.gotmpl +++ b/helmfile/environments/default/images.yaml.gotmpl @@ -318,7 +318,7 @@ images: # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud" registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud" - tag: "2.4.4@sha256:4f98f002ee2001ef090575550bbd03d2530481e7f4c7ceba0fa5c1ee047e39f6" + tag: "2.4.6@sha256:ebd5777c1244199df42f23b5a9df5339d86d353b95c68e7505f142c9c247eb73" nextcloudExporter: # providerCategory: "Platform" # providerResponsible: "openDesk" diff --git a/helmfile/environments/default/resources.yaml.gotmpl b/helmfile/environments/default/resources.yaml.gotmpl index 84984cb3..46362504 100644 --- a/helmfile/environments/default/resources.yaml.gotmpl +++ b/helmfile/environments/default/resources.yaml.gotmpl @@ -262,6 +262,13 @@ resources: requests: cpu: 0.1 memory: "512Mi" + nextcloudCron: + limits: + cpu: 99 + memory: "1Gi" + requests: + cpu: 0.1 + memory: "512Mi" nextcloudExporter: limits: cpu: 99