From c9ed02156e2c63976d4c80a094d68661747b71cd Mon Sep 17 00:00:00 2001
From: David Ragot <35502263+Dav-14@users.noreply.github.com>
Date: Thu, 17 Apr 2025 17:02:56 +0200
Subject: [PATCH 1/3] feat: handle pod annotations

---
 README.md                                      | 18 +++++++++---------
 charts/agent/Chart.lock                        |  6 +++---
 charts/agent/Chart.yaml                        |  2 +-
 charts/agent/README.md                         |  4 ++--
 charts/agent/templates/deployment.yaml         |  2 +-
 charts/agent/values.yaml                       |  3 +--
 charts/cloudprem/Chart.lock                    | 12 ++++++------
 charts/cloudprem/Chart.yaml                    |  2 +-
 charts/cloudprem/README.md                     |  6 +++++-
 charts/console-v3/Chart.lock                   |  6 +++---
 charts/console-v3/Chart.yaml                   |  2 +-
 charts/console-v3/README.md                    |  3 ++-
 charts/console-v3/templates/deployment.yaml    |  2 ++
 charts/console-v3/values.schema.json           |  4 ++++
 charts/console-v3/values.yaml                  |  3 +++
 charts/console/Chart.lock                      |  6 +++---
 charts/console/Chart.yaml                      |  2 +-
 charts/console/README.md                       |  3 ++-
 charts/console/templates/deployment.yaml       |  2 ++
 charts/console/values.schema.json              |  4 ++++
 charts/console/values.yaml                     |  3 +++
 charts/core/Chart.yaml                         |  2 +-
 charts/core/README.md                          |  2 +-
 charts/core/templates/_annotations.tpl         |  8 ++++++++
 charts/membership/Chart.lock                   |  6 +++---
 charts/membership/Chart.yaml                   |  2 +-
 charts/membership/README.md                    |  3 ++-
 .../templates/cronjob-gc-invitation.yaml       |  5 +++++
 charts/membership/templates/cronjob-gc.yaml    |  5 +++++
 .../templates/cronjob-stack-lifeycle.yaml      |  5 +++++
 charts/membership/templates/deployment.yaml    |  5 +++--
 charts/membership/templates/job.yaml           |  2 ++
 charts/membership/values.schema.json           |  4 ++++
 charts/membership/values.yaml                  |  3 +++
 charts/portal/Chart.lock                       |  6 +++---
 charts/portal/Chart.yaml                       |  2 +-
 charts/portal/README.md                        |  3 ++-
 charts/portal/templates/deployment.yaml        |  2 ++
 charts/portal/values.schema.json               |  4 ++++
 charts/portal/values.yaml                      |  3 +++
 charts/regions/Chart.lock                      |  6 +++---
 charts/regions/Chart.yaml                      |  2 +-
 charts/regions/README.md                       |  4 ++--
 charts/stargate/Chart.lock                     |  6 +++---
 charts/stargate/Chart.yaml                     |  2 +-
 charts/stargate/README.md                      |  3 ++-
 charts/stargate/templates/deployment.yaml      |  2 +-
 charts/stargate/values.yaml                    |  3 +++
 48 files changed, 133 insertions(+), 62 deletions(-)
 create mode 100644 charts/core/templates/_annotations.tpl

diff --git a/README.md b/README.md
index 3865d26f..b14d560b 100644
--- a/README.md
+++ b/README.md
@@ -4,16 +4,16 @@
 
 | Readme | Chart Version | App Version | Description | Hub |
 |--------|---------------|-------------|-------------|-----|
