diff --git a/helmfile/apps/nubus/values-nubus.yaml.gotmpl b/helmfile/apps/nubus/values-nubus.yaml.gotmpl index 82c4f625..380ec0e2 100644 --- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl +++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl @@ -171,14 +171,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: @@ -192,15 +196,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 + enabled: true nubusSelfServiceListener: enabled: true - selfserviceListener: - umcAdminUser: "default.admin" # Nubus services nubusStackDataUms: @@ -359,7 +360,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 }} diff --git a/helmfile/apps/nubus/values-opendesk-customization.yaml.gotmpl b/helmfile/apps/nubus/values-opendesk-customization.yaml.gotmpl index 3d3d5ae1..79ca5f73 100644 --- a/helmfile/apps/nubus/values-opendesk-customization.yaml.gotmpl +++ b/helmfile/apps/nubus/values-opendesk-customization.yaml.gotmpl @@ -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: diff --git a/helmfile/apps/nubus/values-opendesk-images.yaml.gotmpl b/helmfile/apps/nubus/values-opendesk-images.yaml.gotmpl index b04c2920..63431cda 100644 --- a/helmfile/apps/nubus/values-opendesk-images.yaml.gotmpl +++ b/helmfile/apps/nubus/values-opendesk-images.yaml.gotmpl @@ -49,7 +49,6 @@ nubusLdapServer: repository: {{ .Values.images.nubusWaitForDependency.repository }} tag: {{ .Values.images.nubusWaitForDependency.tag }} - nubusPortalConsumer: portalConsumer: image: @@ -57,7 +56,6 @@ nubusPortalConsumer: repository: {{ .Values.images.nubusPortalConsumer.repository }} tag: {{ .Values.images.nubusPortalConsumer.tag }} - nubusNotificationsApi: image: registry: {{ .Values.images.nubusNotificationsApi.registry }} @@ -70,11 +68,12 @@ 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: + registry: {{ .Values.images.nubusPortalConsumer.registry }} + repository: {{ .Values.images.nubusPortalConsumer.repository }} + tag: {{ .Values.images.nubusPortalConsumer.tag }} waitForDependency: image: registry: {{ .Values.images.nubusWaitForDependency.registry }} @@ -149,11 +148,6 @@ nubusUdmListener: tag: {{ .Values.images.nubusProvisioningUdmListener.tag }} nubusSelfServiceListener: - selfserviceListener: - image: - registry: {{ .Values.images.nubusSelfserviceListener.registry }} - repository: {{ .Values.images.nubusSelfserviceListener.repository }} - tag: {{ .Values.images.nubusSelfserviceListener.tag }} selfserviceInvitation: image: registry: {{ .Values.images.nubusSelfserviceInvitation.registry }} diff --git a/helmfile/environments/default/persistence.yaml b/helmfile/environments/default/persistence.yaml index fcf87812..e9c93a0d 100644 --- a/helmfile/environments/default/persistence.yaml +++ b/helmfile/environments/default/persistence.yaml @@ -19,7 +19,7 @@ persistence: nubus: ldapServerData: "1Gi" ldapServerShared: "1Gi" - portalListener: "1Gi" + portalConsumer: "1Gi" selfserviceListener: "1Gi" xwiki: "1Gi" ... diff --git a/helmfile/environments/default/replicas.yaml b/helmfile/environments/default/replicas.yaml index 5b29fd23..2b720206 100644 --- a/helmfile/environments/default/replicas.yaml +++ b/helmfile/environments/default/replicas.yaml @@ -79,7 +79,7 @@ replicas: # -- scalable: true umsPortalFrontend: 1 # -- scalable: tbd - umsPortalListener: 1 + umsPortalConsumer: 1 # -- scalable: true umsPortalServer: 1 # -- scalable: tbd diff --git a/helmfile/environments/default/resources.yaml b/helmfile/environments/default/resources.yaml index 628f04db..b784177f 100644 --- a/helmfile/environments/default/resources.yaml +++ b/helmfile/environments/default/resources.yaml @@ -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" diff --git a/helmfile/environments/default/secrets.gotmpl b/helmfile/environments/default/secrets.gotmpl index 657bdf8a..f662f5d2 100644 --- a/helmfile/environments/default/secrets.gotmpl +++ b/helmfile/environments/default/secrets.gotmpl @@ -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 }} diff --git a/helmfile/environments/default/selinux.yaml b/helmfile/environments/default/selinux.yaml index 6e95a4b0..79a9ba29 100644 --- a/helmfile/environments/default/selinux.yaml +++ b/helmfile/environments/default/selinux.yaml @@ -76,7 +76,7 @@ seLinuxOptions: umsNotificationsApi: ~ umsOpenPolicyAgent: ~ umsPortalFrontend: ~ - umsPortalListener: ~ + umsPortalConsumer: ~ umsPortalServer: ~ umsProvisioningDispatcher: ~ umsProvisioningEventsAndConsumerApi: ~ diff --git a/helmfile/environments/test/values.yaml.gotmpl b/helmfile/environments/test/values.yaml.gotmpl index 3e77aba5..3976cd3e 100644 --- a/helmfile/environments/test/values.yaml.gotmpl +++ b/helmfile/environments/test/values.yaml.gotmpl @@ -21,7 +21,7 @@ persistence: nubus: ldapServerData: "42Gi" ldapServerShared: "42Gi" - portalListener: "42Gi" + portalConsumer: "42Gi" selfserviceListener: "42Gi" postfix: "42Gi" postgresql: "42Gi" @@ -76,7 +76,7 @@ replicas: umsLdapServer: 42 umsNotificationsApi: 42 umsPortalFrontend: 42 - umsPortalListener: 42 + umsPortalConsumer: 42 umsPortalServer: 42 umsSelfserviceListener: 42 umsStackGateway: 42