Skip to content

Commit

Permalink
feat: Upgrade sentry to 24.2.0 (#912)
Browse files Browse the repository at this point in the history
* Upgrade sentry to 24.2.0

This has a ton of changes, but all seem functional after testing.  The big issue is they borked a db migration and didn't actually fix it, so this is going to need to be a breaking change.

Details here: getsentry/self-hosted#2758

* possibly working migration cleanup

* remove breaking: true
  • Loading branch information
michaeljguarino authored May 20, 2024
1 parent e936d16 commit b4baff6
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 10 deletions.
6 changes: 3 additions & 3 deletions sentry/helm/sentry/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies:
- name: sentry
repository: https://pluralsh.github.io/plural-helm-charts
version: 19.4.0-plural2
version: 19.4.1-plural
- name: postgres
repository: https://pluralsh.github.io/module-library
version: 0.2.1
Expand All @@ -14,5 +14,5 @@ dependencies:
- name: runbook
repository: https://pluralsh.github.io/module-library
version: 0.1.1
digest: sha256:2dfac5d86335400389a3535ec23bf866c9e95772aa96c52e926ac0fe4f0eb7cb
generated: "2023-11-16T14:34:25.463823-05:00"
digest: sha256:4d625168ccf5ae0877bad47b01c4d547c5178b379e8152ab67a46de5ddc031fb
generated: "2024-05-15T20:15:49.992956-04:00"
6 changes: 3 additions & 3 deletions sentry/helm/sentry/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ apiVersion: v2
name: sentry
description: A Helm chart for deploying sentry on plural
type: application
version: 0.3.4
appVersion: "23.6.1"
version: 0.3.6
appVersion: "24.2.0"
dependencies:
- name: sentry
version: 19.4.0-plural2
version: 19.4.1-plural
repository: https://pluralsh.github.io/plural-helm-charts
- name: postgres
version: 0.2.1
Expand Down
Binary file removed sentry/helm/sentry/charts/sentry-19.4.0-plural2.tgz
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions sentry/helm/sentry/deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
application: true
description: Deploys sentry crafted for the target cloud
spec:
breaking: true
dependencies:
- type: helm
name: bootstrap
Expand Down
43 changes: 43 additions & 0 deletions sentry/helm/sentry/templates/job.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
apiVersion: batch/v1
kind: Job
metadata:
name: sentry-migration-cleanup
annotations:
# This is what defines this resource as a hook. Without this line, the
# job is considered part of the release.
"helm.sh/hook": "post-install,post-upgrade"
"helm.sh/hook-delete-policy": "hook-succeeded,before-hook-creation"
"helm.sh/hook-weight": "5"
spec:
backoffLimit: 5
template:
metadata:
name: sentry-migration-cleanup
spec:
restartPolicy: Never
containers:
- name: db-cleanup-job
image: postgres:13-alpine
imagePullPolicy: IfNotPresent
command:
- /bin/sh
- -c
- |
indexes=$(psql -qaAt -P pager=off -c "SELECT indexname, indexdef FROM pg_indexes WHERE tablename = 'sentry_groupedmessage';")
if [[ $indexes == *"sentry_groupedmessage_project_id_id_515aaa7e_uniq"* ]]; then
psql -qAt -c "DROP INDEX sentry_groupedmessage_project_id_id_515aaa7e_uniq;"
fi
env:
- name: PGPASSWORD
valueFrom:
secretKeyRef:
name: {{ .Values.sentry.externalPostgresql.existingSecret }}
key: {{ .Values.sentry.externalPostgresql.existingSecretKey }}
- name: PGHOST
value: {{ .Values.sentry.externalPostgresql.host }}
- name: PGUSER
value: {{ .Values.sentry.externalPostgresql.username }}
- name: PGDATABASE
value: {{ .Values.sentry.externalPostgresql.database }}
- name: PGSSLMODE
value: {{ .Values.sentry.externalPostgresql.sslMode }}
27 changes: 23 additions & 4 deletions sentry/helm/sentry/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -196,16 +196,16 @@ sentry:
images:
symbolicator:
repository: dkr.plural.sh/sentry/getsentry/symbolicator
tag: 23.6.1
tag: 24.2.0
snuba:
repository: dkr.plural.sh/sentry/getsentry/snuba
tag: 23.6.1
tag: 24.2.0
sentry:
repository: dkr.plural.sh/sentry/getsentry/sentry
tag: 23.6.1-plural3.1.1
tag: 24.2.0-plural3.9.0
relay:
repository: dkr.plural.sh/sentry/getsentry/relay
tag: 23.6.1
tag: 24.2.0

serviceAccount:
enabled: true
Expand Down Expand Up @@ -514,6 +514,24 @@ sentry:
key: password
- name: BROKER_URL
value: amqp://$(RABBITMQ_USER):$(RABBITMQ_PASSWORD)@rabbitmq.rabbitmq:5672/sentry
postProcessForwardIssuePlatform:
resources:
requests:
cpu: 50m
memory: 300Mi
env:
- name: RABBITMQ_USER
valueFrom:
secretKeyRef:
name: sentry-rabbitmq-user-credentials
key: username
- name: RABBITMQ_PASSWORD
valueFrom:
secretKeyRef:
name: sentry-rabbitmq-user-credentials
key: password
- name: BROKER_URL
value: amqp://$(RABBITMQ_USER):$(RABBITMQ_PASSWORD)@rabbitmq.rabbitmq:5672/sentry
relay:
resources:
requests:
Expand Down Expand Up @@ -789,6 +807,7 @@ sentry:
host: kafka-kafka-bootstrap.kafka

hooks:
enabled: true
activeDeadlineSeconds: 600
dbCheck:
image:
Expand Down

0 comments on commit b4baff6

Please sign in to comment.