mirror of
https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git
synced 2025-12-06 07:21:36 +01:00
fix(nubus): Clean up portal-listener and selfservice-listener artifacts
This commit is contained in:
Johannes Lohmer
committed by
Thorsten Roßner
Thorsten Roßner
parent
de49de05ce
commit
f41d6feecb
@@ -33,9 +33,6 @@ global:
|
||||
secretKey: {{ .Values.objectstores.nubus.secretKey | default .Values.secrets.minio.umsUser | quote }}
|
||||
provisioningApi:
|
||||
password: {{ .Values.secrets.nubus.portalConsumer.provisioningApiPassword | quote}}
|
||||
portalListener:
|
||||
minio:
|
||||
secretKey: {{ .Values.objectstores.nubus.secretKey | default .Values.secrets.minio.umsUser | quote }}
|
||||
provisioning:
|
||||
api:
|
||||
adminPassword: {{ .Values.secrets.nubus.provisioning.api.adminPassword | quote}}
|
||||
@@ -322,16 +319,6 @@ nubusPortalConsumer:
|
||||
auth:
|
||||
username: "portal-consumer"
|
||||
|
||||
nubusPortalConsumer:
|
||||
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 }}
|
||||
objectStorageBucket: {{ .Values.objectstores.nubus.bucket | quote }}
|
||||
provisioningApi:
|
||||
auth:
|
||||
username: "portal-consumer"
|
||||
|
||||
nubusPortalServer:
|
||||
portalServer:
|
||||
objectStorageEndpoint: {{ .Values.objectstores.nubus.endpoint | default (printf "https://%s.%s" .Values.global.hosts.minioApi .Values.global.domain) | quote }}
|
||||
|
||||
@@ -172,12 +172,12 @@ nubusStackDataSwp:
|
||||
resources:
|
||||
{{ .Values.resources.umsStackDataSwp | toYaml | nindent 4 }}
|
||||
|
||||
nubusSelfServiceListener:
|
||||
nubusSelfServiceConsumer:
|
||||
podAnnotations:
|
||||
intents.otterize.com/service-name: "ums-selfservice-listener"
|
||||
resources:
|
||||
{{ .Values.resources.umsSelfserviceListener | toYaml | nindent 4 }}
|
||||
replicaCount: {{ .Values.replicas.umsSelfserviceListener }}
|
||||
{{ .Values.resources.umsSelfserviceConsumer | toYaml | nindent 4 }}
|
||||
replicaCount: {{ .Values.replicas.umsSelfserviceConsumer }}
|
||||
|
||||
nubusUdmRestApi:
|
||||
additionalAnnotations:
|
||||
|
||||
@@ -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 }}
|
||||
@@ -70,12 +63,6 @@ nubusPortalFrontend:
|
||||
repository: {{ .Values.images.nubusPortalFrontend.repository }}
|
||||
tag: {{ .Values.images.nubusPortalFrontend.tag }}
|
||||
|
||||
nubusPortalListener:
|
||||
image:
|
||||
registry: {{ .Values.images.nubusPortalListener.registry }}
|
||||
repository: {{ .Values.images.nubusPortalListener.repository }}
|
||||
tag: {{ .Values.images.nubusPortalListener.tag }}
|
||||
|
||||
nubusPortalConsumer:
|
||||
portalConsumer:
|
||||
image:
|
||||
@@ -156,12 +143,6 @@ nubusUdmListener:
|
||||
tag: {{ .Values.images.nubusProvisioningUdmListener.tag }}
|
||||
|
||||
nubusSelfServiceListener:
|
||||
selfserviceListener:
|
||||
image:
|
||||
registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusSelfserviceListener.registry | quote }}
|
||||
repository: {{ .Values.images.nubusSelfserviceListener.repository }}
|
||||
tag: {{ .Values.images.nubusSelfserviceListener.tag }}
|
||||
|
||||
selfserviceInvitation:
|
||||
image:
|
||||
registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusSelfserviceInvitation.registry | quote }}
|
||||
|
||||
@@ -420,16 +420,6 @@ images:
|
||||
registry: "registry.opencode.de"
|
||||
repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-frontend"
|
||||
tag: "0.35.1@sha256:0a77fb1fff899304b813d70f07a0b569fb7cefa5449d135b65dab7ccd30c57fd"
|
||||
nubusPortalListener:
|
||||
# providerCategory: "Supplier"
|
||||
# providerResponsible: "Univention"
|
||||
# upstreamRegistry: "https://artifacts.software-univention.de"
|
||||
# upstreamRepository: "nubus/images/portal-listener"
|
||||
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
||||
# upstreamMirrorStartFrom: ["0", "9", "4"]
|
||||
registry: "registry.opencode.de"
|
||||
repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-listener"
|
||||
tag: "0.24.2@sha256:98306b30c99e190ece6633921d9d54297634b0e4ca58ceaf0794c7050f0b8470"
|
||||
nubusPortalServer:
|
||||
# providerCategory: "Supplier"
|
||||
# providerResponsible: "Univention"
|
||||
@@ -500,16 +490,6 @@ images:
|
||||
registry: "registry.opencode.de"
|
||||
repository: "bmi/opendesk/components/supplier/univention/images-mirror/selfservice-invitation"
|
||||
tag: "0.7.1@sha256:45c246ba98494c3dc17a5ea1144e5ec292501f8b9833df7d4a5c590e772bc0a1"
|
||||
nubusSelfserviceListener:
|
||||
# providerCategory: "Supplier"
|
||||
# providerResponsible: "Univention"
|
||||
# upstreamRegistry: "https://artifacts.software-univention.de"
|
||||
# upstreamRepository: "nubus/images/selfservice-listener"
|
||||
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
||||
# upstreamMirrorStartFrom: ["0", "3", "2"]
|
||||
registry: "registry.opencode.de"
|
||||
repository: "bmi/opendesk/components/supplier/univention/images-mirror/selfservice-listener"
|
||||
tag: "0.6.5@sha256:a9724fd41cb89a9bdf231ea8699126d2d3503dc894fe9510a1e080ab8408838d"
|
||||
nubusUdmRestApi:
|
||||
# providerCategory: "Supplier"
|
||||
# providerResponsible: "Univention"
|
||||
|
||||
@@ -20,6 +20,5 @@ persistence:
|
||||
ldapServerData: "1Gi"
|
||||
ldapServerShared: "1Gi"
|
||||
portalConsumer: "1Gi"
|
||||
selfserviceListener: "1Gi"
|
||||
xwiki: "1Gi"
|
||||
...
|
||||
|
||||
@@ -94,13 +94,11 @@ replicas:
|
||||
# -- scalable: true
|
||||
umsPortalFrontend: 1
|
||||
# -- scalable: false
|
||||
umsPortalListener: 1
|
||||
# -- scalable: false
|
||||
umsPortalConsumer: 1
|
||||
# -- scalable: true
|
||||
umsPortalServer: 1
|
||||
# -- scalable: tbd
|
||||
umsSelfserviceListener: 1
|
||||
umsSelfserviceConsumer: 1
|
||||
# -- scalable: tbd
|
||||
umsStackGateway: 1
|
||||
# -- scalable: true
|
||||
|
||||
@@ -541,7 +541,7 @@ resources:
|
||||
requests:
|
||||
cpu: 0.1
|
||||
memory: "256Mi"
|
||||
umsSelfserviceListener:
|
||||
umsSelfserviceConsumer:
|
||||
limits:
|
||||
cpu: 99
|
||||
memory: "1Gi"
|
||||
|
||||
@@ -86,7 +86,7 @@ seLinuxOptions:
|
||||
umsProvisioningNatsReloader: ~
|
||||
umsProvisioningUdmListener: ~
|
||||
umsSelfserviceInvitation: ~
|
||||
umsSelfserviceListener: ~
|
||||
umsSelfserviceConsumer: ~
|
||||
umsStackGateway: ~
|
||||
umsStoreDav: ~
|
||||
umsUdmRestApi: ~
|
||||
|
||||
Reference in New Issue
Block a user