set empty auth mechanism explicitly

helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl

@@ -47,10 +47,7 @@ ingress:
         - "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
 
 podAnnotations:
-  intents.otterize.com/service-name: collabora-controller
-  {{- with .Values.annotations.coco.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.coco.pod | toYaml | nindent 2 }}
 
 securityContext:
   allowPrivilegeEscalation: false

helmfile/apps/collabora/values.yaml.gotmpl

@@ -110,11 +110,7 @@ ingress:
         - "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
 
 podAnnotations:
-  intents.otterize.com/service-name: collabora
-  prometheus.io/scrape: "true"
-  {{- with .Values.annotations.collabora.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.collabora.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   fsGroup: 1001

helmfile/apps/cryptpad/values.yaml.gotmpl

@@ -55,10 +55,7 @@ persistence:
   enabled: false
 
 podAnnotations:
-  intents.otterize.com/service-name: cryptpad
-  {{- with .Values.annotations.cryptpad.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.cryptpad.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   fsGroup: 4001

helmfile/apps/element/values-element.yaml.gotmpl

@@ -143,10 +143,7 @@ ingress:
     {{ .Values.annotations.element.ingress | toYaml | nindent 4 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: opendesk-element
-  {{- with .Values.annotations.element.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.element.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true

helmfile/apps/element/values-matrix-neoboard-widget.yaml.gotmpl

@@ -44,10 +44,7 @@ ingress:
     {{ .Values.annotations.elementMatrixNeoboardWidget.ingress | toYaml | nindent 4 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: matrix-neoboard-widget
-  {{- with .Values.annotations.elementMatrixNeoboardWidget.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.elementMatrixNeoboardWidget.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true

helmfile/apps/element/values-matrix-neochoice-widget.yaml.gotmpl

@@ -44,10 +44,7 @@ ingress:
     {{ .Values.annotations.elementMatrixNeochoiceWidget.ingress | toYaml | nindent 4 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: matrix-neochoice-widget
-  {{- with .Values.annotations.elementMatrixNeochoiceWidget.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.elementMatrixNeochoiceWidget.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true

helmfile/apps/element/values-matrix-neodatefix-bot-bootstrap.yaml.gotmpl

@@ -25,10 +25,7 @@ image:
 fullnameOverride: "matrix-neodatefix-bot-bootstrap"
 
 podAnnotations:
-  intents.otterize.com/service-name: matrix-neodatefix-bot-bootstrap
-  {{- with .Values.annotations.elementMatrixNeodatefixBotBootstrap.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.elementMatrixNeodatefixBotBootstrap.pod | toYaml | nindent 2 }}
 
 securityContext:
   allowPrivilegeEscalation: false

helmfile/apps/element/values-matrix-neodatefix-bot.yaml.gotmpl

@@ -90,10 +90,7 @@ persistence:
     {{ .Values.annotations.elementMatrixNeodatefixBot.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: matrix-neodatefix-bot
-  {{- with .Values.annotations.elementMatrixNeodatefixBot.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.elementMatrixNeodatefixBot.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true

helmfile/apps/element/values-matrix-neodatefix-widget.yaml.gotmpl

@@ -49,10 +49,7 @@ ingress:
     {{ .Values.annotations.elementMatrixNeodatefixWidget.ingress | toYaml | nindent 4 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: matrix-neodatefix-widget
-  {{- with .Values.annotations.elementMatrixNeodatefixWidget.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.elementMatrixNeodatefixWidget.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true

helmfile/apps/element/values-matrix-user-verification-service-bootstrap.yaml.gotmpl

@@ -25,10 +25,7 @@ image:
 fullnameOverride: "opendesk-matrix-user-verification-service-bootstrap"
 
 podAnnotations:
-  intents.otterize.com/service-name: opendesk-matrix-user-verification-service-bootstrap
-  {{- with .Values.annotations.elementMatrixUserVerificationServiceBootstrap.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.elementMatrixUserVerificationServiceBootstrap.pod | toYaml | nindent 2 }}
 
 securityContext:
   allowPrivilegeEscalation: false

helmfile/apps/element/values-matrix-user-verification-service.yaml.gotmpl

@@ -44,10 +44,7 @@ image:
   tag: {{ .Values.images.matrixUserVerificationService.tag | quote }}
 
 podAnnotations:
-  intents.otterize.com/service-name: opendesk-matrix-user-verification-service
-  {{- with .Values.annotations.elementMatrixUserVerificationService.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.elementMatrixUserVerificationService.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true

helmfile/apps/element/values-synapse-web.yaml.gotmpl

@@ -56,10 +56,7 @@ ingress:
     secretName: {{ .Values.ingress.tls.secretName | quote }}
 
 podAnnotations:
-  intents.otterize.com/service-name: opendesk-synapse-web
-  {{- with .Values.annotations.elementSynapseWeb.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.elementSynapseWeb.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true

helmfile/apps/element/values-synapse.yaml.gotmpl

@@ -242,10 +242,7 @@ persistence:
     {{ .Values.annotations.elementSynapse.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: opendesk-synapse
-  {{- with .Values.annotations.elementSynapse.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.elementSynapse.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true

helmfile/apps/element/values-well-known.yaml.gotmpl

@@ -49,10 +49,7 @@ ingress:
     {{ .Values.annotations.elementWellKnown.ingress | toYaml | nindent 4 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: opendesk-well-known
-  {{- with .Values.annotations.elementWellKnown.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.elementWellKnown.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true

helmfile/apps/jitsi/values-jitsi.yaml.gotmpl

@@ -111,11 +111,10 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.jitsi | toYaml | nindent 8 }}
+    {{- if .Values.annotations.jitsiWeb.pod }}
     podAnnotations:
-      intents.otterize.com/service-name: "jitsi-web"
-      {{- with .Values.annotations.jitsiWeb.pod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.jitsiWeb.pod | toYaml | nindent 6 }}
+    {{- end }}
   prosody:
     image:
       repository: "{{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.prosody.registry }}/{{ .Values.images.prosody.repository }}"
@@ -165,11 +164,10 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.prosody | toYaml | nindent 8 }}
+    {{- if .Values.annotations.jitsiProsody.pod }}
     podAnnotations:
-      intents.otterize.com/service-name: "jitsi-prosody"
-      {{- with .Values.annotations.jitsiProsody.pod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.jitsiProsody.pod | toYaml | nindent 6 }}
+    {{- end }}
   jicofo:
     replicaCount: {{ .Values.replicas.jicofo }}
     image:
@@ -193,11 +191,10 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.jicofo | toYaml | nindent 8 }}
+    {{- if .Values.annotations.jitsiJicofo.pod }}
     podAnnotations:
-      intents.otterize.com/service-name: "jitsi-jicofo"
-      {{- with .Values.annotations.jitsiJicofo.pod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.jitsiJicofo.pod | toYaml | nindent 6 }}
+    {{- end }}
   jigasi:
     replicaCount: {{ .Values.replicas.jigasi }}
     enabled: {{ .Values.sip.jigasi.enabled }}
@@ -227,11 +224,10 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.jigasi | toYaml | nindent 8 }}
+    {{- if .Values.annotations.jitsiJigasi.pod }}
     podAnnotations:
-      intents.otterize.com/service-name: "jitsi-jigasi"
-      {{- with .Values.annotations.jitsiJigasi.pod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.jitsiJigasi.pod | toYaml | nindent 6 }}
+    {{- end }}
   jvb:
     replicaCount: {{ .Values.replicas.jvb }}
     # The `useNodeIP` option provided by the upstream charts does not support all relevant scenarios, but since
@@ -264,11 +260,10 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.jvb | toYaml | nindent 8 }}
+    {{- if .Values.annotations.jitsiJvb.pod }}
     podAnnotations:
-      intents.otterize.com/service-name: "jitsi-jvb"
-      {{- with .Values.annotations.jitsiJvb.pod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.jitsiJvb.pod | toYaml | nindent 6 }}
+    {{- end }}
     metrics:
       prometheusAnnotations:
         {{ .Values.annotations.jitsiJvb.metricsPrometheus | toYaml | nindent 8 }}
@@ -293,11 +288,10 @@ jitsi:
       # Chart does not allow to template more
       capabilities:
         add: ["SYS_ADMIN"]
+    {{- if .Values.annotations.jitsiJibri.pod }}
     podAnnotations:
-      intents.otterize.com/service-name: "jitsi-jibri"
-      {{- with .Values.annotations.jitsiJibri.pod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.jitsiJibri.pod | toYaml | nindent 6 }}
+    {{- end }}
   imagePullSecrets:
   {{- range .Values.global.imagePullSecrets }}
     - name: {{ . | quote }}

helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl

@@ -10,7 +10,7 @@ global:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
 additionalAnnotations:
-  intents.otterize.com/service-name: "opendesk-nextcloud-management"
+  intents.otterize.com/service-name: "opendesk-nextcloud-php"
   {{- with .Values.annotations.nextcloudNextcloudMgmt.additional }}
   {{ . | toYaml | nindent 2}}
   {{- end }}

helmfile/apps/nextcloud/values-nextcloud-notifypush.yaml.gotmpl

@@ -10,6 +10,7 @@ global:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
 additionalAnnotations:
+  intents.otterize.com/service-name: "opendesk-nextcloud-notifypush"
   {{- with .Values.annotations.nextcloudNotifyPush.additional }}
   {{ . | toYaml | nindent 4 }}
   {{- end }}
@@ -113,10 +114,7 @@ metrics:
       {{ .Values.annotations.nextcloudNotifyPush.serviceMetrics | toYaml | nindent 6 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: "opendesk-nextcloud-notifypush"
-  {{- with .Values.annotations.nextcloudNotifyPush.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.nextcloudNotifyPush.pod | toYaml | nindent 4 }}
 podSecurityContext:
   fsGroup: 101
 # prometheus:

helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl

@@ -39,11 +39,7 @@ exporter:
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     tag: {{ .Values.images.nextcloudExporter.tag | quote }}
   podAnnotations:
-    prometheus.io/scrape: "true"
-    intents.otterize.com/service-name: "opendesk-nextcloud-exporter"
-    {{- with .Values.annotations.nextcloudExporter.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.nextcloudExporter.pod | toYaml | nindent 4 }}
   prometheus:
     serviceMonitor:
       enabled: {{ .Values.monitoring.prometheus.serviceMonitors.enabled }}
@@ -80,7 +76,7 @@ aio:
             topologyKey: "kubernetes.io/hostname"
 
   additionalAnnotations:
-    intents.otterize.com/service-name: "opendesk-nextcloud-aio-cron"
+    intents.otterize.com/service-name: "opendesk-nextcloud-aio"
     {{- with .Values.annotations.nextcloudAio.additional }}
     {{ . | toYaml | nindent 4 }}
     {{- end }}

helmfile/apps/notes/values.yaml.gotmpl

@@ -117,20 +117,11 @@ backend:
     seLinuxOptions:
       {{ .Values.seLinuxOptions.notesBackend | toYaml | nindent 6 }}
   podAnnotations:
-    intents.otterize.com/service-name: "impress-backend"
-    {{- with .Values.annotations.notesBackend.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.notesBackend.pod | toYaml | nindent 4 }}
   podAnnotationsCreateUser:
-    intents.otterize.com/service-name: "impress-create-user"
-    {{- with .Values.annotations.notesBackend.createUserJob }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.notesBackend.createUserJob | toYaml | nindent 4 }}
   podAnnotationsMigrate:
-    intents.otterize.com/service-name: "impress-migrate"
-    {{- with .Values.annotations.notesBackend.migrateJob }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.notesBackend.migrateJob | toYaml | nindent 4 }}
   podSecurityContext:
     enabled: true
     fsGroup: 1000
@@ -198,10 +189,7 @@ frontend:
     seLinuxOptions:
       {{ .Values.seLinuxOptions.notesFrontend | toYaml | nindent 6 }}
   podAnnotations:
-    intents.otterize.com/service-name: "impress-frontend"
-    {{- with .Values.annotations.notesFrontend.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.notesFrontend.pod | toYaml | nindent 4 }}
   podSecurityContext:
     enabled: true
     fsGroup: 1000
@@ -269,10 +257,7 @@ y-provider:
       {{ .Values.annotations.notesYProvider.ingressCollaborationWS | toYaml | nindent 6 }}
     ingressClassName: {{ .Values.ingress.ingressClassName }}
   podAnnotations:
-    intents.otterize.com/service-name: "impress-y-provider"
-    {{- with .Values.annotations.notesYProvider.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.notesYProvider.pod | toYaml | nindent 4 }}
   podSecurityContext:
     enabled: true
     fsGroup: 1001

helmfile/apps/nubus/values-intercom-service.yaml.gotmpl

@@ -109,10 +109,7 @@ ingress:
     {{ .Values.annotations.nubusIntercomService.ingress | toYaml | nindent 4 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: intercom-service
-  {{- with .Values.annotations.nubusIntercomService.pod }}
-  {{ . | toYaml | nindent 2}}
-  {{- end }}
+  {{ .Values.annotations.nubusIntercomService.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true

helmfile/apps/nubus/values-nginx-s3-gateway.yaml.gotmpl

@@ -42,10 +42,7 @@ configuration:
       value: {{ .Values.objectstores.nubus.secretKey | default .Values.secrets.minio.umsUser | quote }}
 
 podAnnotations:
-  intents.otterize.com/service-name: nubus-nginx-s3-gateway
-  {{- with .Values.annotations.nubusNginxS3Gateway.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.nubusNginxS3Gateway.pod | toYaml | nindent 2 }}
 
 resources:
   {{ .Values.resources.nginxS3Gateway | toYaml | nindent 2 }}

helmfile/apps/nubus/values-nubus.yaml.gotmpl

@@ -274,6 +274,7 @@ nubusTwofaHelpdesk:
 nubusNotificationsApi:
   enabled: false
   additionalAnnotations:
+    intents.otterize.com/service-name: "ums-notifications-api"
     {{- with .Values.annotations.nubusNotificationsApi.additional }}
     {{ . | toYaml | nindent 4 }}
     {{- end }}
@@ -311,10 +312,7 @@ nubusNotificationsApi:
     annotations:
       {{ .Values.annotations.nubusNotificationsApi.persistence | toYaml | nindent 6 }}
   podAnnotations:
-    intents.otterize.com/service-name: "ums-notifications-api"
-    {{- with .Values.annotations.nubusNotificationsApi.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.nubusNotificationsApi.pod | toYaml | nindent 4 }}
   postgresql:
     connection:
       host: {{ .Values.databases.umsNotificationsApi.host | quote }}
@@ -341,6 +339,7 @@ nubusNotificationsApi:
 
 nubusPortalFrontend:
   additionalAnnotations:
+    intents.otterize.com/service-name: "ums-portal-frontend"
     {{- with .Values.annotations.nubusPortalFrontend.additional }}
     {{ . | toYaml | nindent 4 }}
     {{- end }}
@@ -416,10 +415,7 @@ nubusPortalFrontend:
     annotations:
       {{ .Values.annotations.nubusPortalFrontend.persistence | toYaml | nindent 6 }}
   podAnnotations:
-    intents.otterize.com/service-name: "ums-portal-frontend"
-    {{- with .Values.annotations.nubusPortalFrontend.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.nubusPortalFrontend.pod | toYaml | nindent 4 }}
   portalFrontend:
     branding:
       css: {{ .Values.theme.styles.portal.main | toJson }}
@@ -670,6 +666,7 @@ nubusPortalConsumer:
 
 nubusPortalServer:
   additionalAnnotations:
+    intents.otterize.com/service-name: "ums-portal-server"
     {{- with .Values.annotations.nubusPortalServer.additional }}
     {{ . | toYaml | nindent 4 }}
     {{- end }}
@@ -714,10 +711,7 @@ nubusPortalServer:
     annotations:
       {{ .Values.annotations.nubusPortalServer.persistence | toYaml | nindent 6 }}
   podAnnotations:
-    intents.otterize.com/service-name: "ums-portal-server"
-    {{- with .Values.annotations.nubusPortalServer.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.nubusPortalServer.pod | toYaml | nindent 4 }}
   portalServer:
     centralNavigation:
       enabled: true
@@ -845,10 +839,7 @@ nubusUdmRestApi:
     annotations:
       {{ .Values.annotations.nubusUdmRestApi.persistence | toYaml | nindent 6 }}
   podAnnotations:
-    intents.otterize.com/service-name: ums-udm-rest-api
-    {{- with .Values.annotations.nubusUdmRestApi.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end}}
+    {{ .Values.annotations.nubusUdmRestApi.pod | toYaml | nindent 4 }}
   replicaCount: {{ .Values.replicas.umsUdmRestApi }}
   resources:
     {{ .Values.resources.umsUdmRestApi | toYaml | nindent 4 }}
@@ -907,7 +898,7 @@ nubusLdapServer:
   additionalAnnotations:
     {{ .Values.annotations.nubusLdapServer.additional | toYaml | nindent 4 }}
   additionalAnnotations:
-    {{ .Values.annotations.nubusLdapServer.additional | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "ums-ldap-server"
   dhInitcontainer:
     image:
       registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusLdapServerDhInitContainer.registry | quote }}
@@ -930,10 +921,7 @@ nubusLdapServer:
     size: {{ .Values.persistence.storages.nubusLdapServerData.size | quote }}
     storageClass: {{ coalesce .Values.persistence.storages.nubusLdapServerData.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
   podAnnotations:
-    intents.otterize.com/service-name: "ums-ldap-server"
-    {{- with .Values.annotations.nubusLdapServer.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.nubusLdapServer.pod | toYaml | nindent 4 }}
   replicaCountPrimary: {{ .Values.replicas.umsLdapServerPrimary }}
   replicaCountSecondary: {{ .Values.replicas.umsLdapServerSecondary }}
   replicaCountProxy: {{ .Values.replicas.umsLdapServerProxy }}
@@ -959,6 +947,7 @@ nubusProvisioning:
     {{ .Values.annotations.nubusProvisioning.additional | toYaml | nindent 4 }}
   api:
     additionalAnnotations:
+      intents.otterize.com/service-name: "ums-provisioning-api"
       {{- with .Values.annotations.nubusProvisioning.apiAdditional }}
       {{ . | toYaml | nindent 6 }}
       {{- end }}
@@ -977,10 +966,7 @@ nubusProvisioning:
       auth:
         password: {{ .Values.secrets.nubus.provisioning.api.natsPassword | quote}}
     podAnnotations:
-      intents.otterize.com/service-name: "ums-provisioning-api"
-      {{- with .Values.annotations.nubusProvisioning.apiPod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.nubusProvisioning.apiPod | toYaml | nindent 6 }}
     resources:
       {{ .Values.resources.umsProvisioningApi | toYaml | nindent 6 }}
   containerSecurityContext:
@@ -999,6 +985,7 @@ nubusProvisioning:
       {{ .Values.seLinuxOptions.umsProvisioning | toYaml | nindent 6 }}
   dispatcher:
     additionalAnnotations:
+      intents.otterize.com/service-name: "ums-provisioning-dispatcher"
       {{- with .Values.annotations.nubusProvisioning.dispatcherAdditional }}
       {{ . | toYaml | nindent 6 }}
       {{- end }}
@@ -1010,14 +997,12 @@ nubusProvisioning:
       auth:
         password: {{ .Values.secrets.nubus.provisioning.dispatcherNatsPassword | quote}}
     podAnnotations:
-      intents.otterize.com/service-name: "ums-provisioning-dispatcher"
-      {{- with .Values.annotations.nubusProvisioning.dispatcherPod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.nubusProvisioning.dispatcherPod | toYaml | nindent 6 }}
     resources:
       {{ .Values.resources.umsProvisioningDispatcher | toYaml | nindent 6 }}
   nats:
     additionalAnnotations:
+      intents.otterize.com/service-name: "ums-provisioning-nats"
       {{- with .Values.annotations.nubusProvisioning.natsAdditional }}
       {{ . | toYaml | nindent 6 }}
       {{- end }}
@@ -1075,12 +1060,10 @@ nubusProvisioning:
     serviceAccount:
       create: true
   podAnnotations:
-    intents.otterize.com/service-name: "ums-provisioning-nats"
-    {{- with .Values.annotations.nubusProvisioning.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.nubusProvisioning.pod | toYaml | nindent 4 }}
   prefill:
     additionalAnnotations:
+      intents.otterize.com/service-name: "ums-provisioning-prefill"
       {{- with .Values.annotations.nubusProvisioning.prefillAdditional }}
       {{ . | toYaml | nindent 6 }}
       {{- end }}
@@ -1092,14 +1075,12 @@ nubusProvisioning:
       auth:
         password: {{ .Values.secrets.nubus.provisioning.prefillNatsPassword | quote}}
     podAnnotations:
-      intents.otterize.com/service-name: "ums-provisioning-prefill"
-      {{- with .Values.annotations.nubusProvisioning.prefillPod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.nubusProvisioning.prefillPod | toYaml | nindent 6 }}
     resources:
       {{ .Values.resources.umsProvisioningPrefill | toYaml | nindent 6 }}
   udmTransformer:
     additionalAnnotations:
+      intents.otterize.com/service-name: "ums-provisioning-udm-transformer"
       {{- with .Values.annotations.nubusProvisioning.udmTransformerAdditional }}
       {{ . | toYaml | nindent 6 }}
       {{- end }}
@@ -1111,10 +1092,7 @@ nubusProvisioning:
       auth:
         password: {{ .Values.secrets.nubus.provisioning.udmTransformerNatsPassword | quote}}
     podAnnotations:
-      intents.otterize.com/service-name: "ums-provisioning-udm-transformer"
-      {{- with .Values.annotations.nubusProvisioning.udmTransformerPod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.nubusProvisioning.udmTransformerPod | toYaml | nindent 6 }}
     resources:
       {{ .Values.resources.umsProvisioningUdmTransformer | toYaml | nindent 6 }}
   replicaCount:
@@ -1185,10 +1163,7 @@ nubusUdmListener:
     size: {{ .Values.persistence.storages.nubusUdmListener.size | quote }}
 #    storageClass: -- coalesce .Values.persistence.storages.nubusUdmListener.storageClassName .Values.persistence.storageClassNames.RWO | quote --
   podAnnotations:
-    intents.otterize.com/service-name: "ums-provisioning-udm-listener"
-    {{- with .Values.annotations.nubusUdmListener.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.nubusUdmListener.pod | toYaml | nindent 4 }}
   replicaCount: {{ .Values.replicas.umsUdmListener }}
   resources:
     {{ .Values.resources.umsUdmListener | toYaml | nindent 4 }}
@@ -1244,9 +1219,9 @@ nubusSelfServiceConsumer:
 # Nubus services
 nubusStackDataUms:
   additionalAnnotations:
-    intents.otterize.com/service-name: "ums-stack-data-ums"
     argocd.argoproj.io/hook: "Sync"
     argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
+    intents.otterize.com/service-name: "ums-stack-data-ums"
     {{- with .Values.annotations.nubusStackDataUms.additional }}
     {{ . | toYaml | nindent 4 }}
     {{- end }}
@@ -1295,10 +1270,7 @@ nubusStackDataUms:
       connection:
         host: {{ .Values.databases.umsSelfservice.host | quote }}
   podAnnotations:
-    intents.otterize.com/service-name: "ums-stack-data-ums"
-    {{- with .Values.annotations.nubusStackDataUms.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.nubusStackDataUms.pod | toYaml | nindent 4 }}
   resources:
     {{ .Values.resources.umsStackDataUms | toYaml | nindent 4 }}
   stackDataContext:
@@ -1486,10 +1458,7 @@ nubusUmcServer:
     auth:
       password: ""
   podAnnotations:
-    intents.otterize.com/service-name: ums-umc-server
-    {{- with .Values.annotations.nubusUmcServer.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.nubusUmcServer.pod | toYaml | nindent 4 }}
   # Ref.: https://docs.software-univention.de/nubus-kubernetes-operation/1.x/en/reference.html#envvar-nubusUmcServer.podManagementPolicy
   podManagementPolicy: "{{ if gt .Values.replicas.umsUmcServer 4 }}Parallel{{ else }}OrderedReady{{ end }}"
   postgresql:
@@ -1585,10 +1554,7 @@ nubusUmcGateway:
   initResources:
     {{ .Values.resources.umsUmcGateway | toYaml | nindent 4 }}
   podAnnotations:
-    intents.otterize.com/service-name: ums-umc-gateway
-    {{- with .Values.annotations.nubusUmcGateway.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.nubusUmcGateway.pod | toYaml | nindent 4 }}
   replicaCount: {{ .Values.replicas.umsUmcGateway }}
   serviceAccount:
     annotations:

helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl

@@ -126,10 +126,7 @@ persistence:
     {{ .Values.annotations.openxchangeDovecot.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: open-xchange-dovecot
-  {{- with .Values.annotations.openxchangeDovecot.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.openxchangeDovecot.pod | toYaml | nindent 2 }}
 
 resources:
   {{ .Values.resources.dovecot | toYaml | nindent 2 }}

helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl

@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: Apache-2.0
 ---
 additionalAnnotations:
-  intents.otterize.com/service-name: open-xchange-bootstrap
   argocd.argoproj.io/hook: "Sync"
   argocd.argoproj.io/hook-delete-policy: "HookSucceeded"
   {{- with .Values.annotations.openxchangeBootstrap.additional }}

helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl

@@ -5,7 +5,6 @@
 appsuite:
   core-mw:
     podAnnotations:
-      intents.otterize.com/service-name: open-xchange-core-mw
       logging.open-xchange.com/format: "appsuite-json"
       {{- with .Values.annotations.openxchangeEnterpriseContactPicker.appsuiteCoreMwPod }}
       {{ . | toYaml | nindent 6 }}

helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl

@@ -31,10 +31,7 @@ nextcloud-integration-ui:
     - name: {{ . | quote }}
   {{- end }}
   podAnnotations:
-    intents.otterize.com/service-name: open-xchange-nextcloud-integration-ui
-    {{- with .Values.annotations.openxchangeNextcloudIntegrationUi.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.openxchangeNextcloudIntegrationUi.pod | toYaml | nindent 4 }}
   replicaCount: {{ .Values.replicas.openxchangeNextcloudIntegrationUI }}
   resources:
     {{ .Values.resources.openxchangeNextcloudIntegrationUI | toYaml | nindent 4 }}
@@ -69,10 +66,7 @@ public-sector-ui:
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   replicaCount: {{ .Values.replicas.openxchangePublicSectorUI }}
   podAnnotations:
-    intents.otterize.com/service-name: open-xchange-public-sector-ui
-    {{- with .Values.annotations.openxchangePublicSectorUi.pod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.openxchangePublicSectorUi.pod | toYaml | nindent 4 }}
   resources:
     {{ .Values.resources.openxchangePublicSectorUI | toYaml | nindent 4 }}
   securityContext:
@@ -262,6 +256,10 @@ appsuite:
               open-xchange-authentication-masterpassword: "enabled"
           properties:
             com.openexchange.calendar.allowOrganizerPartStatChanges: "true"
+            # Mailfilter
+            com.openexchange.mail.filter.passwordSource: global
+            com.openexchange.mail.filter.masterPassword:  {{ .Values.secrets.oxAppSuite.migrationsMasterPassword | quote }}
+            com.openexchange.mail.filter.preferredSaslMech: ""
           propertiesFiles:
             /opt/open-xchange/etc/masterpassword-authentication.properties:
               com.openexchange.authentication.masterpassword.password: {{ .Values.secrets.oxAppSuite.migrationsMasterPassword | quote }}
@@ -313,10 +311,7 @@ appsuite:
     jolokiaPassword: {{ .Values.secrets.oxAppSuite.jolokiaPassword | quote }}
     hostname: "{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
     podAnnotations:
-      intents.otterize.com/service-name: open-xchange-core-mw
-      {{- with .Values.annotations.openxchangeAppsuiteCoreMw.pod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.openxchangeAppsuiteCoreMw.pod | toYaml | nindent 6 }}
     serviceAccount:
       annotations:
         {{ .Values.annotations.openxchangeAppsuiteCoreMw.serviceAccount | toYaml | nindent 8 }}
@@ -343,10 +338,7 @@ appsuite:
         pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
       replicaCount: {{ .Values.replicas.openxchangeGotenberg }}
       podAnnotations:
-        intents.otterize.com/service-name: open-xchange-gotenberg
-        {{- with .Values.annotations.openxchangeAppsuiteCoreMw.gotenbergPod }}
-        {{ . | toYaml | nindent 8 }}
-        {{- end }}
+        {{ .Values.annotations.openxchangeAppsuiteCoreMw.gotenbergPod | toYaml | nindent 8 }}
       resources:
         {{ .Values.resources.openxchangeGotenberg | toYaml | nindent 8 }}
       securityContext:
@@ -359,6 +351,7 @@ appsuite:
         runAsNonRoot: true
         runAsUser: 1001
         runAsGroup: 1001
+        privileged: false
         seccompProfile:
           type: "RuntimeDefault"
         seLinuxOptions:
@@ -774,10 +767,7 @@ appsuite:
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     replicaCount: {{ .Values.replicas.openxchangeCoreUI }}
     podAnnotations:
-      intents.otterize.com/service-name: open-xchange-core-ui
-      {{- with .Values.annotations.openxchangeAppsuiteCoreUi.pod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.openxchangeAppsuiteCoreUi.pod | toYaml | nindent 6 }}
     resources:
       {{ .Values.resources.openxchangeCoreUI | toYaml | nindent 6 }}
     securityContext:
@@ -814,10 +804,7 @@ appsuite:
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     overrides: {}
     podAnnotations:
-      intents.otterize.com/service-name: open-xchange-core-ui-middleware
-      {{- with .Values.annotations.openxchangeAppsuiteCoreUiMiddleware.pod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.openxchangeAppsuiteCoreUiMiddleware.pod | toYaml | nindent 6 }}
     redis: *redisConfiguration
     replicaCount: {{ .Values.replicas.openxchangeCoreUIMiddleware }}
     resources:
@@ -866,10 +853,7 @@ appsuite:
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     {{- if .Values.annotations.openxchangeAppsuiteCoreDocumentconverter.pod }}
     podAnnotations:
-      intents.otterize.com/service-name: open-xchange-core-documentconverter
-      {{- with .Values.annotations.openxchangeAppsuiteCoreDocumentconverter.pod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.openxchangeAppsuiteCoreDocumentconverter.pod | toYaml | nindent 6 }}
     {{- end }}
     redis: *redisConfiguration
     replicaCount: {{ .Values.replicas.openxchangeCoreDocumentConverter }}
@@ -921,10 +905,7 @@ appsuite:
       tag: {{ .Values.images.openxchangeCoreGuidedtours.tag | quote }}
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     podAnnotations:
-      intents.otterize.com/service-name: open-xchange-guidedtours
-      {{- with .Values.annotations.openxchangeAppsuiteCoreGuidedtours.pod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.openxchangeAppsuiteCoreGuidedtours.pod | toYaml | nindent 6 }}
     replicaCount: {{ .Values.replicas.openxchangeCoreGuidedtours }}
     resources:
       {{- .Values.resources.openxchangeCoreGuidedtours | toYaml | nindent 6 }}
@@ -968,10 +949,7 @@ appsuite:
           secretKey: "."
     {{- if .Values.annotations.openxchangeAppsuiteCoreImageconverter.pod }}
     podAnnotations:
-      intents.otterize.com/service-name: open-xchange-core-imageconverter
-      {{- with .Values.annotations.openxchangeAppsuiteCoreImageconverter.pod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.openxchangeAppsuiteCoreImageconverter.pod | toYaml | nindent 6 }}
     {{- end }}
     redis: *redisConfiguration
     replicaCount: {{ .Values.replicas.openxchangeCoreImageConverter }}
@@ -1007,8 +985,7 @@ appsuite:
       repository: {{ .Values.images.openxchangeGuardUI.repository | quote }}
       tag: {{ .Values.images.openxchangeGuardUI.tag | quote }}
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-    podAnnotations:
-      intents.otterize.com/service-name: open-xchange-guard-ui
+    podAnnotations: {}
     replicaCount: {{ .Values.replicas.openxchangeGuardUI }}
     resources:
       {{- .Values.resources.openxchangeGuardUI | toYaml | nindent 6 }}
@@ -1044,10 +1021,7 @@ appsuite:
       - name: {{ . | quote }}
     {{- end }}
     podAnnotations:
-      intents.otterize.com/service-name: open-xchange-core-user-guide
-      {{- with .Values.annotations.openxchangeAppsuiteCoreUserGuide.pod }}
-      {{ . | toYaml | nindent 6 }}
-      {{- end }}
+      {{ .Values.annotations.openxchangeAppsuiteCoreUserGuide.pod | toYaml | nindent 6 }}
     replicaCount: {{ .Values.replicas.openxchangeCoreUserGuide }}
     resources:
       {{- .Values.resources.openxchangeCoreUserGuide | toYaml | nindent 6 }}

helmfile/apps/open-xchange/values-oxconnector.yaml.gotmpl

@@ -68,10 +68,7 @@ persistence:
   #storageClass: {{ coalesce .Values.persistence.storages.oxConnector.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
 
 podAnnotations:
-  intents.otterize.com/service-name: open-xchange-connector
-  {{- with .Values.annotations.nubusOxConnector.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.nubusOxConnector.pod | toYaml | nindent 2 }}
 
 replicaCount: {{ .Values.replicas.oxConnector }}
 

helmfile/apps/open-xchange/values-postfix.yaml.gotmpl

@@ -92,10 +92,7 @@ postfix:
   virtualTransport: "lmtps:dovecot:24"
 
 podAnnotations:
-  intents.otterize.com/service-name: open-xchange-postfix
-  {{- with .Values.annotations.openxchangePostfix.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.openxchangePostfix.pod | toYaml | nindent 2 }}
 
 replicaCount: {{ .Values.replicas.postfix }}
 

helmfile/apps/opendesk-openproject-bootstrap/values.yaml.gotmpl

@@ -19,7 +19,7 @@ cleanup:
 
 config:
   debug:
-    enabled: true
+    enabled: {{ .Values.debug.enabled }}
   openproject:
     fileshareName: "Nextcloud at {{ .Values.global.domain }}"
     admin:

helmfile/apps/opendesk-services/helmfile-child.yaml.gotmpl

@@ -64,7 +64,7 @@ repositories:
 
 releases:
   - name: "opendesk-otterize"
-    chart: "/home/svenn/git/opendesk-otterize/charts/opendesk-otterize"
+    chart: "otterize-repo/{{ .Values.charts.otterize.name }}"
     version: "{{ .Values.charts.otterize.version }}"
     values:
       - "values-otterize.yaml.gotmpl"

helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl

@@ -116,10 +116,7 @@ image:
   imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
 podAnnotations:
-  intents.otterize.com/service-name: opendesk-static-files
-  {{- with .Values.annotations.opendeskServicesStaticFiles.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.opendeskServicesStaticFiles.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true

helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl

@@ -10,8 +10,6 @@ additionalAnnotations:
   {{ .Values.annotations.opendeskServicesOtterize.additional | toYaml | nindent 2 }}
 
 apps:
-  cassandra:
-    enabled: {{ .Values.apps.cassandra.enabled }}
   clamavDistributed:
     enabled: {{ .Values.apps.clamavDistributed.enabled }}
   clamavSimple:
@@ -44,7 +42,7 @@ apps:
     enabled: {{ .Values.apps.nubus.enabled }}
   openproject:
     enabled: {{ .Values.apps.openproject.enabled }}
-  oxAppSuite:
+  oxAppsuite:
     enabled: {{ .Values.apps.oxAppSuite.enabled }}
   postfix:
     enabled: {{ .Values.apps.postfix.enabled }}

helmfile/apps/openproject/values.yaml.gotmpl

@@ -131,10 +131,7 @@ persistence:
   enabled: false
 
 podAnnotations:
-  intents.otterize.com/service-name: "openproject"
-  {{- with .Values.annotations.openproject.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.openproject.pod | toYaml | nindent 2 }}
 
 postgresql:
   bundled: false

helmfile/apps/services-external/values-cassandra.yaml.gotmpl

@@ -73,10 +73,8 @@ persistence:
   storageClass: {{ coalesce .Values.persistence.storages.cassandra.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
 
 podAnnotations:
-  intents.otterize.com/service-name: "cassandra"
-  {{- with .Values.annotations.cassandra.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.cassandra.pod | toYaml | nindent 2 }}
+
 podSecurityContext:
   enabled: true
   fsGroup: 1001

helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl

@@ -26,10 +26,7 @@ clamd:
     tag: {{ .Values.images.clamd.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   podAnnotations:
-    intents.otterize.com/service-name: "clamav-distributed"
-    {{- with .Values.annotations.servicesExternalClamavDistributed.clamdPod }}
-    {{ .  | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.servicesExternalClamavDistributed.clamdPod | toYaml | nindent 4 }}
   podSecurityContext:
     enabled: true
     fsGroup: 101
@@ -84,10 +81,7 @@ freshclam:
     tag: {{ .Values.images.freshclam.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   podAnnotations:
-    intents.otterize.com/service-name: "clamav-freshclam"
-    {{- with .Values.annotations.servicesExternalClamavDistributed.freshclamPod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.servicesExternalClamavDistributed.freshclamPod | toYaml | nindent 4 }}
   podSecurityContext:
     enabled: true
     fsGroup: 101
@@ -135,10 +129,7 @@ icap:
     tag: {{ .Values.images.icap.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   podAnnotations:
-    intents.otterize.com/service-name: "clamav-icap"
-    {{- with .Values.annotations.servicesExternalClamavDistributed.icapPod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.servicesExternalClamavDistributed.icapPod | toYaml | nindent 4 }}
   podSecurityContext:
     enabled: true
     fsGroup: 101
@@ -178,10 +169,7 @@ milter:
     tag: {{ .Values.images.milter.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   podAnnotations:
-    intents.otterize.com/service-name: "clamav-milter"
-    {{- with .Values.annotations.servicesExternalClamavDistributed.milterPod }}
-    {{ . | toYaml | nindent 4 }}
-    {{- end }}
+    {{ .Values.annotations.servicesExternalClamavDistributed.milterPod | toYaml | nindent 4 }}
   podSecurityContext:
     enabled: true
     fsGroup: 101

helmfile/apps/services-external/values-clamav-simple.yaml.gotmpl

@@ -44,10 +44,7 @@ persistence:
     {{ .Values.annotations.servicesExternalClamavSimple.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: "clamav-simple"
-  {{- with .Values.annotations.servicesExternalClamavSimple.pod }}
-  {{ .  | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.servicesExternalClamavSimple.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true

helmfile/apps/services-external/values-dkimpy.yaml.gotmpl

@@ -30,10 +30,7 @@ image:
   imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
 podAnnotations:
-  intents.otterize.com/service-name: "dkimpy-milter"
-  {{- with .Values.annotations.servicesExternalDkimpy.service }}
-  {{ .  | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.servicesExternalDkimpy.service | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true

helmfile/apps/services-external/values-mariadb.yaml.gotmpl

@@ -78,7 +78,6 @@ persistence:
     {{ .Values.annotations.servicesExternalMariadb.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: "mariadb"
   argocd.argoproj.io/hook: "PostSync"
   argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
   {{- with .Values.annotations.servicesExternalMariadb.pod }}

helmfile/apps/services-external/values-memcached.yaml.gotmpl

@@ -34,10 +34,8 @@ image:
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
 podAnnotations:
-  intents.otterize.com/service-name: "memcached"
-  {{- with .Values.annotations.servicesExternalMemcached.pod }}
-  {{ .  | toYaml | nindent 2 }}
-  {{- end}}
+  {{ .Values.annotations.servicesExternalMemcached.pod | toYaml | nindent 2 }}
+
 replicaCount: {{ .Values.replicas.memcached }}
 
 resources:

helmfile/apps/services-external/values-minio.yaml.gotmpl

@@ -134,10 +134,7 @@ provisioning:
       withLock: false
     {{- end }}
   podAnnotations:
-    intents.otterize.com/service-name: "minio-provisioning"
-    {{- with .Values.annotations.servicesExternalMinio.provisioningPod }}
-    {{ .  | toYaml | nindent 4}}
-    {{- end }}
+    {{ .Values.annotations.servicesExternalMinio.provisioningPod | toYaml | nindent 4 }}
   policies:
     - name: "migrations-bucket-policy"
       statements:
@@ -274,10 +271,7 @@ provisioning:
     {{ .Values.resources.minio | toYaml | nindent 4 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: "minio"
-  {{- with .Values.annotations.servicesExternalMinio.pod }}
-  {{ . | toYaml | nindent 2 }}
-  {{- end }}
+  {{ .Values.annotations.servicesExternalMinio.pod | toYaml | nindent 2 }}
 
 readinessProbe:
   enabled: true

helmfile/apps/services-external/values-postfix.yaml.gotmpl

@@ -41,10 +41,7 @@ persistence:
     {{ .Values.annotations.servicesExternalPostfix.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: "postfix"
-  {{- with .Values.annotations.servicesExternalPostfix.pod }}
-  {{ . | toYaml | nindent 2}}
-  {{- end}}
+  {{ .Values.annotations.servicesExternalPostfix.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -110,6 +107,8 @@ postfix:
   virtualTransport: "lmtps:dovecot:24"
   {{- end }}
 
+podAnnotations: {}
+
 replicaCount: {{ .Values.replicas.postfix }}
 
 resources:

helmfile/apps/services-external/values-postgresql.yaml.gotmpl

@@ -115,7 +115,6 @@ persistence:
     {{ .Values.annotations.servicesExternalPostgresql.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
-  intents.otterize.com/service-name: "postgresql"
   argocd.argoproj.io/hook: "PostSync"
   argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
   {{- with .Values.annotations.servicesExternalPostgresql.pod}}

helmfile/apps/services-external/values-redis.yaml.gotmpl

@@ -44,10 +44,7 @@ master:
     annotations:
       {{ .Values.annotations.servicesExternalRedis.masterPersistence | toYaml | nindent 6 }}
   podAnnotations:
-    intents.otterize.com/service-name: "redis"
-    {{- with .Values.annotations.servicesExternalRedis.masterPod }}
-    {{ . | toYaml | nindent 4  }}
-    {{- end }}
+    {{ .Values.annotations.servicesExternalRedis.masterPod | toYaml | nindent 4 }}
   resources:
     {{ .Values.resources.redis | toYaml | nindent 4 }}
   service:

helmfile/environments/default/annotations.yaml.gotmpl

@@ -376,12 +376,7 @@ annotations:
     clamdPod: ~
     clamdService: ~
     clamdServiceAccount: ~
-    icapCommon: ~
-    icapPod: ~
-    icapService: ~
-    icapServiceAccount: ~
     freshclamCommon: ~
-    freshclamPod: ~
     freshclamService: ~
     freshclamServiceAccount: ~
     milterCommon: ~

publiccode.yml

@@ -22,8 +22,8 @@ name: "openDesk"
 platforms:
   - "web"
 developmentStatus: "stable"
-softwareVersion: "1.7.1"
-releaseDate: "2025-08-26"
+softwareVersion: "1.8.0"
+releaseDate: "2025-09-25"
 softwareType: "standalone/web"
 url: "https://gitlab.opencode.de/bmi/opendesk/"
 logo: ".opencode/openDesk-logo-rgb-color.svg"