mirror of
https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git
synced 2025-12-06 07:21:36 +01:00
feat(notes): Update from 3.2.1 to 3.4.0
This commit is contained in:
committed by
Thorsten Roßner
parent
69f20057cd
commit
c63665040c
@@ -11,6 +11,13 @@ repositories:
|
||||
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
|
||||
oci: true
|
||||
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.notes.registry }}/{{ .Values.charts.notes.repository }}"
|
||||
- name: "notes-customization-repo"
|
||||
keyring: "../../files/gpg-pubkeys/opencode.gpg"
|
||||
verify: {{ .Values.charts.notesCustomization.verify }}
|
||||
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
|
||||
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
|
||||
oci: true
|
||||
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.notesCustomization.registry }}/{{ .Values.charts.notesCustomization.repository }}"
|
||||
|
||||
releases:
|
||||
- name: "impress"
|
||||
@@ -24,6 +31,17 @@ releases:
|
||||
{{- end }}
|
||||
installed: {{ .Values.apps.notes.enabled }}
|
||||
timeout: 1800
|
||||
- name: "impress-customization"
|
||||
chart: "notes-customization-repo/{{ .Values.charts.notesCustomization.name }}"
|
||||
version: "{{ .Values.charts.notesCustomization.version }}"
|
||||
wait: true
|
||||
values:
|
||||
- "values-customization.yaml.gotmpl"
|
||||
{{- range .Values.customization.release.notesCustomization }}
|
||||
- {{ . }}
|
||||
{{- end }}
|
||||
installed: {{ .Values.apps.notes.enabled }}
|
||||
timeout: 1800
|
||||
|
||||
commonLabels:
|
||||
deploy-stage: "component-1"
|
||||
|
||||
8
helmfile/apps/notes/values-customization.yaml.gotmpl
Normal file
8
helmfile/apps/notes/values-customization.yaml.gotmpl
Normal file
@@ -0,0 +1,8 @@
|
||||
# SPDX-FileCopyrightText: 2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
---
|
||||
frontend:
|
||||
runtimeEnvs:
|
||||
ICS_BASE_URL: {{ printf "https://%s.%s" .Values.global.hosts.intercomService .Values.global.domain | quote }}
|
||||
PORTAL_BASE_URL: {{ printf "https://%s.%s" .Values.global.hosts.nubus .Values.global.domain | quote }}
|
||||
...
|
||||
@@ -27,7 +27,7 @@ backend:
|
||||
{{- end }}
|
||||
ingressClassName: {{ .Values.ingress.ingressClassName }}
|
||||
ingressAdmin:
|
||||
enabled: true
|
||||
enabled: false
|
||||
annotations:
|
||||
{{ .Values.annotations.notesBackend.ingressAdmin | toYaml | nindent 6 }}
|
||||
ingressClassName: {{ .Values.ingress.ingressClassName }}
|
||||
@@ -131,19 +131,27 @@ backend:
|
||||
service:
|
||||
annotations:
|
||||
{{ .Values.annotations.notesBackend.service | toYaml | nindent 6 }}
|
||||
{{- if .Values.certificate.selfSigned }}
|
||||
extraVolumes:
|
||||
- name: "customization-volume"
|
||||
configMap:
|
||||
name: "impress-customization"
|
||||
{{- if .Values.certificate.selfSigned }}
|
||||
- name: "trusted-cert-secret-volume"
|
||||
secret:
|
||||
secretName: "opendesk-certificates-ca-tls"
|
||||
items:
|
||||
- key: "ca.crt"
|
||||
path: "ca-certificates.crt"
|
||||
{{- end }}
|
||||
extraVolumeMounts:
|
||||
- name: "customization-volume"
|
||||
mountPath: "/app/impress/configuration/theme/default.json"
|
||||
subPath: "theme.json"
|
||||
{{- if .Values.certificate.selfSigned }}
|
||||
- name: "trusted-cert-secret-volume"
|
||||
mountPath: "/usr/local/lib/python3.12/site-packages/certifi/cacert.pem"
|
||||
subPath: "ca-certificates.crt"
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
frontend:
|
||||
image:
|
||||
@@ -161,11 +169,6 @@ frontend:
|
||||
annotations:
|
||||
{{ .Values.annotations.notesFrontend.ingressMedia | toYaml | nindent 6 }}
|
||||
ingressClassName: {{ .Values.ingress.ingressClassName }}
|
||||
extraEnvVars:
|
||||
- name: "ICS_BASE_URL"
|
||||
value: {{ printf "https://%s.%s" .Values.global.hosts.intercomService .Values.global.domain | quote }}
|
||||
- name: "PORTAL_BASE_URL"
|
||||
value: {{ printf "https://%s.%s" .Values.global.hosts.nubus .Values.global.domain | quote }}
|
||||
configuration:
|
||||
objectStoreHost: {{ printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain | quote }}
|
||||
resources:
|
||||
@@ -197,6 +200,14 @@ frontend:
|
||||
serviceMedia:
|
||||
annotations:
|
||||
{{ .Values.annotations.notesFrontend.service | toYaml | nindent 6 }}
|
||||
extraVolumes:
|
||||
- name: "customization-volume"
|
||||
configMap:
|
||||
name: "impress-customization"
|
||||
extraVolumeMounts:
|
||||
- name: "customization-volume"
|
||||
mountPath: "/usr/share/nginx/html/runtime-env.js"
|
||||
subPath: "runtime-env.js"
|
||||
|
||||
y-provider:
|
||||
image:
|
||||
|
||||
Reference in New Issue
Block a user