-| [Agent](./charts/agent/README.md) | 2.7.1 | v2.3.1 | Formance Membership Agent Helm Chart | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/agent)](https://artifacthub.io/packages/search?repo=agent) |
-| [Cloudprem](./charts/cloudprem/README.md) | 3.0.3 | v1.1.0 | Formance control-plane | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem) |
-| [Console](./charts/console/README.md) | 2.1.5 | console-on.v1.0.4 | Formance Console | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/console)](https://artifacthub.io/packages/search?repo=console) |
-| [Console-V3](./charts/console-v3/README.md) | 2.1.4 | v1.0.0 | Formance Console | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/console-v3)](https://artifacthub.io/packages/search?repo=console-v3) |
-| [Core](./charts/core/README.md) | 1.2.2 | latest | Formance Core Library | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/core)](https://artifacthub.io/packages/search?repo=core) |
+| [Agent](./charts/agent/README.md) | 2.8.0 | v2.3.1 | Formance Membership Agent Helm Chart | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/agent)](https://artifacthub.io/packages/search?repo=agent) |
+| [Cloudprem](./charts/cloudprem/README.md) | 3.1.0 | v1.1.0 | Formance control-plane | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem) |
+| [Console](./charts/console/README.md) | 2.2.0 | console-on.v1.0.4 | Formance Console | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/console)](https://artifacthub.io/packages/search?repo=console) |
+| [Console-V3](./charts/console-v3/README.md) | 2.2.0 | v1.0.0 | Formance Console | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/console-v3)](https://artifacthub.io/packages/search?repo=console-v3) |
+| [Core](./charts/core/README.md) | 1.3.0 | latest | Formance Core Library | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/core)](https://artifacthub.io/packages/search?repo=core) |
 | [Demo](./charts/demo/README.md) | 2.1.0 | latest | Formance Private Regions Demo | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/demo)](https://artifacthub.io/packages/search?repo=demo) |
-| [Membership](./charts/membership/README.md) | 2.4.0 | v1.3.2 | Formance EE Membership API. Manage stacks, organizations, regions, invitations, users, roles, and permissions. | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/membership)](https://artifacthub.io/packages/search?repo=membership) |
-| [Portal](./charts/portal/README.md) | 2.1.6 | v1.0.0 | Formance Portal | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/portal)](https://artifacthub.io/packages/search?repo=portal) |
-| [Regions](./charts/regions/README.md) | 2.16.1 | latest | Formance Private Regions Helm Chart | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/regions)](https://artifacthub.io/packages/search?repo=regions) |
-| [Stargate](./charts/stargate/README.md) | 0.7.3 | latest | Formance EE Stargate gRPC Gateway | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/stargate)](https://artifacthub.io/packages/search?repo=stargate) |
+| [Membership](./charts/membership/README.md) | 2.5.0 | v1.3.2 | Formance EE Membership API. Manage stacks, organizations, regions, invitations, users, roles, and permissions. | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/membership)](https://artifacthub.io/packages/search?repo=membership) |
+| [Portal](./charts/portal/README.md) | 2.2.0 | v1.0.0 | Formance Portal | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/portal)](https://artifacthub.io/packages/search?repo=portal) |
+| [Regions](./charts/regions/README.md) | 2.17.0 | latest | Formance Private Regions Helm Chart | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/regions)](https://artifacthub.io/packages/search?repo=regions) |
+| [Stargate](./charts/stargate/README.md) | 0.8.0 | latest | Formance EE Stargate gRPC Gateway | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/stargate)](https://artifacthub.io/packages/search?repo=stargate) |
 
 ## How to contribute
 
diff --git a/charts/agent/Chart.lock b/charts/agent/Chart.lock
index 2d9b8969..1d1cec3b 100644
--- a/charts/agent/Chart.lock
+++ b/charts/agent/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: core
   repository: file://../core
-  version: 1.2.2
-digest: sha256:6e6aa382da23362e4f4f25b292f76e91b0f6654554367d779b5991b621f485cd
-generated: "2025-02-18T17:30:21.817043+01:00"
+  version: 1.3.0
+digest: sha256:6969f5eab978f4be8d11b5a20301878a66202cdf000484dee9e1538e1fb58392
+generated: "2025-04-17T16:59:31.977828+02:00"
diff --git a/charts/agent/Chart.yaml b/charts/agent/Chart.yaml
index d53e09d7..ef334e72 100644
--- a/charts/agent/Chart.yaml
+++ b/charts/agent/Chart.yaml
@@ -12,7 +12,7 @@ maintainers:
 icon: "https://avatars.githubusercontent.com/u/84325077?s=200&v=4"
 
 type: application
-version: 2.7.1
+version: 2.8.0
 
 appVersion: "v2.3.1"
 
diff --git a/charts/agent/README.md b/charts/agent/README.md
index 614e34d0..923395f1 100644
--- a/charts/agent/README.md
+++ b/charts/agent/README.md
@@ -1,6 +1,6 @@
 # agent
 
-![Version: 2.7.1](https://img.shields.io/badge/Version-2.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.3.1](https://img.shields.io/badge/AppVersion-v2.3.1-informational?style=flat-square)
+![Version: 2.8.0](https://img.shields.io/badge/Version-2.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.3.1](https://img.shields.io/badge/AppVersion-v2.3.1-informational?style=flat-square)
 
 Formance Membership Agent Helm Chart
 
@@ -65,7 +65,7 @@ Formance Membership Agent Helm Chart
 | imagePullSecrets | list | `[]` |  |
 | nameOverride | string | `""` |  |
 | nodeSelector | object | `{}` |  |
-| podAnnotations | object | `{}` |  |
+| podAnnotations | object | `{}` | pod annotations |
 | podSecurityContext | object | `{}` |  |
 | resources.limits.cpu | string | `"100m"` |  |
 | resources.limits.memory | string | `"128Mi"` |  |
diff --git a/charts/agent/templates/deployment.yaml b/charts/agent/templates/deployment.yaml
index a602a7eb..e085e5f1 100644
--- a/charts/agent/templates/deployment.yaml
+++ b/charts/agent/templates/deployment.yaml
@@ -12,7 +12,7 @@ spec:
     type: Recreate
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- with merge .Values.podAnnotations (include "core.podAnnotations" . | fromYaml) }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/charts/agent/values.yaml b/charts/agent/values.yaml
index eac464dd..febd9412 100644
--- a/charts/agent/values.yaml
+++ b/charts/agent/values.yaml
@@ -50,6 +50,7 @@ serviceAccount:
   # Annotations to add to the service account
   annotations: {}
 
+# -- pod annotations
 podAnnotations: {}
 
 podSecurityContext: {}
@@ -112,8 +113,6 @@ agent:
     existingSecret: ""
     secretKeys:
       secret: ""
-
-
     # -- Public Region
     # mode: token
     # token: abcd
diff --git a/charts/cloudprem/Chart.lock b/charts/cloudprem/Chart.lock
index 68cbb894..794fcd84 100644
--- a/charts/cloudprem/Chart.lock
+++ b/charts/cloudprem/Chart.lock
@@ -1,15 +1,15 @@
 dependencies:
 - name: membership
   repository: file://../membership
-  version: 2.4.0
+  version: 2.5.0
 - name: portal
   repository: file://../portal
-  version: 2.1.6
+  version: 2.2.0
 - name: console
   repository: file://../console
-  version: 2.1.5
+  version: 2.2.0
 - name: console-v3
   repository: file://../console-v3
-  version: 2.1.4
-digest: sha256:5446af5f4582ef0cdc817d105eaa8d2976c0e3c6ce6b6dbe347ad23b33865771
-generated: "2025-03-14T15:04:37.345044+01:00"
+  version: 2.2.0
+digest: sha256:38ade7059e848707df86231941b09020a8867a02008573c27000df792a775ce3
+generated: "2025-04-17T16:59:40.600476+02:00"
diff --git a/charts/cloudprem/Chart.yaml b/charts/cloudprem/Chart.yaml
index f28d533f..b7d2525d 100644
--- a/charts/cloudprem/Chart.yaml
+++ b/charts/cloudprem/Chart.yaml
@@ -32,7 +32,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.0.3
+version: 3.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/cloudprem/README.md b/charts/cloudprem/README.md
index 04a0c455..afd4b9f0 100644
--- a/charts/cloudprem/README.md
+++ b/charts/cloudprem/README.md
@@ -1,7 +1,7 @@
 # Formance cloudprem Helm chart
 
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem)
-![Version: 3.0.3](https://img.shields.io/badge/Version-3.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.1.0](https://img.shields.io/badge/AppVersion-v1.1.0-informational?style=flat-square)
+![Version: 3.1.0](https://img.shields.io/badge/Version-3.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.1.0](https://img.shields.io/badge/AppVersion-v1.1.0-informational?style=flat-square)
 
 Formance control-plane
 
@@ -563,6 +563,7 @@ Dex:
 | console.ingress.tls | list | `[]` | ingress tls |
 | console.livenessProbe | object | `{}` | Console liveness probe |
 | console.nodeSelector | object | `{}` | Console node selector |
+| console.podAnnotations | object | `{}` | pod annotations |
 | console.podDisruptionBudget.enabled | bool | `false` | Enable pod disruption budget |
 | console.podDisruptionBudget.maxUnavailable | int | `0` | Maximum unavailable pods |
 | console.podDisruptionBudget.minAvailable | int | `1` | Minimum available pods |
@@ -617,6 +618,7 @@ Dex:
 | console-v3.ingress.tls | list | `[]` | ingress tls |
 | console-v3.livenessProbe | object | `{}` | Console liveness probe |
 | console-v3.nodeSelector | object | `{}` | Console node selector |
+| console-v3.podAnnotations | object | `{}` | pod annotations |
 | console-v3.podDisruptionBudget.enabled | bool | `false` | Enable pod disruption budget |
 | console-v3.podDisruptionBudget.maxUnavailable | int | `0` | Maximum unavailable pods |
 | console-v3.podDisruptionBudget.minAvailable | int | `1` | Minimum available pods |
@@ -694,6 +696,7 @@ Dex:
 | membership.initContainers | list | `[]` | Membership init containers |
 | membership.nameOverride | string | `""` | Membership name override |
 | membership.nodeSelector | object | `{}` | Membership node selector |
+| membership.podAnnotations | object | `{}` | pod annotations |
 | membership.podDisruptionBudget.enabled | bool | `false` | Enable pod disruption budget |
 | membership.podDisruptionBudget.maxUnavailable | int | `0` | Maximum unavailable pods |
 | membership.podDisruptionBudget.minAvailable | int | `1` | Minimum available pods |
@@ -745,6 +748,7 @@ Dex:
 | portal.ingress.tls | list | `[]` | ingress tls |
 | portal.livenessProbe | object | `{}` | Portal liveness probe |
 | portal.nodeSelector | object | `{}` | Portal node selector |
+| portal.podAnnotations | object | `{}` | pod annotations |
 | portal.podDisruptionBudget.enabled | bool | `false` | Enable pod disruption budget |
 | portal.podDisruptionBudget.maxUnavailable | int | `0` | Maximum unavailable pods |
 | portal.podDisruptionBudget.minAvailable | int | `1` | Minimum available pods |
diff --git a/charts/console-v3/Chart.lock b/charts/console-v3/Chart.lock
index be1e41e2..7204a6db 100644
--- a/charts/console-v3/Chart.lock
+++ b/charts/console-v3/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: core
   repository: file://../core
-  version: 1.2.2
-digest: sha256:6e6aa382da23362e4f4f25b292f76e91b0f6654554367d779b5991b621f485cd
-generated: "2025-02-18T17:30:48.939795+01:00"
+  version: 1.3.0
+digest: sha256:6969f5eab978f4be8d11b5a20301878a66202cdf000484dee9e1538e1fb58392
+generated: "2025-04-17T17:00:00.73713+02:00"
diff --git a/charts/console-v3/Chart.yaml b/charts/console-v3/Chart.yaml
index 04631a03..46542b08 100644
--- a/charts/console-v3/Chart.yaml
+++ b/charts/console-v3/Chart.yaml
@@ -29,7 +29,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.4
+version: 2.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/console-v3/README.md b/charts/console-v3/README.md
index fadb07b1..00337b56 100644
--- a/charts/console-v3/README.md
+++ b/charts/console-v3/README.md
@@ -1,6 +1,6 @@
 # console-v3
 
-![Version: 2.1.4](https://img.shields.io/badge/Version-2.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
+![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
 
 Formance Console
 
@@ -105,6 +105,7 @@ Kubernetes: `>=1.14.0-0`
 | ingress.tls | list | `[]` | ingress tls |
 | livenessProbe | object | `{}` | Console liveness probe |
 | nodeSelector | object | `{}` | Console node selector |
+| podAnnotations | object | `{}` | pod annotations |
 | podDisruptionBudget.enabled | bool | `false` | Enable pod disruption budget |
 | podDisruptionBudget.maxUnavailable | int | `0` | Maximum unavailable pods |
 | podDisruptionBudget.minAvailable | int | `1` | Minimum available pods |
diff --git a/charts/console-v3/templates/deployment.yaml b/charts/console-v3/templates/deployment.yaml
index 21be61af..d24735a9 100644
--- a/charts/console-v3/templates/deployment.yaml
+++ b/charts/console-v3/templates/deployment.yaml
@@ -18,6 +18,8 @@ spec:
     metadata:
       labels:
         {{- include "core.selectorLabels" . | nindent 8 }}
+      annotations:
+        {{- include "core.podAnnotations" . | nindent 8 }}
     spec:
       serviceAccountName:  {{ include "core.serviceAccountName" . }}
       {{- with .Values.imagePullSecrets }}
diff --git a/charts/console-v3/values.schema.json b/charts/console-v3/values.schema.json
index 42d71629..15498034 100644
--- a/charts/console-v3/values.schema.json
+++ b/charts/console-v3/values.schema.json
@@ -324,6 +324,10 @@
             "properties": {},
             "type": "object"
         },
+        "podAnnotations": {
+            "properties": {},
+            "type": "object"
+        },
         "podDisruptionBudget": {
             "properties": {
                 "enabled": {
diff --git a/charts/console-v3/values.yaml b/charts/console-v3/values.yaml
index c1900fb2..deef3a07 100644
--- a/charts/console-v3/values.yaml
+++ b/charts/console-v3/values.yaml
@@ -89,6 +89,9 @@ global:
 # -- Number of replicas
 replicas: 1
 
+# -- pod annotations
+podAnnotations: {}
+
 podDisruptionBudget:
   # -- Enable pod disruption budget
   enabled: false
diff --git a/charts/console/Chart.lock b/charts/console/Chart.lock
index 6d640bfb..cff654bc 100644
--- a/charts/console/Chart.lock
+++ b/charts/console/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: core
   repository: file://../core
-  version: 1.2.2
-digest: sha256:6e6aa382da23362e4f4f25b292f76e91b0f6654554367d779b5991b621f485cd
-generated: "2025-02-18T17:30:30.022209+01:00"
+  version: 1.3.0
+digest: sha256:6969f5eab978f4be8d11b5a20301878a66202cdf000484dee9e1538e1fb58392
+generated: "2025-04-17T16:59:49.90889+02:00"
diff --git a/charts/console/Chart.yaml b/charts/console/Chart.yaml
index 654056bf..526c9b37 100644
--- a/charts/console/Chart.yaml
+++ b/charts/console/Chart.yaml
@@ -22,7 +22,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.5
+version: 2.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/console/README.md b/charts/console/README.md
index 4bda45a0..540ee388 100644
--- a/charts/console/README.md
+++ b/charts/console/README.md
@@ -1,6 +1,6 @@
 # console
 
-![Version: 2.1.5](https://img.shields.io/badge/Version-2.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: console-on.v1.0.4](https://img.shields.io/badge/AppVersion-console--on.v1.0.4-informational?style=flat-square)
+![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: console-on.v1.0.4](https://img.shields.io/badge/AppVersion-console--on.v1.0.4-informational?style=flat-square)
 
 Formance Console
 
@@ -102,6 +102,7 @@ Kubernetes: `>=1.14.0-0`
 | ingress.tls | list | `[]` | ingress tls |
 | livenessProbe | object | `{}` | Console liveness probe |
 | nodeSelector | object | `{}` | Console node selector |
+| podAnnotations | object | `{}` | pod annotations |
 | podDisruptionBudget.enabled | bool | `false` | Enable pod disruption budget |
 | podDisruptionBudget.maxUnavailable | int | `0` | Maximum unavailable pods |
 | podDisruptionBudget.minAvailable | int | `1` | Minimum available pods |
diff --git a/charts/console/templates/deployment.yaml b/charts/console/templates/deployment.yaml
index 8a0afacb..adfe185c 100644
--- a/charts/console/templates/deployment.yaml
+++ b/charts/console/templates/deployment.yaml
@@ -18,6 +18,8 @@ spec:
     metadata:
       labels:
         {{- include "core.selectorLabels" . | nindent 8 }}
+      annotations:
+        {{- include "core.podAnnotations" . | nindent 8 }}
     spec:
       serviceAccountName:  {{ include "core.serviceAccountName" . }}
       {{- with .Values.imagePullSecrets }}
diff --git a/charts/console/values.schema.json b/charts/console/values.schema.json
index bfba990e..2a2b0c29 100644
--- a/charts/console/values.schema.json
+++ b/charts/console/values.schema.json
@@ -324,6 +324,10 @@
             "properties": {},
             "type": "object"
         },
+        "podAnnotations": {
+            "properties": {},
+            "type": "object"
+        },
         "podDisruptionBudget": {
             "properties": {
                 "enabled": {
diff --git a/charts/console/values.yaml b/charts/console/values.yaml
index 7fe8cc9c..bf06bbda 100644
--- a/charts/console/values.yaml
+++ b/charts/console/values.yaml
@@ -106,6 +106,9 @@ podDisruptionBudget:
   # -- Maximum unavailable pods
   maxUnavailable: 0
 
+# -- pod annotations
+podAnnotations: {}
+
 # -- Pod Security Context
 podSecurityContext: {}
 
diff --git a/charts/core/Chart.yaml b/charts/core/Chart.yaml
index 386d9b94..5ab4e0bb 100644
--- a/charts/core/Chart.yaml
+++ b/charts/core/Chart.yaml
@@ -15,5 +15,5 @@ sources:
 - "https://github.com/formancehq/helm/charts/core"
 
 type: library
-version: 1.2.2
+version: 1.3.0
 appVersion: "latest"
diff --git a/charts/core/README.md b/charts/core/README.md
index 3eb53c64..6ee20fcd 100644
--- a/charts/core/README.md
+++ b/charts/core/README.md
@@ -1,6 +1,6 @@
 # Formance core Library
 
-![Version: 1.2.2](https://img.shields.io/badge/Version-1.2.2-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 Formance Core Library
 
 **Homepage:** <https://formance.com>
diff --git a/charts/core/templates/_annotations.tpl b/charts/core/templates/_annotations.tpl
new file mode 100644
index 00000000..097f17de
--- /dev/null
+++ b/charts/core/templates/_annotations.tpl
@@ -0,0 +1,8 @@
+{{/*
+  Annotations template for the core chart.
+*/}}
+{{- define "core.podAnnotations" -}}
+{{ with .Values.podAnnotations }}
+{{ toYaml . }}
+{{- end }}
+{{- end }}
diff --git a/charts/membership/Chart.lock b/charts/membership/Chart.lock
index babd4fc4..e0092722 100644
--- a/charts/membership/Chart.lock
+++ b/charts/membership/Chart.lock
@@ -7,6 +7,6 @@ dependencies:
   version: 0.17.1
 - name: core
   repository: file://../core
-  version: 1.2.2
-digest: sha256:5cc9ad217fbd9f3b6d469dc9ad3b522c699d4cbd91790a39ec38de06b6742356
-generated: "2025-02-18T17:31:00.856452+01:00"
+  version: 1.3.0
+digest: sha256:7ac93221cdb0fb1cf049a3eaa290482e3d918fd6b23bc8dc6d3f0e2646de2417
+generated: "2025-04-17T16:58:33.637151+02:00"
diff --git a/charts/membership/Chart.yaml b/charts/membership/Chart.yaml
index 864f1c65..9fd91fdc 100644
--- a/charts/membership/Chart.yaml
+++ b/charts/membership/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.4.0
+version: 2.5.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/membership/README.md b/charts/membership/README.md
index e2270195..8e5c2345 100644
--- a/charts/membership/README.md
+++ b/charts/membership/README.md
@@ -1,6 +1,6 @@
 # Formance membership Helm chart
 
-![Version: 2.4.0](https://img.shields.io/badge/Version-2.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.3.2](https://img.shields.io/badge/AppVersion-v1.3.2-informational?style=flat-square)
+![Version: 2.5.0](https://img.shields.io/badge/Version-2.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.3.2](https://img.shields.io/badge/AppVersion-v1.3.2-informational?style=flat-square)
 Formance EE Membership API. Manage stacks, organizations, regions, invitations, users, roles, and permissions.
 
 ## Requirements
@@ -238,6 +238,7 @@ Membership chart now use `.global.platform.<service>.oauth.client` to generate a
 | initContainers | list | `[]` | Membership init containers |
 | nameOverride | string | `""` | Membership name override |
 | nodeSelector | object | `{}` | Membership node selector |
+| podAnnotations | object | `{}` | pod annotations |
 | podDisruptionBudget.enabled | bool | `false` | Enable pod disruption budget |
 | podDisruptionBudget.maxUnavailable | int | `0` | Maximum unavailable pods |
 | podDisruptionBudget.minAvailable | int | `1` | Minimum available pods |
diff --git a/charts/membership/templates/cronjob-gc-invitation.yaml b/charts/membership/templates/cronjob-gc-invitation.yaml
index 43a4f02e..22b2024b 100644
--- a/charts/membership/templates/cronjob-gc-invitation.yaml
+++ b/charts/membership/templates/cronjob-gc-invitation.yaml
@@ -14,6 +14,11 @@ spec:
   jobTemplate:
     spec:
       template:
+        metadata:
+          labels:
+            {{- include "core.selectorLabels" . | nindent 12 }}
+          annotations:
+            {{- include "core.podAnnotations" . | nindent 12 }}
         spec:
           serviceAccountName:  {{ include "core.serviceAccountName" . }}
           restartPolicy: {{ .Values.config.job.invitationGC.restartPolicy }}
diff --git a/charts/membership/templates/cronjob-gc.yaml b/charts/membership/templates/cronjob-gc.yaml
index 546b7105..6c52bc38 100644
--- a/charts/membership/templates/cronjob-gc.yaml
+++ b/charts/membership/templates/cronjob-gc.yaml
@@ -15,6 +15,11 @@ spec:
   jobTemplate:
     spec:
       template:
+        metadata:
+          labels:
+            {{- include "core.selectorLabels" . | nindent 12 }}
+          annotations:
+            {{- include "core.podAnnotations" . | nindent 12 }}
         spec:
           serviceAccountName:  {{ include "core.serviceAccountName" . }}
           restartPolicy: {{ .Values.config.job.garbageCollector.restartPolicy }}
diff --git a/charts/membership/templates/cronjob-stack-lifeycle.yaml b/charts/membership/templates/cronjob-stack-lifeycle.yaml
index 83650c80..396fda1b 100644
--- a/charts/membership/templates/cronjob-stack-lifeycle.yaml
+++ b/charts/membership/templates/cronjob-stack-lifeycle.yaml
@@ -18,6 +18,11 @@ spec:
         {{- include "core.selectorLabels" . | nindent 8 }}
     spec:
       template:
+        metadata:
+          labels:
+            {{- include "core.selectorLabels" . | nindent 12 }}
+          annotations:
+            {{- include "core.podAnnotations" . | nindent 12 }}
         spec:
           securityContext:
             {{- toYaml .Values.podSecurityContext | nindent 12 }}
diff --git a/charts/membership/templates/deployment.yaml b/charts/membership/templates/deployment.yaml
index 0c5a754e..db7ef374 100644
--- a/charts/membership/templates/deployment.yaml
+++ b/charts/membership/templates/deployment.yaml
@@ -18,10 +18,11 @@ spec:
       {{- include "core.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
       labels:
         {{- include "core.selectorLabels" . | nindent 8 }}
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        {{- include "core.podAnnotations" . | nindent 8 }}
     spec:
       serviceAccountName: {{ include "core.serviceAccountName" . }}
       {{- with .Values.imagePullSecrets }}
diff --git a/charts/membership/templates/job.yaml b/charts/membership/templates/job.yaml
index e01427f0..4b34481d 100644
--- a/charts/membership/templates/job.yaml
+++ b/charts/membership/templates/job.yaml
@@ -16,6 +16,8 @@ spec:
     metadata:
       labels:
         {{- include "core.selectorLabels" . | nindent 8 }}
+      annotations:
+        {{- include "core.podAnnotations" . | nindent 8 }}
     spec:
       restartPolicy: OnFailure
       securityContext:
diff --git a/charts/membership/values.schema.json b/charts/membership/values.schema.json
index abbcae9d..d059cb5e 100644
--- a/charts/membership/values.schema.json
+++ b/charts/membership/values.schema.json
@@ -973,6 +973,10 @@
             "properties": {},
             "type": "object"
         },
+        "podAnnotations": {
+            "properties": {},
+            "type": "object"
+        },
         "podDisruptionBudget": {
             "properties": {
                 "enabled": {
diff --git a/charts/membership/values.yaml b/charts/membership/values.yaml
index 20e7394d..53cebd74 100644
--- a/charts/membership/values.yaml
+++ b/charts/membership/values.yaml
@@ -207,6 +207,9 @@ global:
 # -- Count of replicas
 replicaCount: 1
 
+# -- pod annotations
+podAnnotations: {}
+
 podDisruptionBudget:
   # -- Enable pod disruption budget
   enabled: false
diff --git a/charts/portal/Chart.lock b/charts/portal/Chart.lock
index 7549dc21..d753492f 100644
--- a/charts/portal/Chart.lock
+++ b/charts/portal/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: core
   repository: file://../core
-  version: 1.2.2
-digest: sha256:6e6aa382da23362e4f4f25b292f76e91b0f6654554367d779b5991b621f485cd
-generated: "2025-02-18T17:31:08.324286+01:00"
+  version: 1.3.0
+digest: sha256:6969f5eab978f4be8d11b5a20301878a66202cdf000484dee9e1538e1fb58392
+generated: "2025-04-17T16:58:45.782243+02:00"
diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml
index 05cab9b0..275c0e32 100644
--- a/charts/portal/Chart.yaml
+++ b/charts/portal/Chart.yaml
@@ -23,7 +23,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.6
+version: 2.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/portal/README.md b/charts/portal/README.md
index 9124413e..16841eae 100644
--- a/charts/portal/README.md
+++ b/charts/portal/README.md
@@ -1,6 +1,6 @@
 # portal
 
-![Version: 2.1.6](https://img.shields.io/badge/Version-2.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
+![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
 
 Formance Portal
 
@@ -105,6 +105,7 @@ Kubernetes: `>=1.14.0-0`
 | ingress.tls | list | `[]` | ingress tls |
 | livenessProbe | object | `{}` | Portal liveness probe |
 | nodeSelector | object | `{}` | Portal node selector |
+| podAnnotations | object | `{}` | pod annotations |
 | podDisruptionBudget.enabled | bool | `false` | Enable pod disruption budget |
 | podDisruptionBudget.maxUnavailable | int | `0` | Maximum unavailable pods |
 | podDisruptionBudget.minAvailable | int | `1` | Minimum available pods |
diff --git a/charts/portal/templates/deployment.yaml b/charts/portal/templates/deployment.yaml
index a8d0bacd..0626a924 100644
--- a/charts/portal/templates/deployment.yaml
+++ b/charts/portal/templates/deployment.yaml
@@ -18,6 +18,8 @@ spec:
     metadata:
       labels:
         {{- include "core.selectorLabels" . | nindent 8 }}
+      annotations:
+        {{- include "core.podAnnotations" . | nindent 8 }}
     spec:
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
diff --git a/charts/portal/values.schema.json b/charts/portal/values.schema.json
index ff0f2856..3fc66c4a 100644
--- a/charts/portal/values.schema.json
+++ b/charts/portal/values.schema.json
@@ -363,6 +363,10 @@
             "properties": {},
             "type": "object"
         },
+        "podAnnotations": {
+            "properties": {},
+            "type": "object"
+        },
         "podDisruptionBudget": {
             "properties": {
                 "enabled": {
diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml
index eaa3c001..68c3db4d 100644
--- a/charts/portal/values.yaml
+++ b/charts/portal/values.yaml
@@ -110,6 +110,9 @@ global:
 # -- Number of replicas
 replicas: 1
 
+# -- pod annotations
+podAnnotations: {}
+
 podDisruptionBudget:
   # -- Enable pod disruption budget
   enabled: false
diff --git a/charts/regions/Chart.lock b/charts/regions/Chart.lock
index a5428d5f..2b888879 100644
--- a/charts/regions/Chart.lock
+++ b/charts/regions/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: agent
   repository: file://../agent
-  version: 2.7.1
+  version: 2.8.0
 - name: operator
   repository: oci://ghcr.io/formancehq/helm
   version: 2.11.0
-digest: sha256:cc92ce96464b78b339d6964be78783de16310b2d9a64d07a89296ca020af1d6b
-generated: "2025-04-11T10:47:54.147104+02:00"
+digest: sha256:eb6a31391f02223111790792a7d066b40cc68ee4f87c764fe7a9ae9608e59edd
+generated: "2025-04-17T16:58:55.233392+02:00"
diff --git a/charts/regions/Chart.yaml b/charts/regions/Chart.yaml
index 0607a743..081aff41 100644
--- a/charts/regions/Chart.yaml
+++ b/charts/regions/Chart.yaml
@@ -11,7 +11,7 @@ maintainers:
 icon: "https://avatars.githubusercontent.com/u/84325077?s=200&v=4"
 
 type: application
-version: 2.16.1
+version: 2.17.0
 appVersion: "latest"
 
 dependencies:
diff --git a/charts/regions/README.md b/charts/regions/README.md
index cc84c7a8..4ce5c753 100644
--- a/charts/regions/README.md
+++ b/charts/regions/README.md
@@ -1,6 +1,6 @@
 # Formance regions Helm chart
 
-![Version: 2.16.1](https://img.shields.io/badge/Version-2.16.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: 2.17.0](https://img.shields.io/badge/Version-2.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 Formance Private Regions Helm Chart
 
 ## Requirements
@@ -173,7 +173,7 @@ Then configure it through the `global.licence.token` and `global.licence.cluster
 | agent.imagePullSecrets | list | `[]` |  |
 | agent.nameOverride | string | `""` |  |
 | agent.nodeSelector | object | `{}` |  |
-| agent.podAnnotations | object | `{}` |  |
+| agent.podAnnotations | object | `{}` | pod annotations |
 | agent.podSecurityContext | object | `{}` |  |
 | agent.resources.limits.cpu | string | `"100m"` |  |
 | agent.resources.limits.memory | string | `"128Mi"` |  |
diff --git a/charts/stargate/Chart.lock b/charts/stargate/Chart.lock
index 4b919b6c..2a439d15 100644
--- a/charts/stargate/Chart.lock
+++ b/charts/stargate/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: core
   repository: file://../core
-  version: 1.2.2
+  version: 1.3.0
 - name: postgresql
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 15.5.38
-digest: sha256:15ab492147b217fc9b55ffe55aa0a3c4b95044a2de11d74ff2c49b0c4c8d3586
-generated: "2025-02-18T17:31:17.992767+01:00"
+digest: sha256:9ddd328f8a1c2fdb6a3fdfa390bb7a72b8e08ee7efb6b305528694b83cd0802e
+generated: "2025-04-17T16:59:05.32634+02:00"
diff --git a/charts/stargate/Chart.yaml b/charts/stargate/Chart.yaml
index fbea73c2..eaa829cf 100644
--- a/charts/stargate/Chart.yaml
+++ b/charts/stargate/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.7.3
+version: 0.8.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/stargate/README.md b/charts/stargate/README.md
index 8cb95ec3..57ef08a3 100644
--- a/charts/stargate/README.md
+++ b/charts/stargate/README.md
@@ -1,6 +1,6 @@
 # Formance stargate Helm chart
 
-![Version: 0.7.3](https://img.shields.io/badge/Version-0.7.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: 0.8.0](https://img.shields.io/badge/Version-0.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 Formance EE Stargate gRPC Gateway
 
 ## Requirements
@@ -112,6 +112,7 @@ Then configure it through the `global.licence.token` and `global.licence.cluster
 | ingress.tls | list | `[]` |  |
 | nameOverride | string | `""` | String to partially override stargate.fullname template with a string (will append the release name) |
 | nodeSelector | object | `{}` |  |
+| podAnnotations | object | `{}` | pod annotations |
 | podAnnotations | object | `{}` | Annotations to add to the pod |
 | podDisruptionBudget.enabled | bool | `false` | Enable a [pod distruption budget](https://kubernetes.io/docs/tasks/run-application/configure-pdb/) to help dealing with [disruptions](https://kubernetes.io/docs/concepts/workloads/pods/disruptions/). It is **highly recommended** for webhooks as disruptions can prevent launching new pods. |
 | podDisruptionBudget.maxUnavailable | int | `0` |  |
diff --git a/charts/stargate/templates/deployment.yaml b/charts/stargate/templates/deployment.yaml
index 615171ca..594d36ee 100644
--- a/charts/stargate/templates/deployment.yaml
+++ b/charts/stargate/templates/deployment.yaml
@@ -13,7 +13,7 @@ spec:
       {{- include "core.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- with merge .Values.podAnnotations (include "core.podAnnotations" . | fromYaml) }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/charts/stargate/values.yaml b/charts/stargate/values.yaml
index d2e2f644..8f03dd58 100644
--- a/charts/stargate/values.yaml
+++ b/charts/stargate/values.yaml
@@ -136,6 +136,9 @@ global:
         # @section -- Global configuration
         postgresql: 5432
 
+# -- pod annotations
+podAnnotations: {}
+
 podDisruptionBudget:
   # -- Enable a [pod distruption budget](https://kubernetes.io/docs/tasks/run-application/configure-pdb/) to help dealing with [disruptions](https://kubernetes.io/docs/concepts/workloads/pods/disruptions/).
   # It is **highly recommended** for webhooks as disruptions can prevent launching new pods.

From 94b4c46769866c2a4f6c800e9a1461879880177d Mon Sep 17 00:00:00 2001
From: David Ragot <35502263+Dav-14@users.noreply.github.com>
Date: Thu, 17 Apr 2025 17:17:15 +0200
Subject: [PATCH 2/3] feat: bump operator chart deps

---
 charts/core/templates/_annotations.tpl | 4 ++--
 charts/regions/Chart.lock              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/core/templates/_annotations.tpl b/charts/core/templates/_annotations.tpl
index 097f17de..b75d11e8 100644
--- a/charts/core/templates/_annotations.tpl
+++ b/charts/core/templates/_annotations.tpl
@@ -2,7 +2,7 @@
   Annotations template for the core chart.
 */}}
 {{- define "core.podAnnotations" -}}
-{{ with .Values.podAnnotations }}
-{{ toYaml . }}
+{{- with .Values.podAnnotations }}
+{{- toYaml . }}
 {{- end }}
 {{- end }}
diff --git a/charts/regions/Chart.lock b/charts/regions/Chart.lock
index 2b888879..50cca6bc 100644
--- a/charts/regions/Chart.lock
+++ b/charts/regions/Chart.lock
@@ -4,6 +4,6 @@ dependencies:
   version: 2.8.0
 - name: operator
   repository: oci://ghcr.io/formancehq/helm
-  version: 2.11.0
-digest: sha256:eb6a31391f02223111790792a7d066b40cc68ee4f87c764fe7a9ae9608e59edd
-generated: "2025-04-17T16:58:55.233392+02:00"
+  version: 2.12.0
+digest: sha256:017ee3dd2d5c13588640b93c750a5bb2d132d58bbec9cf138cecd2616c0d4d9f
+generated: "2025-04-17T17:13:07.933083+02:00"

From cb5f127d722833bcb0a9bda471a40f97e771f0a8 Mon Sep 17 00:00:00 2001
From: David Ragot <35502263+Dav-14@users.noreply.github.com>
Date: Thu, 17 Apr 2025 17:23:46 +0200
Subject: [PATCH 3/3] fix: duplicate values

---
 charts/stargate/README.md   | 1 -
 charts/stargate/values.yaml | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/charts/stargate/README.md b/charts/stargate/README.md
index 57ef08a3..709c3a84 100644
--- a/charts/stargate/README.md
+++ b/charts/stargate/README.md
@@ -112,7 +112,6 @@ Then configure it through the `global.licence.token` and `global.licence.cluster
 | ingress.tls | list | `[]` |  |
 | nameOverride | string | `""` | String to partially override stargate.fullname template with a string (will append the release name) |
 | nodeSelector | object | `{}` |  |
-| podAnnotations | object | `{}` | pod annotations |
 | podAnnotations | object | `{}` | Annotations to add to the pod |
 | podDisruptionBudget.enabled | bool | `false` | Enable a [pod distruption budget](https://kubernetes.io/docs/tasks/run-application/configure-pdb/) to help dealing with [disruptions](https://kubernetes.io/docs/concepts/workloads/pods/disruptions/). It is **highly recommended** for webhooks as disruptions can prevent launching new pods. |
 | podDisruptionBudget.maxUnavailable | int | `0` |  |
diff --git a/charts/stargate/values.yaml b/charts/stargate/values.yaml
index 8f03dd58..d2e2f644 100644
--- a/charts/stargate/values.yaml
+++ b/charts/stargate/values.yaml
@@ -136,9 +136,6 @@ global:
         # @section -- Global configuration
         postgresql: 5432
 
-# -- pod annotations
-podAnnotations: {}
-
 podDisruptionBudget:
   # -- Enable a [pod distruption budget](https://kubernetes.io/docs/tasks/run-application/configure-pdb/) to help dealing with [disruptions](https://kubernetes.io/docs/concepts/workloads/pods/disruptions/).
   # It is **highly recommended** for webhooks as disruptions can prevent launching new pods.