Compare commits

...

2 Commits

Author SHA1 Message Date
Thorsten Roßner
82fd2da2b1 chore(helmfile): Streamline upstreamRepository entries in charts.yaml.gotmpl 2025-09-03 14:05:37 +02:00
Thomas Kaltenbrunner
6eb920ac5d fix(notes): Reenable opendesk menu 2025-09-02 21:52:39 +02:00
5 changed files with 50 additions and 10 deletions

View File

@@ -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"

View 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 }}
...

View File

@@ -161,11 +161,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 +192,14 @@ frontend:
serviceMedia:
annotations:
{{ .Values.annotations.notesFrontend.service | toYaml | nindent 6 }}
extraVolumes:
- name: "runtime-env-volume"
configMap:
name: "impress-customization"
extraVolumeMounts:
- name: "runtime-env-volume"
mountPath: "/usr/share/nginx/html/runtime-env.js"
subPath: "runtime-env.js"
y-provider:
image:

View File

@@ -255,7 +255,7 @@ charts:
# providerCategory: "Platform"
# providerResponsible: "openDesk"
# upstreamRegistry: "https://registry.opencode.de"
# packageName=bmi/opendesk/components/platform-development/charts/opendesk-nextcloud/opendesk-nextcloud-management
# upstreamRepository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud/opendesk-nextcloud-management"
registry: "registry.opencode.de"
repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
name: "opendesk-nextcloud-management"
@@ -265,7 +265,7 @@ charts:
# providerCategory: "Platform"
# providerResponsible: "openDesk"
# upstreamRegistry: "https://registry.opencode.de"
# packageName=bmi/opendesk/components/platform-development/charts/opendesk-nextcloud/opendesk-nextcloud-notifypush
# upstreamRepository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud/opendesk-nextcloud-notifypush"
registry: "registry.opencode.de"
repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
name: "opendesk-nextcloud-notifypush"
@@ -285,7 +285,7 @@ charts:
# providerCategory: "Platform"
# providerResponsible: "openDesk"
# upstreamRegistry: "https://registry.opencode.de"
# packageName=bmi/opendesk/components/platform-development/charts/nginx-s3-gateway/nginx-s3-gateway
# upstreamRepository: "bmi/opendesk/components/platform-development/charts/nginx-s3-gateway/nginx-s3-gateway"
registry: "registry.opencode.de"
repository: "bmi/opendesk/components/platform-development/charts/nginx-s3-gateway"
name: "nginx-s3-gateway"
@@ -295,11 +295,21 @@ charts:
# providerCategory: "Platform"
# providerResponsible: "openDesk"
# upstreamRegistry: "https://registry.opencode.de"
# packageName=bmi/opendesk/components/platform-development/charts/opendesk-impress
# upstreamRepository: "bmi/opendesk/components/platform-development/charts/opendesk-impress/impress"
registry: "registry.opencode.de"
repository: "bmi/opendesk/components/platform-development/charts/opendesk-impress"
name: "impress"
version: "1.0.1"
version: "1.0.2"
verify: true
notesCustomization:
# providerCategory: "Platform"
# providerResponsible: "openDesk"
# upstreamRegistry: "https://registry.opencode.de"
# upstreamRepository: "bmi/opendesk/components/platform-development/charts/opendesk-impress-customization/impress-customization"
registry: "registry.opencode.de"
repository: "bmi/opendesk/components/platform-development/charts/opendesk-impress-customization"
name: "impress-customization"
version: "1.0.0"
verify: true
nubus:
# providerCategory: "Supplier"

View File

@@ -51,6 +51,7 @@ customization:
opendeskNextcloudNotifyPush: {}
# notes
notes: {}
notesCustomization: {}
# nubus
ums: {}
intercomService: {}