mirror of
https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git
synced 2025-12-06 15:31:38 +01:00
Compare commits
2 Commits
dkaminski/
...
uv-jlohmer
| Author | SHA1 | Date | |
|---|---|---|---|
|
f8b25c9b4e | ||
|
|
56c6d23331 |
@@ -165,14 +165,18 @@ nubusKeycloakExtensions:
|
||||
newDeviceLoginSubject: "New device login on your {{ .Values.theme.texts.productName }} account"
|
||||
mailFrom: "{{ .Values.smtp.localpartNoReply }}@{{ if .Values.functional.email.systemGenerated.useComponentInSenderdomain }}{{ .Values.global.hosts.keycloak }}.{{ end }}{{ .Values.global.domain }}"
|
||||
|
||||
nubusPortalListener:
|
||||
portalListener:
|
||||
nubusPortalConsumer:
|
||||
portalConsumer:
|
||||
logLevel: {{ if .Values.debug.enabled }}"DEBUG"{{ else }}"INFO"{{ end }}
|
||||
objectStorageEndpoint: {{ .Values.objectstores.nubus.endpoint | default (printf "https://%s.%s" .Values.global.hosts.minioApi .Values.global.domain) | quote }}
|
||||
objectStorageBucket: {{ .Values.objectstores.nubus.bucket | quote }}
|
||||
objectStorageCredentialSecret:
|
||||
name: "ums-portal-listener-minio-opendesk-credentials"
|
||||
name: "ums-portal-consumer-minio-opendesk-credentials"
|
||||
accessKeyKey: "access-key-id"
|
||||
secretKeyKey: "secret-key-id"
|
||||
provisioningApi:
|
||||
auth:
|
||||
username: "portal-consumer"
|
||||
|
||||
nubusPortalServer:
|
||||
portalServer:
|
||||
@@ -186,15 +190,12 @@ nubusPortalServer:
|
||||
enabled: true
|
||||
authenticatorSecretName: "ums-opendesk-portal-server-central-navigation"
|
||||
|
||||
# NOTE: disabled until the next update.
|
||||
nubusProvisioning:
|
||||
enabled: false
|
||||
enabled: true
|
||||
nubusUdmListener:
|
||||
enabled: false
|
||||
nubusSelfServiceListener:
|
||||
enabled: true
|
||||
selfserviceListener:
|
||||
umcAdminUser: "default.admin"
|
||||
|
||||
# Nubus services
|
||||
nubusStackDataUms:
|
||||
@@ -314,7 +315,7 @@ extraSecrets:
|
||||
stringData:
|
||||
access-key-id: {{ .Values.objectstores.nubus.username | quote }}
|
||||
secret-key-id: {{ .Values.objectstores.nubus.secretKey | default .Values.secrets.minio.umsUser | quote }}
|
||||
- name: "ums-portal-listener-minio-opendesk-credentials"
|
||||
- name: "ums-portal-consumer-minio-opendesk-credentials"
|
||||
stringData:
|
||||
access-key-id: {{ .Values.objectstores.nubus.username | quote }}
|
||||
secret-key-id: {{ .Values.objectstores.nubus.secretKey | default .Values.secrets.minio.umsUser | quote }}
|
||||
|
||||
@@ -81,15 +81,17 @@ nubusKeycloakExtensions:
|
||||
resources:
|
||||
{{ .Values.resources.umsKeycloakExtensionProxy | toYaml | nindent 6 }}
|
||||
|
||||
nubusPortalListener:
|
||||
nubusPortalConsumer:
|
||||
podAnnotations:
|
||||
intents.otterize.com/service-name: "ums-portal-listener"
|
||||
replicaCount: {{ .Values.replicas.umsPortalListener }}
|
||||
intents.otterize.com/service-name: "ums-portal-consumer"
|
||||
replicaCount: {{ .Values.replicas.umsPortalConsumer }}
|
||||
resources:
|
||||
{{ .Values.resources.umsPortalListener | toYaml | nindent 4 }}
|
||||
{{ .Values.resources.umsPortalConsumer | toYaml | nindent 4 }}
|
||||
resourcesWaitForDependency:
|
||||
{{ .Values.resources.umsPortalConsumerDependencies | toYaml | nindent 4 }}
|
||||
persistence:
|
||||
storageClass: {{ .Values.persistence.storageClassNames.RWO | quote }}
|
||||
size: {{ .Values.persistence.size.nubus.portalListener | quote }}
|
||||
size: {{ .Values.persistence.size.nubus.portalConsumer | quote }}
|
||||
|
||||
nubusPortalServer:
|
||||
additionalAnnotations:
|
||||
|
||||
@@ -49,15 +49,6 @@ nubusLdapServer:
|
||||
repository: {{ .Values.images.nubusWaitForDependency.repository }}
|
||||
tag: {{ .Values.images.nubusWaitForDependency.tag }}
|
||||
|
||||
|
||||
nubusPortalConsumer:
|
||||
portalConsumer:
|
||||
image:
|
||||
registry: {{ .Values.images.nubusPortalConsumer.registry }}
|
||||
repository: {{ .Values.images.nubusPortalConsumer.repository }}
|
||||
tag: {{ .Values.images.nubusPortalConsumer.tag }}
|
||||
|
||||
|
||||
nubusNotificationsApi:
|
||||
image:
|
||||
registry: {{ .Values.images.nubusNotificationsApi.registry }}
|
||||
@@ -70,11 +61,12 @@ nubusPortalFrontend:
|
||||
repository: {{ .Values.images.nubusPortalFrontend.repository }}
|
||||
tag: {{ .Values.images.nubusPortalFrontend.tag }}
|
||||
|
||||
nubusPortalListener:
|
||||
nubusPortalConsumer:
|
||||
portalConsumer:
|
||||
image:
|
||||
registry: {{ .Values.images.nubusPortalListener.registry }}
|
||||
repository: {{ .Values.images.nubusPortalListener.repository }}
|
||||
tag: {{ .Values.images.nubusPortalListener.tag }}
|
||||
registry: {{ .Values.images.nubusPortalConsumer.registry }}
|
||||
repository: {{ .Values.images.nubusPortalConsumer.repository }}
|
||||
tag: {{ .Values.images.nubusPortalConsumer.tag }}
|
||||
waitForDependency:
|
||||
image:
|
||||
registry: {{ .Values.images.nubusWaitForDependency.registry }}
|
||||
@@ -154,6 +146,7 @@ nubusSelfServiceListener:
|
||||
registry: {{ .Values.images.nubusSelfserviceListener.registry }}
|
||||
repository: {{ .Values.images.nubusSelfserviceListener.repository }}
|
||||
tag: {{ .Values.images.nubusSelfserviceListener.tag }}
|
||||
|
||||
selfserviceInvitation:
|
||||
image:
|
||||
registry: {{ .Values.images.nubusSelfserviceInvitation.registry }}
|
||||
|
||||
@@ -249,10 +249,12 @@ charts:
|
||||
# upstreamRepository: "nubus/charts/nubus"
|
||||
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
||||
# upstreamMirrorStartFrom: ["0", "19", "3"]
|
||||
registry: "registry.opencode.de"
|
||||
repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
|
||||
# registry: "registry.opencode.de"
|
||||
# repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
|
||||
registry: "artifacts.software-univention.de"
|
||||
repository: "nubus-dev/charts"
|
||||
name: "nubus"
|
||||
version: "0.33.0"
|
||||
version: "0.34.0-pre-jlohmer-provisioning-consumer-integration"
|
||||
verify: true
|
||||
opendeskKeycloakBootstrap:
|
||||
# providerCategory: "Platform"
|
||||
|
||||
@@ -219,9 +219,11 @@ images:
|
||||
# providerResponsible: "openDesk"
|
||||
# upstreamRegistry: "https://registry-1.docker.io"
|
||||
# upstreamRepository: "bitnami/minio"
|
||||
registry: "registry-1.docker.io"
|
||||
# registry: "registry-1.docker.io"
|
||||
# repository: "bitnami/minio"
|
||||
registry: "docker.io"
|
||||
repository: "bitnami/minio"
|
||||
tag: "2023@sha256:bced4f2f9fc48b755ebb3e1b35e76195a978d4331bf2d0c6699dab412d3c0be7"
|
||||
tag: "2024.8.3-debian-12-r1"
|
||||
nextcloudApache2:
|
||||
# providerCategory: "Platform"
|
||||
# providerResponsible: "openDesk"
|
||||
@@ -403,9 +405,11 @@ images:
|
||||
# upstreamRepository: "nubus/images/notifications-api"
|
||||
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
||||
# upstreamMirrorStartFrom: ["0", "9", "4"]
|
||||
registry: "registry.opencode.de"
|
||||
repository: "bmi/opendesk/components/supplier/univention/images-mirror/notifications-api"
|
||||
tag: "0.27.0@sha256:d99173199f20c701b29b8a3c1a46465085a873b37f413882e7d2e106e258c35a"
|
||||
# registry: "registry.opencode.de"
|
||||
# repository: "bmi/opendesk/components/supplier/univention/images-mirror/notifications-api"
|
||||
registry: "artifacts.software-univention.de"
|
||||
repository: "nubus/images/notifications-api"
|
||||
tag: "0.31.1@sha256:cc51d3d7c25f2bef2bda4f3baad0c29dc428b798be78697d58739eb6a79636d2"
|
||||
nubusOpenPolicyAgent:
|
||||
# providerCategory: "Supplier"
|
||||
# providerResponsible: "Univention"
|
||||
@@ -453,9 +457,11 @@ images:
|
||||
# upstreamRepository: "nubus/images/portal-frontend"
|
||||
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
||||
# upstreamMirrorStartFrom: ["0", "9", "4"]
|
||||
registry: "registry.opencode.de"
|
||||
repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-frontend"
|
||||
tag: "0.29.0@sha256:3af3d5d24f690557b4a644d5720113dca0c802465b0e43466b49db27acd37939"
|
||||
# registry: "registry.opencode.de"
|
||||
# repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-frontend"
|
||||
registry: "artifacts.software-univention.de"
|
||||
repository: "nubus/images/portal-frontend"
|
||||
tag: "0.31.1@sha256:499266cb7c645775dd2d0c9f386498114ab0dcda67b014db0e86735d757b4187"
|
||||
nubusPortalListener:
|
||||
# providerCategory: "Supplier"
|
||||
# providerResponsible: "Univention"
|
||||
@@ -473,9 +479,11 @@ images:
|
||||
# upstreamRepository: "nubus/images/portal-server"
|
||||
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
||||
# upstreamMirrorStartFrom: ["0", "9", "4"]
|
||||
registry: "registry.opencode.de"
|
||||
repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-server"
|
||||
tag: "0.27.0@sha256:e1ad659feb4a1948d07e6e7d99b94b6bdbd4525d96f4cf9a010b75189f0082fc"
|
||||
# registry: "registry.opencode.de"
|
||||
# repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-server"
|
||||
registry: "artifacts.software-univention.de"
|
||||
repository: "nubus/images/portal-server"
|
||||
tag: "0.31.1@sha256:381e0cbbcac0e9bba6d3c1c7fe7757d18c09e7afaab912c02f38bdfa481723cd"
|
||||
nubusProvisioningDispatcher:
|
||||
# providerCategory: "Supplier"
|
||||
# providerResponsible: "Univention"
|
||||
@@ -493,9 +501,11 @@ images:
|
||||
# upstreamRepository: "nubus/images/provisioning-events-and-consumer-api"
|
||||
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
||||
# upstreamMirrorStartFrom: ["0", "14", "0"]
|
||||
registry: "registry.opencode.de"
|
||||
repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-events-and-consumer-api"
|
||||
tag: "0.28.3@sha256:5b0a2c52d715fde613ecfedb3a3f5e47b9eb73cdcf4c373a9cc58248a919f2bf"
|
||||
# registry: "registry.opencode.de"
|
||||
# repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-events-and-consumer-api"
|
||||
registry: "artifacts.software-univention.de"
|
||||
repository: "nubus/images/provisioning-events-and-consumer-api"
|
||||
tag: "0.34.0@sha256:7fc2ab2a89b46cd95c20f99e70636d62d45447ca2678fc78a620b4819521368f"
|
||||
nubusProvisioningPrefill:
|
||||
# providerCategory: "Supplier"
|
||||
# providerResponsible: "Univention"
|
||||
@@ -503,9 +513,11 @@ images:
|
||||
# upstreamRepository: "nubus/images/provisioning-prefill"
|
||||
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
||||
# upstreamMirrorStartFrom: ["0", "14", "0"]
|
||||
registry: "registry.opencode.de"
|
||||
repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-prefill"
|
||||
tag: "0.28.3@sha256:a98bce46144a6ff943b0432b66277393b7b476b8969b221b9069c708d3380f5d"
|
||||
# registry: "registry.opencode.de"
|
||||
# repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-prefill"
|
||||
registry: "artifacts.software-univention.de"
|
||||
repository: "nubus/images/provisioning-prefill"
|
||||
tag: "0.34.0@sha256:baab4e6e8393110ac7d159159dad9ecca74359ce74144dd51b4aec2a383778eb"
|
||||
nubusProvisioningUdmListener:
|
||||
# providerCategory: "Supplier"
|
||||
# providerResponsible: "Univention"
|
||||
@@ -513,9 +525,11 @@ images:
|
||||
# upstreamRepository: "nubus/images/provisioning-udm-listener"
|
||||
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
||||
# upstreamMirrorStartFrom: ["0", "14", "0"]
|
||||
registry: "registry.opencode.de"
|
||||
repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-listener"
|
||||
tag: "0.28.3@sha256:b9c452e55e6716f93309bef0af7d401e218cd1e6ea9ad3d2819fb10dd631aecd"
|
||||
# registry: "registry.opencode.de"
|
||||
# repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-listener"
|
||||
registry: "artifacts.software-univention.de"
|
||||
repository: "nubus/images/provisioning-udm-listener"
|
||||
tag: "0.34.0@sha256:5f1177f58a189de935b73e905b9dff69b34f508a570244c75d5358cdb1bc2b27"
|
||||
nubusProvisioningUdmTransformer:
|
||||
# providerCategory: "Supplier"
|
||||
# providerResponsible: "Univention"
|
||||
@@ -523,9 +537,11 @@ images:
|
||||
# upstreamRepository: "nubus/images/provisioning-udm-transformer"
|
||||
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
||||
# upstreamMirrorStartFrom: ["0", "14", "0"]
|
||||
registry: "registry.opencode.de"
|
||||
repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-transformer"
|
||||
tag: "0.29.0@sha256:68e27eb9560d2729e9065da3573f28073c5e53fedabac4d19562c4b8c6c1d1f3"
|
||||
# registry: "registry.opencode.de"
|
||||
# repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-transformer"
|
||||
registry: "artifacts.software-univention.de"
|
||||
repository: "nubus/images/provisioning-udm-transformer"
|
||||
tag: "0.34.0@sha256:416ea5082d55346f58de535e39943552162a555455ae75f2efaad424e4fc8f70"
|
||||
nubusSelfserviceInvitation:
|
||||
# providerCategory: "Supplier"
|
||||
# providerResponsible: "Univention"
|
||||
|
||||
@@ -19,7 +19,7 @@ persistence:
|
||||
nubus:
|
||||
ldapServerData: "1Gi"
|
||||
ldapServerShared: "1Gi"
|
||||
portalListener: "1Gi"
|
||||
portalConsumer: "1Gi"
|
||||
selfserviceListener: "1Gi"
|
||||
xwiki: "1Gi"
|
||||
...
|
||||
|
||||
@@ -50,7 +50,7 @@ replicas:
|
||||
umsLdapServer: 1
|
||||
umsNotificationsApi: 1
|
||||
umsPortalFrontend: 1
|
||||
umsPortalListener: 1
|
||||
umsPortalConsumer: 1
|
||||
umsPortalServer: 1
|
||||
umsSelfserviceListener: 1
|
||||
umsStackGateway: 1
|
||||
|
||||
@@ -464,14 +464,14 @@ resources:
|
||||
requests:
|
||||
cpu: 0.1
|
||||
memory: "256Mi"
|
||||
umsPortalListener:
|
||||
umsPortalConsumer:
|
||||
limits:
|
||||
cpu: 99
|
||||
memory: "1Gi"
|
||||
requests:
|
||||
cpu: 0.1
|
||||
memory: "256Mi"
|
||||
umsPortalListenerDependencies:
|
||||
umsPortalConsumerDependencies:
|
||||
limits:
|
||||
cpu: 99
|
||||
memory: "1Gi"
|
||||
|
||||
@@ -36,7 +36,7 @@ secrets:
|
||||
sysIdpUserPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "nubus" "sysIdpUser" | sha1sum | quote }}
|
||||
storeDavUsers:
|
||||
portalServer: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "portal-server" "store-dav" | sha1sum | quote }}
|
||||
portalListener: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "portal-listener" "store-dav" | sha1sum | quote }}
|
||||
portalConsumer: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "portal-consumer" "store-dav" | sha1sum | quote }}
|
||||
provisioning:
|
||||
apiNatsPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "api" "nats" | sha1sum | quote }}
|
||||
apiAdminNatsPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "apiAdmin" "nats" | sha1sum | quote }}
|
||||
|
||||
@@ -76,7 +76,7 @@ seLinuxOptions:
|
||||
umsNotificationsApi: ~
|
||||
umsOpenPolicyAgent: ~
|
||||
umsPortalFrontend: ~
|
||||
umsPortalListener: ~
|
||||
umsPortalConsumer: ~
|
||||
umsPortalServer: ~
|
||||
umsProvisioningDispatcher: ~
|
||||
umsProvisioningEventsAndConsumerApi: ~
|
||||
|
||||
@@ -21,7 +21,7 @@ persistence:
|
||||
nubus:
|
||||
ldapServerData: "42Gi"
|
||||
ldapServerShared: "42Gi"
|
||||
portalListener: "42Gi"
|
||||
portalConsumer: "42Gi"
|
||||
selfserviceListener: "42Gi"
|
||||
postfix: "42Gi"
|
||||
postgresql: "42Gi"
|
||||
@@ -81,7 +81,7 @@ replicas:
|
||||
umsLdapServer: 42
|
||||
umsNotificationsApi: 42
|
||||
umsPortalFrontend: 42
|
||||
umsPortalListener: 42
|
||||
umsPortalConsumer: 42
|
||||
umsPortalServer: 42
|
||||
umsSelfserviceListener: 42
|
||||
umsStackGateway: 42
|
||||
|
||||
Reference in New Issue
Block a user