Merge remote-tracking branch 'origin/develop' into drop-nginx

Author: mzglinski

README.md

@@ -28,6 +28,25 @@ The nginx container has been removed because it became a throughput bottleneck;
 
 Nginx Ingress and Traefik Ingress are currently supported, pull requests for other controllers are welcome!
 
+### Memcached chart switch
+
+This release replaces the Bitnami Memcached dependency with the CloudPirates Memcached chart (`oci://registry-1.docker.io/cloudpirates/memcached`). Values have changed accordingly:
+
+- `memcached.args` and `memcached.extraEnvVarsCM` were removed.
+- `memcached.memoryLimit` is now `memcached.config.memoryLimit` (value in MB).
+- `memcached.maxItemSize` must be configured via `memcached.config.extraArgs` using the `-I` flag.
+
+Example:
+
+```yaml
+memcached:
+  config:
+    memoryLimit: 2048
+    extraArgs:
+      - "-I"
+      - "26214400"
+```
+
 ## Upgrading to Chart 28.x.x
 
 ### Storage Configuration Changes

charts/sentry/Chart.lock

@@ -1,7 +1,7 @@
 dependencies:
 - name: memcached
-  repository: oci://registry-1.docker.io/bitnamicharts
-  version: 7.5.2
+  repository: oci://registry-1.docker.io/cloudpirates
+  version: 0.9.3
 - name: redis
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 17.11.3
@@ -17,5 +17,5 @@ dependencies:
 - name: postgresql
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 12.5.1
-digest: sha256:de4d1fe0376b9cf58359a3bda7b9e4de37550fabbec7a7fdee590930197007e0
-generated: "2026-01-15T19:48:02.035271776+01:00"
+digest: sha256:3b2af353f01602d3a9fdb7ff53ae38b637ffba0b1cc31d37f408b4946f3f2c60
+generated: "2026-01-29T11:11:21.880269392+01:00"

charts/sentry/Chart.yaml

@@ -7,8 +7,8 @@ version: 28.1.0
 appVersion: 26.1.0
 dependencies:
   - name: memcached
-    repository: oci://registry-1.docker.io/bitnamicharts
-    version: 7.5.2
+    repository: oci://registry-1.docker.io/cloudpirates
+    version: 0.9.3
     condition: sourcemaps.enabled
   - name: redis
     repository: oci://registry-1.docker.io/bitnamicharts

charts/sentry/README.md

@@ -322,16 +322,12 @@ Note: this table is incomplete, so have a look at the values.yaml in case you mi
 | mail.useSsl | bool | `false` |  |
 | mail.useTls | bool | `false` |  |
 | mail.username | string | `""` |  |
-| memcached.args[0] | string | `"memcached"` |  |
-| memcached.args[1] | string | `"-u memcached"` |  |
-| memcached.args[2] | string | `"-p 11211"` |  |
-| memcached.args[3] | string | `"-v"` |  |
-| memcached.args[4] | string | `"-m $(MEMCACHED_MEMORY_LIMIT)"` |  |
-| memcached.args[5] | string | `"-I $(MEMCACHED_MAX_ITEM_SIZE)"` |  |
-| memcached.extraEnvVarsCM | string | `"sentry-memcached"` |  |
-| memcached.maxItemSize | string | `"26214400"` |  |
-| memcached.memoryLimit | string | `"2048"` |  |
+| memcached.config.extraArgs[0] | string | `"-I"` |  |
+| memcached.config.extraArgs[1] | string | `"26214400"` |  |
+| memcached.config.memoryLimit | int | `2048` |  |
+| memcached.config.verbosity | int | `1` |  |
 | memcached.nodeSelector | object | `{}` |  |
+| memcached.tolerations | list | `[]` |  |
 | metrics.affinity | object | `{}` |  |
 | metrics.containerSecurityContext | object | `{}` |  |
 | metrics.enabled | bool | `false` |  |

charts/sentry/templates/configmap-memcached.yaml

@@ -707,7 +707,10 @@ sentry.conf.py: |-
   # Github #
   ##########
   {{- if .Values.github.existingSecretAppIdKey }}
-  SENTRY_OPTIONS['github-app.id'] = os.environ.get("GITHUB_APP_ID")
+  # GitHub App ID must be an integer (Sentry 26.x+)
+  _github_app_id = os.environ.get("GITHUB_APP_ID")
+  if _github_app_id:
+      SENTRY_OPTIONS['github-app.id'] = int(_github_app_id)
   {{- end }}
   {{- if .Values.github.existingSecretAppNameKey }}
   SENTRY_OPTIONS['github-app.name'] = os.environ.get("GITHUB_APP_NAME")

charts/sentry/templates/sentry/_helper-sentry.tpl

@@ -3052,21 +3052,13 @@ externalPostgresql:
   connMaxAge: 0
 
 memcached:
-  image:
-    repository: bitnamilegacy/memcached
-  metrics:
-    image:
-      repository: bitnamilegacy/memcached-exporter
-  memoryLimit: "2048"
-  maxItemSize: "26214400"
-  args:
-    - "memcached"
-    - "-u memcached"
-    - "-p 11211"
-    - "-v"
-    - "-m $(MEMCACHED_MEMORY_LIMIT)"
-    - "-I $(MEMCACHED_MAX_ITEM_SIZE)"
-  extraEnvVarsCM: "sentry-memcached"
+  config:
+    memoryLimit: 2048
+    verbosity: 1
+    extraArgs:
+      # memcached max item size
+      - "-I"
+      - "26214400"
   nodeSelector: {}
   tolerations: []