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

fix(nubus): Update nubus provisioning and consumer configuration

Browse Source
This commit is contained in:
Johannes Lohmer
2024-08-09 22:56:29 +02:00
committed by Johannes Bornhold
parent 269c8270ee
commit 95c4dd2e2e
6 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
helmfile/apps/nubus/values-nubus.yaml.gotmpl
View File

@@ -275,14 +275,21 @@ nubusPortalFrontend:
secretName: {{ .Values.ingress.tls.secretName | quote }}
nubusPortalListener:
enabled: false
nubusPortalConsumer:
enabled: true
portalListener:
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"
nubusPortalConsumer:
enabled: false
@@ -323,15 +330,17 @@ nubusUdmRestApi:
secretName: {{ .Values.ingress.tls.secretName | quote }}
nubusProvisioning:
enabled: false
nubusUdmListener:
enabled: false
nubusSelfServiceListener:
enabled: true
nubusSelfServiceConsumer:
nubusUdmListener:
enabled: true
nubusSelfServiceListener:
enabled: false
nubusSelfServiceConsumer:
enabled: true
# Nubus services
nubusStackDataUms:
stackDataContext:
@@ -513,7 +522,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 }}

12
helmfile/apps/nubus/values-opendesk-customization.yaml.gotmpl
View File

@@ -87,15 +87,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 }}
nubusPortalConsumer:
podAnnotations:

7
helmfile/apps/nubus/values-opendesk-images.yaml.gotmpl
View File

@@ -51,6 +51,13 @@ 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: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusNotificationsApi.registry | quote }}

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

@@ -93,9 +93,9 @@ replicas:
umsNotificationsApi: 1
# -- scalable: true
umsPortalFrontend: 1
# -- scalable: tbd
# -- scalable: false
umsPortalListener: 1
# -- scalable: tbd
# -- scalable: False
umsPortalConsumer: 1
# -- scalable: true
umsPortalServer: 1

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

@@ -471,14 +471,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"

1
helmfile/environments/default/secrets.gotmpl
View File

@@ -36,7 +36,6 @@ 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 }}