diff --git a/helmfile/apps/provisioning/values-oxconnector.yaml.gotmpl b/helmfile/apps/provisioning/values-oxconnector.yaml.gotmpl index 3f348cab..69d8263c 100644 --- a/helmfile/apps/provisioning/values-oxconnector.yaml.gotmpl +++ b/helmfile/apps/provisioning/values-oxconnector.yaml.gotmpl @@ -10,6 +10,16 @@ image: pullPolicy: {{ .Values.global.imagePullPolicy | quote }} tag: {{ .Values.images.oxConnector.tag | quote }} + waitForDependency: + registry: {{ .Values.global.imageRegistry | default .Values.images.nubusWaitForDependency.registry | quote }} + repository: {{ .Values.images.nubusWaitForDependency.repository }} + imagePullPolicy: {{ .Values.global.imagePullPolicy }} + pullSecrets: + {{- range .Values.global.imagePullSecrets }} + - name: {{ . | quote }} + {{- end }} + tag: {{ .Values.images.nubusWaitForDependency.tag | quote }} + imagePullSecrets: {{- range .Values.global.imagePullSecrets }} - name: {{ . | quote }} @@ -19,16 +29,8 @@ ingress: enabled: false oxConnector: - caCert: "ucctempldapstring" - debugLevel: {{ if .Values.debug.enabled }}"4"{{ else }}"1"{{ end }} domainName: {{ .Values.global.domain | quote }} - ldapHost: "{{ .Values.ldap.host }}-primary" - logLevel: {{ if .Values.debug.enabled }}"DEBUG"{{ else }}"WARN"{{ end }} - ldapPassword: {{ .Values.secrets.nubus.ldapSecret | quote }} - ldapBaseDn: "dc=swp-ldap,dc=internal" - ldapHostDn: "cn=admin,dc=swp-ldap,dc=internal" - tlsMode: "off" - notifierServer: {{ .Values.ldap.notifierHost | quote }} + logLevel: {{ if .Values.debug.enabled }}"DEBUG"{{ else }}"INFO"{{ end }} oxDefaultContext: "1" oxImapServer: "imap://127.0.0.1:143" oxLocalTimezone: "Europe/Berlin" @@ -38,6 +40,13 @@ oxConnector: oxSmtpServer: "smtp://127.0.0.1:587" oxSoapServer: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}" +provisioningApi: + connection: + baseUrl: "http://ums-provisioning-api" + auth: + username: "ox-connector" + password: {{ .Values.secrets.oxConnector.provisioningApiPassword | quote }} + resources: {{ .Values.resources.oxConnector | toYaml | nindent 2 }} diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml index df8e0f5d..c45bbb68 100644 --- a/helmfile/environments/default/charts.yaml +++ b/helmfile/environments/default/charts.yaml @@ -214,7 +214,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/charts-mirror" name: "nubus" - version: "0.57.3" + version: "0.59.0" verify: true opendeskKeycloakBootstrap: # providerCategory: "Platform" @@ -290,7 +290,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/charts-mirror" name: "ox-connector" - version: "0.4.2" + version: "0.14.3" verify: true postfix: # providerCategory: "Platform" diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml index 9a010c0d..bbec436c 100644 --- a/helmfile/environments/default/images.yaml +++ b/helmfile/environments/default/images.yaml @@ -691,7 +691,7 @@ images: # upstreamMirrorStartFrom: ["0", "4", "2"] registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/ox-connector-standalone" - tag: "0.4.2@sha256:308489c0c0e0436bbbedbd757f78875d44468992c46c8d371c584dc778b30770" + tag: "0.14.3@sha256:bda77d7889d396ab54242520cd9243f3101747dff8353bae2f24e0ab82806745" postfix: # providerCategory: "Platform" # providerResponsible: "openDesk" diff --git a/helmfile/environments/default/secrets.gotmpl b/helmfile/environments/default/secrets.gotmpl index 3d58934c..6b169677 100644 --- a/helmfile/environments/default/secrets.gotmpl +++ b/helmfile/environments/default/secrets.gotmpl @@ -19,6 +19,8 @@ secrets: shareCryptKey: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "share_crypt_key" | sha1sum | quote }} sessiondEncryptionKey: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "sessiond_encryption_key" | sha1sum | quote }} synapseAsToken: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ox_appsuite" "as_token" | sha1sum | quote }} + oxConnector: + provisioningApiPassword: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "nubus" "ox-connector" | sha1sum | quote }} nubus: ldapSecret: {{ derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "cn=admin" "ldap" | sha1sum | quote }} ldapSearch: