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): Keep provisioning and consumers behind a feature-flag for easier merging

Browse Source 
This commit should be reverted once we are confident that provisioning
and the consumers work as expected.
This commit is contained in:
Johannes Lohmer
2024-08-27 11:27:06 +02:00
committed by Johannes Bornhold
parent 7a1defe21d
commit e53bf6f450
7 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -275,10 +275,17 @@ nubusPortalFrontend:
secretName: {{ .Values.ingress.tls.secretName | quote }}
nubusPortalListener:
enabled: false
enabled: true
portalListener:
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"
accessKeyKey: "access-key-id"
secretKeyKey: "secret-key-id"
nubusPortalConsumer:
enabled: true
enabled: false
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 }}
@@ -337,9 +344,13 @@ nubusUdmListener:
nubusSelfServiceListener:
enabled: false
nubusUdmListener:
enabled: false
nubusSelfServiceListener:
enabled: true
nubusSelfServiceConsumer:
enabled: true
enabled: false
# Nubus services
nubusStackDataUms:
@@ -522,6 +533,10 @@ 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"
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-consumer-minio-opendesk-credentials"
stringData:
access-key-id: {{ .Values.objectstores.nubus.username | quote }}

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

@@ -87,6 +87,16 @@ nubusKeycloakExtensions:
resources:
{{ .Values.resources.umsKeycloakExtensionProxy | toYaml | nindent 6 }}
nubusPortalListener:
podAnnotations:
intents.otterize.com/service-name: "ums-portal-listener"
replicaCount: {{ .Values.replicas.umsPortalListener }}
resources:
{{ .Values.resources.umsPortalListener | toYaml | nindent 4 }}
persistence:
storageClass: {{ .Values.persistence.storageClassNames.RWO | quote }}
size: {{ .Values.persistence.size.nubus.portalListener | quote }}
nubusPortalConsumer:
podAnnotations:
intents.otterize.com/service-name: "ums-portal-consumer"

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

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

2
helmfile/environments/default/images.yaml
View File

@@ -551,7 +551,7 @@ images:
# upstreamMirrorStartFrom: ["0", "3", "2"]
registry: "registry.opencode.de"
repository: "bmi/opendesk/components/supplier/univention/images-mirror/selfservice-invitation"
tag: "0.6.5@sha256:5630c9df3da4134789d2ebafad7de9062375d21547a2074827b680debd7a909e"
tag: "0.7.1@sha256:45c246ba98494c3dc17a5ea1144e5ec292501f8b9833df7d4a5c590e772bc0a1"
nubusSelfserviceListener:
# providerCategory: "Supplier"
# providerResponsible: "Univention"

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

@@ -95,7 +95,7 @@ replicas:
umsPortalFrontend: 1
# -- scalable: false
umsPortalListener: 1
# -- scalable: False
# -- scalable: false
umsPortalConsumer: 1
# -- scalable: true
umsPortalServer: 1

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

@@ -471,6 +471,20 @@ resources:
requests:
cpu: 0.1
memory: "256Mi"
umsPortalListener:
limits:
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "256Mi"
umsPortalListenerDependencies:
limits:
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "256Mi"
umsPortalConsumer:
limits:
cpu: 99

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

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