From 7ab1cb5c7e7bca85394eae2ed17141e513dd5a42 Mon Sep 17 00:00:00 2001 From: Johannes Bornhold Date: Thu, 14 Sep 2023 08:55:54 +0200 Subject: [PATCH] fix(univention-management-stack): Prepare persistence configuration --- .../values-ldap-server.gotmpl | 10 ++++++++++ .../values-portal-listener.gotmpl | 5 +++++ .../values-store-dav.gotmpl | 5 +++++ helmfile/environments/default/persistence.yaml | 5 +++++ 4 files changed, 25 insertions(+) diff --git a/helmfile/apps/univention-management-stack/values-ldap-server.gotmpl b/helmfile/apps/univention-management-stack/values-ldap-server.gotmpl index a7985caf..9b86f2dd 100644 --- a/helmfile/apps/univention-management-stack/values-ldap-server.gotmpl +++ b/helmfile/apps/univention-management-stack/values-ldap-server.gotmpl @@ -29,6 +29,16 @@ image: - name: {{ . }} {{- end }} +# TODO: Pending upstream support, #199 +persistence: + data: + storageClassName: "{{ .Values.persistence.storageClassNames.RWO }}" + size: "{{ .Values.persistence.size.univentionManagementStack.ldapServerData }}" + shared: + storageClassName: "{{ .Values.persistence.storageClassNames.RWO }}" + size: "{{ .Values.persistence.size.univentionManagementStack.ldapServerShared }}" + + resources: {{ .Values.resources.umsLdapServer | toYaml | nindent 2 }} ... diff --git a/helmfile/apps/univention-management-stack/values-portal-listener.gotmpl b/helmfile/apps/univention-management-stack/values-portal-listener.gotmpl index eba91b63..decbf998 100644 --- a/helmfile/apps/univention-management-stack/values-portal-listener.gotmpl +++ b/helmfile/apps/univention-management-stack/values-portal-listener.gotmpl @@ -40,6 +40,11 @@ image: imagePullPolicy: "Always" tag: "{{ .Values.images.umsWaitForDependency.tag }}" +# TODO: Pending upstream support, #200 +persistence: + storageClassName: "{{ .Values.persistence.storageClassNames.RWO }}" + size: "{{ .Values.persistence.size.univentionManagementStack.portalListener }}" + resources: {{ .Values.resources.umsPortalListener | toYaml | nindent 2 }} diff --git a/helmfile/apps/univention-management-stack/values-store-dav.gotmpl b/helmfile/apps/univention-management-stack/values-store-dav.gotmpl index 4b791d47..91d7c240 100644 --- a/helmfile/apps/univention-management-stack/values-store-dav.gotmpl +++ b/helmfile/apps/univention-management-stack/values-store-dav.gotmpl @@ -29,6 +29,11 @@ image: - name: {{ . }} {{- end }} +# TODO: Pending upstream support, #201 +persistence: + storageClassName: "{{ .Values.persistence.storageClassNames.RWO }}" + size: "{{ .Values.persistence.size.univentionManagementStack.storeDav }}" + resources: {{ .Values.resources.umsStoreDav | toYaml | nindent 2 }} ... diff --git a/helmfile/environments/default/persistence.yaml b/helmfile/environments/default/persistence.yaml index a04e5794..300ecfc7 100644 --- a/helmfile/environments/default/persistence.yaml +++ b/helmfile/environments/default/persistence.yaml @@ -19,5 +19,10 @@ persistence: redis: "1Gi" synapse: "1Gi" univentionCorporateServer: "1Gi" + univentionManagementStack: + ldapServerData: "1Gi" + ldapServerShared: "1Gi" + portalListener: "1Gi" + storeDav: "1Gi" xwiki: "1Gi" ...