From 91e34aabaae8e72b0edb6afe466d4de028dc6a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= Date: Tue, 24 Sep 2024 18:05:31 +0200 Subject: [PATCH] fix(openproject): Update Helm chart to v8.0.0 and explicitly template resources. --- .gitlab-ci.yml | 2 +- docs/migrations.md | 15 ++++++++++ .../openproject-bootstrap/values.yaml.gotmpl | 2 ++ .../openproject/helmfile-child.yaml.gotmpl | 2 +- helmfile/apps/openproject/values.yaml.gotmpl | 27 +++++++++++++----- helmfile/environments/default/charts.yaml | 2 +- helmfile/environments/default/images.yaml | 2 +- helmfile/environments/default/resources.yaml | 28 +++++++++++++++++++ helmfile/environments/default/selinux.yaml | 2 +- 9 files changed, 70 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2492a05d..28c95a63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -159,7 +159,7 @@ variables: - "no" RUN_TESTS: description: "Triggers execution of E2E-tests." - value: "yes" + value: "no" options: - "yes" - "no" diff --git a/docs/migrations.md b/docs/migrations.md index 28874034..19b8c796 100644 --- a/docs/migrations.md +++ b/docs/migrations.md @@ -135,6 +135,21 @@ global: xwiki: "wiki" ``` +In case you would like to use the updated hostnames you at least have to apply some manual changes. But do this at +your own risk. Be also aware that some of your user's bookmarks and links will stop working. + +- Update the affected portal tiles: + - All tiles in the "Files" category. + - The "Projects" tile in the "Management" category. +- There are two options to change the link for the portal tiles: + - Use an admin account to access the portal's edit mode (on the bottom of the sidebar portal's menu). + - Utilize the UDM REST API to update the portal tile objects. +- Update the hostnames for the OpenProject-Nextcloud integration using a functional admin user for both components: + - In OpenProject: *Administration* > *Files* > *External file storages* > Select `Nextcloud at [your_domain]` + Edit *Details* - *General Information* - *Storage provider* and update the *hostname* to `files.`. + - In Nextcloud: *Administration* > *OpenProject* > *OpenProject server* update the *OpenProject host* to + to `projects.`. + #### Updated `global.imagePullSecrets` Without using a custom registry, you can pull all the openDesk images without authentication. diff --git a/helmfile/apps/openproject-bootstrap/values.yaml.gotmpl b/helmfile/apps/openproject-bootstrap/values.yaml.gotmpl index ce67a269..ef7fb857 100644 --- a/helmfile/apps/openproject-bootstrap/values.yaml.gotmpl +++ b/helmfile/apps/openproject-bootstrap/values.yaml.gotmpl @@ -16,6 +16,8 @@ cleanup: keepPVCOnDelete: {{ .Values.debug.cleanup.keepPVCOnDelete }} config: + debug: + enabled: {{ .Values.debug.enabled }} openproject: fileshareName: "Nextcloud at {{ .Values.global.domain }}" admin: diff --git a/helmfile/apps/openproject/helmfile-child.yaml.gotmpl b/helmfile/apps/openproject/helmfile-child.yaml.gotmpl index ec9a5e5c..27313f19 100644 --- a/helmfile/apps/openproject/helmfile-child.yaml.gotmpl +++ b/helmfile/apps/openproject/helmfile-child.yaml.gotmpl @@ -21,7 +21,7 @@ releases: values: - "values.yaml.gotmpl" installed: {{ .Values.openproject.enabled }} - timeout: 900 + timeout: 1500 commonLabels: deploy-stage: "component-1" diff --git a/helmfile/apps/openproject/values.yaml.gotmpl b/helmfile/apps/openproject/values.yaml.gotmpl index 7db87f1d..a0f27449 100644 --- a/helmfile/apps/openproject/values.yaml.gotmpl +++ b/helmfile/apps/openproject/values.yaml.gotmpl @@ -8,6 +8,10 @@ global: imagePullSecrets: {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }} +appInit: + resources: + {{ .Values.resources.openprojectAppInit | toYaml | nindent 4 }} + containerSecurityContext: enabled: true privileged: false @@ -24,6 +28,15 @@ containerSecurityContext: seLinuxOptions: {{ .Values.seLinuxOptions.openproject | toYaml | nindent 4 }} +dbInit: + image: + registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.openprojectDbInit.registry | quote }} + repository: {{ .Values.images.openprojectDbInit.repository | quote }} + tag: {{ .Values.images.openprojectDbInit.tag | quote }} + imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }} + resources: + {{ .Values.resources.openprojectDbInit | toYaml | nindent 4 }} + environment: # For more details and more options see # https://www.openproject.org/docs/installation-and-operations/configuration/environment/ @@ -81,13 +94,6 @@ image: imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }} tag: {{ .Values.images.openproject.tag | quote }} -initdb: - image: - registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.openprojectInitDb.registry | quote }} - repository: {{ .Values.images.openprojectInitDb.repository | quote }} - tag: {{ .Values.images.openprojectInitDb.tag | quote }} - imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }} - memcached: bundled: false connection: @@ -182,5 +188,12 @@ s3: seederJob: annotations: intents.otterize.com/service-name: "openproject-seeder" + resources: + {{ .Values.resources.openprojectSeederJob | toYaml | nindent 4 }} + +workers: + default: + resources: + {{ .Values.resources.openprojectWorkers | toYaml | nindent 6 }} ... diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml index ebd5bd30..8a0fcf43 100644 --- a/helmfile/environments/default/charts.yaml +++ b/helmfile/environments/default/charts.yaml @@ -236,7 +236,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/openproject/charts-mirror" name: "openproject" - version: "7.0.0" + version: "8.0.0" verify: true openprojectBootstrap: # providerCategory: "Platform" diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml index eeb3a95f..93cd52be 100644 --- a/helmfile/environments/default/images.yaml +++ b/helmfile/environments/default/images.yaml @@ -576,7 +576,7 @@ images: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/images/opendesk-openproject-bootstrap" tag: "1.1.4@sha256:2fd97a316114428849aaeef87fb8755274e675830088a93afcafac91bb048d1d" - openprojectInitDb: + openprojectDbInit: # providerCategory: "Community" # providerResponsible: "OpenProject" # upstreamRegistry: "https://registry-1.docker.io" diff --git a/helmfile/environments/default/resources.yaml b/helmfile/environments/default/resources.yaml index db65bf52..fd0ba445 100644 --- a/helmfile/environments/default/resources.yaml +++ b/helmfile/environments/default/resources.yaml @@ -275,6 +275,34 @@ resources: requests: cpu: 0.1 memory: "768Mi" + openprojectDbInit: + limits: + cpu: 99 + memory: "768Mi" + requests: + cpu: 0.1 + memory: "256Mi" + openprojectAppInit: + limits: + cpu: 99 + memory: "768Mi" + requests: + cpu: 0.1 + memory: "256Mi" + openprojectSeederJob: + limits: + cpu: 99 + memory: "768Mi" + requests: + cpu: 0.1 + memory: "256Mi" + openprojectWorkers: + limits: + cpu: 99 + memory: "4Gi" + requests: + cpu: 0.25 + memory: "512Mi" openxchangeCoreDocumentConverter: limits: cpu: 99 diff --git a/helmfile/environments/default/selinux.yaml b/helmfile/environments/default/selinux.yaml index fbe3c190..cf646226 100644 --- a/helmfile/environments/default/selinux.yaml +++ b/helmfile/environments/default/selinux.yaml @@ -41,7 +41,7 @@ seLinuxOptions: opendeskKeycloakBootstrap: ~ openproject: ~ openprojectBootstrap: ~ - openprojectInitDb: ~ + openprojectDbInit: ~ openxchangeBootstrap: ~ openxchangeCoreGuidedtours: ~ openxchangeCoreMW: ~