mirror of
https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git
synced 2025-12-06 15:31:38 +01:00
Compare commits
2 Commits
tkaltenbru
...
yschmidt/s
| Author | SHA1 | Date | |
|---|---|---|---|
| 0f8b8b3cd2 | |||
| 34f48bf39d |
@@ -614,6 +614,12 @@ nubusPortalConsumer:
|
|||||||
repository: {{ .Values.images.nubusWaitForDependency.repository }}
|
repository: {{ .Values.images.nubusWaitForDependency.repository }}
|
||||||
tag: {{ .Values.images.nubusWaitForDependency.tag }}
|
tag: {{ .Values.images.nubusWaitForDependency.tag }}
|
||||||
imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
|
imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
|
||||||
|
extraEnvVars:
|
||||||
|
- name: AWS_DEFAULT_REGION
|
||||||
|
value: {{ .Values.objectstores.nubus.region | quote }}
|
||||||
|
extraEnvVars:
|
||||||
|
- name: AWS_DEFAULT_REGION
|
||||||
|
value: {{ .Values.objectstores.nubus.region | quote }}
|
||||||
{{- if .Values.certificate.selfSigned }}
|
{{- if .Values.certificate.selfSigned }}
|
||||||
extraVolumes:
|
extraVolumes:
|
||||||
- name: "trusted-cert-secret-volume"
|
- name: "trusted-cert-secret-volume"
|
||||||
@@ -645,9 +651,14 @@ nubusPortalConsumer:
|
|||||||
value: "/etc/ssl/certs/ca-certificates.crt"
|
value: "/etc/ssl/certs/ca-certificates.crt"
|
||||||
- name: "SSL_CERT_FILE"
|
- name: "SSL_CERT_FILE"
|
||||||
value: "/etc/ssl/certs/ca-certificates.crt"
|
value: "/etc/ssl/certs/ca-certificates.crt"
|
||||||
|
- name: AWS_DEFAULT_REGION
|
||||||
|
value: {{ .Values.objectstores.nubus.region | quote }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
nubusPortalServer:
|
nubusPortalServer:
|
||||||
|
extraEnvVars:
|
||||||
|
- name: AWS_DEFAULT_REGION
|
||||||
|
value: {{ .Values.objectstores.nubus.region | quote }}
|
||||||
additionalAnnotations:
|
additionalAnnotations:
|
||||||
intents.otterize.com/service-name: "ums-portal-server"
|
intents.otterize.com/service-name: "ums-portal-server"
|
||||||
containerSecurityContext:
|
containerSecurityContext:
|
||||||
@@ -699,6 +710,9 @@ nubusPortalServer:
|
|||||||
serviceAccount:
|
serviceAccount:
|
||||||
create: true
|
create: true
|
||||||
{{- if .Values.certificate.selfSigned }}
|
{{- if .Values.certificate.selfSigned }}
|
||||||
|
extraEnvVars:
|
||||||
|
- name: AWS_DEFAULT_REGION
|
||||||
|
value: {{ .Values.objectstores.nubus.region | quote }}
|
||||||
extraVolumes:
|
extraVolumes:
|
||||||
- name: "trusted-cert-crt-secret-volume"
|
- name: "trusted-cert-crt-secret-volume"
|
||||||
secret:
|
secret:
|
||||||
@@ -842,6 +856,9 @@ nubusLdapServer:
|
|||||||
|
|
||||||
nubusProvisioning:
|
nubusProvisioning:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
extraEnvVars:
|
||||||
|
- name: AWS_DEFAULT_REGION
|
||||||
|
value: {{ .Values.objectstores.nubus.region | quote }}
|
||||||
api:
|
api:
|
||||||
additionalAnnotations:
|
additionalAnnotations:
|
||||||
intents.otterize.com/service-name: "ums-provisioning-api"
|
intents.otterize.com/service-name: "ums-provisioning-api"
|
||||||
|
|||||||
@@ -300,10 +300,10 @@ charts:
|
|||||||
# upstreamRepository: "nubus/charts/nubus"
|
# upstreamRepository: "nubus/charts/nubus"
|
||||||
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
||||||
# upstreamMirrorStartFrom: ["0", "19", "3"]
|
# upstreamMirrorStartFrom: ["0", "19", "3"]
|
||||||
registry: "registry.opencode.de"
|
registry: "artifacts.software-univention.de"
|
||||||
repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
|
repository: "nubus-dev/charts"
|
||||||
name: "nubus"
|
name: "nubus"
|
||||||
version: "1.7.0"
|
version: "1.7.1-pre-yschmidt-0572-test"
|
||||||
verify: true
|
verify: true
|
||||||
opendeskAlerts:
|
opendeskAlerts:
|
||||||
# providerCategory: "Platform"
|
# providerCategory: "Platform"
|
||||||
|
|||||||
@@ -565,9 +565,9 @@ images:
|
|||||||
# upstreamRepository: "nubus/images/portal-consumer"
|
# upstreamRepository: "nubus/images/portal-consumer"
|
||||||
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
||||||
# upstreamMirrorStartFrom: ["0", "27", "0"]
|
# upstreamMirrorStartFrom: ["0", "27", "0"]
|
||||||
registry: "registry.opencode.de"
|
registry: "artifacts.software-univention.de"
|
||||||
repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-consumer"
|
repository: "nubus-dev/images/portal-consumer"
|
||||||
tag: "0.55.0@sha256:919b4de5d2ef27e239f1d3e944ab58dfaa3e5ef52b865a31fe465da165b03eed"
|
tag: "0.60.0@sha256:f1c27d091a8a0e88709cd8ea03a1ce2d7399ff95dc87f058a44b65817a9c231e"
|
||||||
nubusPortalExtension:
|
nubusPortalExtension:
|
||||||
# providerCategory: "Supplier"
|
# providerCategory: "Supplier"
|
||||||
# providerResponsible: "Univention"
|
# providerResponsible: "Univention"
|
||||||
@@ -575,17 +575,17 @@ images:
|
|||||||
# upstreamRepository: "nubus/images/portal-extension"
|
# upstreamRepository: "nubus/images/portal-extension"
|
||||||
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
||||||
# upstreamMirrorStartFrom: ["0", "28", "0"]
|
# upstreamMirrorStartFrom: ["0", "28", "0"]
|
||||||
registry: "registry.opencode.de"
|
registry: "artifacts.software-univention.de"
|
||||||
repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-extension"
|
repository: "nubus-dev/images/portal-extension"
|
||||||
tag: "0.55.0@sha256:6f4fff6a53ffb8be858f3a06e9832b90f773500877dd8ab0e20da82008f3d964"
|
tag: "0.60.0@sha256:bfa6266e8c2ccffc2a37e52dadd2f5ca6e37341c92be8e849696604001a0f2d2"
|
||||||
nubusPortalFrontend:
|
nubusPortalFrontend:
|
||||||
# providerCategory: "Supplier"
|
# providerCategory: "Supplier"
|
||||||
# providerResponsible: "Univention"
|
# providerResponsible: "Univention"
|
||||||
# upstreamRegistry: "https://artifacts.software-univention.de"
|
# upstreamRegistry: "https://artifacts.software-univention.de"
|
||||||
# upstreamRepository: "nubus/images/portal-frontend"
|
# upstreamRepository: "nubus/images/portal-frontend"
|
||||||
registry: "registry.opencode.de"
|
registry: "artifacts.software-univention.de"
|
||||||
repository: "bmi/opendesk/components/platform-development/images/opendesk-nubus-portal-update"
|
repository: "nubus-dev/images/portal-frontend"
|
||||||
tag: "1.10.14@sha256:fbdec057958fd7e728431cf96896b8453c2f5b390ce3d2f169a7766f49926b1b"
|
tag: "0.60.0@sha256:f7f2c0defc77183b14ed7f0367c3e5ca1d0c25fd89554875f61bd3b43316c7bf"
|
||||||
nubusPortalServer:
|
nubusPortalServer:
|
||||||
# providerCategory: "Supplier"
|
# providerCategory: "Supplier"
|
||||||
# providerResponsible: "Univention"
|
# providerResponsible: "Univention"
|
||||||
@@ -593,9 +593,9 @@ images:
|
|||||||
# upstreamRepository: "nubus/images/portal-server"
|
# upstreamRepository: "nubus/images/portal-server"
|
||||||
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)\.(\d+)$'
|
||||||
# upstreamMirrorStartFrom: ["0", "9", "4"]
|
# upstreamMirrorStartFrom: ["0", "9", "4"]
|
||||||
registry: "registry.opencode.de"
|
registry: "artifacts.software-univention.de"
|
||||||
repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-server"
|
repository: "nubus-dev/images/portal-server"
|
||||||
tag: "0.55.0@sha256:bb9d73f1a75cf50073d7f8f8cfbeeecce930a7370cb80f1c543956aa669f7fd4"
|
tag: "0.60.0@sha256:1deee2efefcd985d9d46fe4556f599d210f346dc570ddd3902e4d23cc8f12dcd"
|
||||||
nubusProvisioningDispatcher:
|
nubusProvisioningDispatcher:
|
||||||
# providerCategory: "Supplier"
|
# providerCategory: "Supplier"
|
||||||
# providerResponsible: "Univention"
|
# providerResponsible: "Univention"
|
||||||
|
|||||||
Reference in New Issue
Block a user