sheppy/opendesk
1
0
Fork 0
mirror of https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git synced 2025-12-08 00:11:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(nextcloud): Bump openDesk bootstrap to 3.2.3 to support serverinfo token

Browse Source
This commit is contained in:
Dominik Kaminski
2023-11-20 09:10:32 +01:00
parent feed270fd7
commit ea14f953a4
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/monitoring.md
View File

@@ -65,6 +65,7 @@ grafana:
``` ```
## Components ## Components
| Component | Metrics (pod- or serviceMonitor) | Alerts (prometheusRule) | Dashboard (Grafana) | | Component | Metrics (pod- or serviceMonitor) | Alerts (prometheusRule) | Dashboard (Grafana) |
|:------------|-----------------------------------|-------------------------|---------------------| |:----------|-----------------------------------|-------------------------|---------------------|
| Collabora | :white_check_mark: | :white_check_mark: | :white_check_mark: | | Collabora | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| Nextcloud | :white_check_mark: | :x: | :x: |

2
helmfile/apps/nextcloud/helmfile.yaml
View File

@@ -28,7 +28,7 @@ repositories:
releases: releases:
- name: "opendesk-nextcloud-bootstrap" - name: "opendesk-nextcloud-bootstrap"
chart: "opendesk-nextcloud-bootstrap-repo/opendesk-nextcloud-bootstrap" chart: "opendesk-nextcloud-bootstrap-repo/opendesk-nextcloud-bootstrap"
version: "3.2.2" version: "3.2.3"
wait: true wait: true
waitForJobs: true waitForJobs: true
values: values:

3
helmfile/apps/nextcloud/values-bootstrap.gotmpl
View File

@@ -39,6 +39,9 @@ config:
host: {{ .Values.ldap.host | quote }} host: {{ .Values.ldap.host | quote }}
password: {{ .Values.secrets.univentionCorporateServer.ldapSearch.nextcloud | quote }} password: {{ .Values.secrets.univentionCorporateServer.ldapSearch.nextcloud | quote }}
serverinfo:
token: {{ .Values.secrets.nextcloud.metricsToken | quote }}
smtp: smtp:
host: {{ .Values.smtp.host | quote }} host: {{ .Values.smtp.host | quote }}
username: {{ .Values.smtp.username | quote }} username: {{ .Values.smtp.username | quote }}

3
helmfile/apps/nextcloud/values-nextcloud.gotmpl
View File

@@ -36,11 +36,12 @@ image:
metrics: metrics:
enabled: {{ .Values.prometheus.serviceMonitors.enabled }} enabled: {{ .Values.prometheus.serviceMonitors.enabled }}
https: true
token: {{ .Values.secrets.nextcloud.metricsToken | quote }} token: {{ .Values.secrets.nextcloud.metricsToken | quote }}
image: image:
repository: "{{ .Values.global.imageRegistry }}/{{ .Values.images.nextcloudExporter.repository }}" repository: "{{ .Values.global.imageRegistry }}/{{ .Values.images.nextcloudExporter.repository }}"
pullPolicy: "{{ .Values.global.imagePullPolicy }}" pullPolicy: "{{ .Values.global.imagePullPolicy }}"
tag: "{{ .Values.images.nextcloudExporter.tag }}" tag: {{ .Values.images.nextcloudExporter.tag | quote }}
pullSecrets: pullSecrets:
{{- toYaml .Values.global.imagePullSecrets | nindent 4 }} {{- toYaml .Values.global.imagePullSecrets | nindent 4 }}

4
helmfile/environments/default/images.yaml
View File

@@ -122,8 +122,8 @@ images:
# @supplier: "Nextcloud Community" # @supplier: "Nextcloud Community"
nextcloudExporter: nextcloudExporter:
repository: "xperimental/nextcloud-exporter" repository: "xperimental/nextcloud-exporter"
tag: "0.6.1@sha256:2a01f270ac3a887365a9de02e9d81e47364278c9bbd2a0aef13417eaf7181a5c" tag: "0.6.2@sha256:4ef2555e74ad1dd1b7b7b0680ce85f2b9333f2c2301756582ff04ae97adf796f"
# @supplier: "?" # @supplier: "openDesk DevSecOps"
openproject: openproject:
repository: "openproject/open_desk" repository: "openproject/open_desk"
tag: "dev@sha256:732b5d0efe9fc64fe411c9d8143ec3f4a3c731d03c0caddb5fa4c614ff426e8d" tag: "dev@sha256:732b5d0efe9fc64fe411c9d8143ec3f4a3c731d03c0caddb5fa4c614ff426e8d"