Skip to content

Commit d3a3ed4

Browse files
mzglinskimzglinski
authored
feat: upgrade to 25.8.0 (#1851)
1 parent 4ae9f92 commit d3a3ed4

12 files changed

+499
-346
lines changed

‎charts/sentry/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: sentry
33
description: A Helm chart for Kubernetes
44
type: application
55
version: 27.1.1
6-
# renovate image=docker.io/getsentry/sentry
7-
appVersion: 25.7.0
6+
# renovate image=ghcr.io/getsentry/sentry
7+
appVersion: 25.8.0
88
dependencies:
99
- name: memcached
1010
repository: oci://registry-1.docker.io/bitnamicharts

‎charts/sentry/templates/_helper.tpl‎

Lines changed: 52 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@
1919
{{- define "vroom.port" -}}8085{{- end -}}
2020

2121
{{- define "relay.image" -}}
22-
{{- default "getsentry/relay" .Values.images.relay.repository -}}
22+
{{- default "ghcr.io/getsentry/relay" .Values.images.relay.repository -}}
2323
:
2424
{{- default .Chart.AppVersion .Values.images.relay.tag -}}
2525
{{- end -}}
2626
{{- define "sentry.image" -}}
27-
{{- default "getsentry/sentry" .Values.images.sentry.repository -}}
27+
{{- default "ghcr.io/getsentry/sentry" .Values.images.sentry.repository -}}
2828
:
2929
{{- default .Chart.AppVersion .Values.images.sentry.tag -}}
3030
{{- end -}}
3131
{{- define "snuba.image" -}}
32-
{{- default "getsentry/snuba" .Values.images.snuba.repository -}}
32+
{{- default "ghcr.io/getsentry/snuba" .Values.images.snuba.repository -}}
3333
:
3434
{{- default .Chart.AppVersion .Values.images.snuba.tag -}}
3535
{{- end -}}
3636

3737
{{- define "symbolicator.image" -}}
38-
{{- default "getsentry/symbolicator" .Values.images.symbolicator.repository -}}
38+
{{- default "ghcr.io/getsentry/symbolicator" .Values.images.symbolicator.repository -}}
3939
:
4040
{{- default .Chart.AppVersion .Values.images.symbolicator.tag -}}
4141
{{- end -}}
@@ -47,11 +47,17 @@
4747
{{- end -}}
4848

4949
{{- define "vroom.image" -}}
50-
{{- default "getsentry/vroom" .Values.images.vroom.repository -}}
50+
{{- default "ghcr.io/getsentry/vroom" .Values.images.vroom.repository -}}
5151
:
5252
{{- default .Chart.AppVersion .Values.images.vroom.tag -}}
5353
{{- end -}}
5454

55+
{{- define "uptimeChecker.image" -}}
56+
{{- default "ghcr.io/getsentry/uptime-checker" .Values.images.uptimeChecker.repository -}}
57+
:
58+
{{- default .Chart.AppVersion .Values.images.uptimeChecker.tag -}}
59+
{{- end -}}
60+
5561
{{/*
5662
Expand the name of the chart.
5763
*/}}
@@ -323,6 +329,24 @@ Set redis ssl
323329
{{- end -}}
324330
{{- end -}}
325331

332+
{{/*
333+
Build full Redis URI, including creds and db when available
334+
*/}}
335+
{{- define "sentry.redis.uri" -}}
336+
{{- $redisHost := include "sentry.redis.host" . -}}
337+
{{- $redisPort := include "sentry.redis.port" . -}}
338+
{{- $redisDb := include "sentry.redis.db" . -}}
339+
{{- $redisProto := ternary "rediss" "redis" (eq (include "sentry.redis.ssl" .) "true") -}}
340+
{{- $password := include "sentry.redis.password" . -}}
341+
{{- if or (and .Values.redis.enabled .Values.redis.auth.existingSecret) (.Values.externalRedis.existingSecret) -}}
342+
{{ printf "%s://:$(HELM_CHARTS_SENTRY_REDIS_PASSWORD_CONTROLLED)@%s:%s/%s" $redisProto $redisHost $redisPort $redisDb }}
343+
{{- else if $password -}}
344+
{{ printf "%s://:%s@%s:%s/%s" $redisProto $password $redisHost $redisPort $redisDb }}
345+
{{- else -}}
346+
{{ printf "%s://%s:%s/%s" $redisProto $redisHost $redisPort $redisDb }}
347+
{{- end -}}
348+
{{- end -}}
349+
326350

327351
{{/*
328352
Create the name of the service account to use
@@ -695,14 +719,31 @@ Set external Clickhouse password from existingSecret
695719
value: http://{{ template "sentry.fullname" . }}-snuba:{{ template "snuba.port" . }}
696720
{{- end -}}
697721

722+
{{- define "uptimeChecker.env" -}}
723+
- name: UPTIME_CHECKER_RESULTS_KAFKA_CLUSTER
724+
value: {{ include "sentry.kafka.bootstrap_servers_string" . | quote }}
725+
{{- /* Expose Redis password from secret if configured to avoid rendering secrets inline */}}
726+
{{- if and (.Values.redis.enabled) (.Values.redis.auth.existingSecret) }}
727+
- name: HELM_CHARTS_SENTRY_REDIS_PASSWORD_CONTROLLED
728+
valueFrom:
729+
secretKeyRef:
730+
name: {{ .Values.redis.auth.existingSecret }}
731+
key: {{ default "redis-password" .Values.redis.auth.existingSecretPasswordKey }}
732+
{{- else if .Values.externalRedis.existingSecret }}
733+
- name: HELM_CHARTS_SENTRY_REDIS_PASSWORD_CONTROLLED
734+
valueFrom:
735+
secretKeyRef:
736+
name: {{ .Values.externalRedis.existingSecret }}
737+
key: {{ default "redis-password" .Values.externalRedis.existingSecretKey }}
738+
{{- end }}
739+
- name: UPTIME_CHECKER_REDIS_HOST
740+
value: {{ include "sentry.redis.uri" . | quote }}
741+
{{- end -}}
742+
698743
{{/*
699744
Common Sentry environment variables
700745
*/}}
701746
{{- define "sentry.env" -}}
702-
{{- $redisHost := include "sentry.redis.host" . -}}
703-
{{- $redisPort := include "sentry.redis.port" . -}}
704-
{{- $redisDb := include "sentry.redis.db" . -}}
705-
{{- $redisProto := ternary "rediss" "redis" (eq (include "sentry.redis.ssl" .) "true") -}}
706747
- name: SNUBA
707748
value: http://{{ template "sentry.fullname" . }}-snuba:{{ template "snuba.port" . }}
708749
- name: VROOM
@@ -856,15 +897,15 @@ Set redis password
856897
name: {{ .Values.redis.auth.existingSecret }}
857898
key: {{ default "redis-password" .Values.redis.auth.existingSecretPasswordKey }}
858899
- name: BROKER_URL
859-
value: "{{ $redisProto }}://:$(HELM_CHARTS_SENTRY_REDIS_PASSWORD_CONTROLLED)@{{ $redisHost }}:{{ $redisPort }}/{{ $redisDb }}"
900+
value: {{ include "sentry.redis.uri" . | quote }}
860901
{{- else if (.Values.externalRedis.existingSecret) }}
861902
- name: HELM_CHARTS_SENTRY_REDIS_PASSWORD_CONTROLLED
862903
valueFrom:
863904
secretKeyRef:
864905
name: {{ .Values.externalRedis.existingSecret }}
865906
key: {{ default "redis-password" .Values.externalRedis.existingSecretKey }}
866907
- name: BROKER_URL
867-
value: "{{ $redisProto }}://:$(HELM_CHARTS_SENTRY_REDIS_PASSWORD_CONTROLLED)@{{ $redisHost }}:{{ $redisPort }}/{{ $redisDb }}"
908+
value: {{ include "sentry.redis.uri" . | quote }}
868909
{{- end }}
869910

870911
{{/*

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

Lines changed: 80 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -408,173 +408,100 @@ sentry.conf.py: |-
408408
{{- if not .Values.sentry.singleOrganization }}
409409
"organizations:create",
410410
{{ end -}}
411-
412411
{{- if .Values.sentry.features.orgSubdomains }}
413-
"organizations:org-subdomains",
412+
"organizations:org-ingest-subdomains",
414413
{{ end -}}
415-
416-
"organizations:advanced-search",
417-
"organizations:android-mappings",
418-
"organizations:api-keys",
419-
"organizations:boolean-search",
420-
"organizations:related-events",
421-
"organizations:alert-filters",
422-
"organizations:custom-symbol-sources",
423-
"organizations:dashboards-basic",
424-
"organizations:dashboards-edit",
425-
"organizations:data-forwarding",
426414
"organizations:discover",
427-
"organizations:discover-basic",
428-
"organizations:discover-query",
429-
"organizations:discover-frontend-use-events-endpoint",
430-
"organizations:enterprise-perf",
431-
"organizations:event-attachments",
432-
"organizations:events",
433415
"organizations:global-views",
434416
"organizations:incidents",
435-
"organizations:metric-alert-builder-aggregate",
436-
"organizations:metric-alert-gui-filters",
437-
"organizations:integrations-event-hooks",
438417
"organizations:integrations-issue-basic",
439418
"organizations:integrations-issue-sync",
440-
"organizations:integrations-alert-rule",
441-
"organizations:integrations-chat-unfurl",
442-
"organizations:integrations-incident-management",
443-
"organizations:integrations-ticket-rules",
444-
445-
{{- if .Values.sentry.features.vstsLimitedScopes }}
446-
"organizations:integrations-vsts-limited-scopes",
447-
{{ end -}}
448-
449-
"organizations:integrations-stacktrace-link",
450-
"organizations:internal-catchall",
451419
"organizations:invite-members",
452-
"organizations:large-debug-files",
453-
"organizations:monitors",
454-
"organizations:onboarding",
455-
"organizations:org-saved-searches",
456-
"organizations:performance-view",
457-
"organizations:performance-frontend-use-events-endpoint",
458-
"organizations:project-detail",
459-
"organizations:relay",
460-
"organizations:release-performance-views",
461-
"organizations:rule-page",
462-
"organizations:set-grouping-config",
463-
"organizations:custom-event-title",
464-
"organizations:slack-migration",
465420
"organizations:sso-basic",
466-
"organizations:sso-rippling",
467421
"organizations:sso-saml2",
468-
"organizations:sso-migration",
469-
"organizations:stacktrace-hover-preview",
470-
"organizations:symbol-sources",
471-
"organizations:transaction-comparison",
472-
"organizations:usage-stats-graph",
473-
"organizations:inbox",
474-
"organizations:unhandled-issue-flag",
475-
"organizations:invite-members-rate-limits",
476-
"organizations:dashboards-v2",
477-
"organizations:reprocessing-v2",
478-
"organizations:metrics",
479-
"organizations:metrics-extraction",
480-
"organizations:transaction-metrics-extraction",
481-
482-
{{- if .Values.sentry.features.enableSessionReplay}}
483-
"organizations:session-replay",
484-
"organizations:session-replay-ui",
485-
"organizations:session-replay-sdk",
486-
"organizations:session-replay-count-query-optimize",
487-
"organizations:session-replay-sdk-errors-only",
488-
"organizations:session-replay-recording-scrubbing",
489-
"organizations:session-replay-a11y-tab",
490-
"organizations:session-replay-slack-new-issue",
491-
"organizations:session-replay-issue-emails",
492-
"organizations:session-replay-event-linking",
493-
"organizations:session-replay-enable-canvas",
494-
"organizations:session-replay-enable-canvas-replayer",
495-
"organizations:session-replay-weekly-email",
496-
"organizations:session-replay-trace-table",
497-
"organizations:session-replay-rage-dead-selectors",
498-
"organizations:session-replay-new-event-counts",
499-
"organizations:session-replay-new-timeline",
500-
"organizations:issue-details-replay-event",
501-
{{ end -}}
502-
422+
"organizations:advanced-search",
503423
"organizations:issue-platform",
504-
505-
{{- if .Values.sentry.features.enableProfiling }}
506-
"organizations:profiling",
507-
"organizations:profiling-ui-frames",
508-
"organizations:profiling-using-transactions",
509-
"organizations:profiling-beta",
510-
"organizations:profiling-stacktrace-links",
511-
"organizations:profiling-cpu-chart",
512-
"organizations:profiling-memory-chart",
513-
"organizations:profiling-view",
514-
{{ end -}}
515-
516-
{{- if .Values.sentry.features.enableFeedback }}
517-
"organizations:user-feedback-ui",
518-
"organizations:user-feedback-ingest",
519-
"organizations:user-feedback-replay-clip",
520-
"organizations:feedback-ingest",
521-
"organizations:feedback-post-process-group",
522-
"organizations:feedback-visible",
523-
{{ end -}}
524-
525-
{{- if .Values.sentry.features.enableSpan }}
526-
# Trace View -- make sure this is all set
527-
"organizations:trace-view-v1", # This one is required
528-
"organizations:trace-view-load-more", # Optional
529-
"organizations:trace-tabs-ui", # Optional
530-
"organizations:trace-view-linked-traces", # Optional
531-
"organizations:replay-trace-view-v1", # Optional
532-
"organizations:trace-drawer-action", # Optional
533-
"organizations:trace-spans-format", # Optional
534-
# Performance Trace Explorer
535-
"organizations:performance-trace-explorer", # Required
536-
"organizations:performance-trace-details", # Required
537-
"organizations:performance-trace-explorer-sorting",
538-
"organizations:performance-tracing-without-performance",
539-
"organizations:performance-use-metrics",
540-
# Span-based Metrics
541-
"projects:span-metrics-extraction",
542-
"projects:span-metrics-extraction-addons",
543-
"organizations:span-stats",
544-
"organizations:performance-issues-spans",
545-
"organizations:transaction-metrics-extraction", # Extraction metrics for transactions during ingestion.
546-
"organizations:indexed-spans-extraction", # Starfish: extract metrics from the spans
547-
"organizations:visibility-explore-view", # Enable the new explore page
548-
"organizations:visibility-explore-admin", # Enable admin features on the new explore page
549-
"organizations:visibility-explore-equations", # Enable equations feature on the new explore page
550-
"organizations:visibility-explore-progressive-loading",
551-
"organizations:visibility-explore-skip-preflight",
552-
"organizations:visibility-explore-tabs", # Enable merging all the modes into tabs
553-
"organizations:visibility-explore-range-high", # Enable high date range options on new explore page
554-
"organizations:explore-multi-query", # Enable explore multi query page
555-
{{ end -}}
556-
424+
"organizations:monitors",
557425
"organizations:dashboards-mep",
558426
"organizations:mep-rollout-flag",
559427
"organizations:dashboards-rh-widget",
560-
"organizations:metrics-extraction",
561-
"organizations:transaction-metrics-extraction",
562-
563-
"projects:alert-filters",
428+
"organizations:dynamic-sampling",
564429
"projects:custom-inbound-filters",
565430
"projects:data-forwarding",
566431
"projects:discard-groups",
567-
"projects:issue-alerts-targeting",
568-
"projects:minidump",
432+
"projects:plugins",
569433
"projects:rate-limits",
570-
"projects:sample-events",
571434
"projects:servicehooks",
572-
"projects:similarity-view",
435+
)
436+
{{- if .Values.sentry.features.enableSpan }}
437+
+ (
438+
# Performance/Tracing/Spans related flags
439+
"organizations:performance-view",
440+
"organizations:visibility-explore-view",
441+
"organizations:transaction-metrics-extraction",
442+
"organizations:indexed-spans-extraction",
443+
"organizations:insights-entry-points",
444+
"organizations:insights-initial-modules",
445+
"organizations:insights-addon-modules",
446+
"organizations:standalone-span-ingestion",
447+
"organizations:starfish-mobile-appstart",
448+
"projects:span-metrics-extraction",
449+
"projects:span-metrics-extraction-addons",
450+
451+
# flags added in this chart
452+
"organizations:trace-view-load-more",
453+
"organizations:trace-tabs-ui",
454+
"organizations:trace-view-linked-traces",
455+
"organizations:span-stats",
456+
"organizations:visibility-explore-range-high",
457+
)
458+
{{- end }}
459+
{{- if .Values.sentry.features.enableSessionReplay}}
460+
+ (
461+
# Session Replay related flags
462+
"organizations:session-replay",
463+
464+
# flags added in this chart
465+
"organizations:session-replay-ui",
466+
"organizations:session-replay-issue-emails",
467+
"organizations:session-replay-recording-scrubbing",
468+
"organizations:session-replay-slack-new-issue",
469+
)
470+
{{- end }}
471+
{{- if .Values.sentry.features.enableFeedback }}
472+
+ (
473+
# User Feedback related flags
474+
"organizations:user-feedback-ui",
475+
)
476+
{{- end }}
477+
{{- if .Values.sentry.features.enableProfiling }}
478+
+ (
479+
# Profiling related flags
480+
"organizations:profiling",
481+
"organizations:profiling-view",
482+
# Continuous Profiling related flags
483+
"organizations:continuous-profiling",
484+
"organizations:continuous-profiling-stats",
485+
)
486+
{{- end }}
487+
{{- if .Values.sentry.features.enableUptime }}
488+
+ (
489+
# Uptime Monitoring related flags
490+
"organizations:uptime",
491+
"organizations:uptime-create-issues",
492+
)
493+
{{- end }}
494+
+ (
495+
# Flags enabled in this chart but not present in https://github.com/getsentry/self-hosted/blob/master/sentry/sentry.conf.example.py
496+
"organizations:related-events",
497+
"organizations:reprocessing-v2",
498+
"organizations:set-grouping-config",
499+
"organizations:onboarding",
573500
"projects:similarity-indexing",
574-
"projects:similarity-view-v2",
575-
"projects:similarity-indexing-v2",
576-
577-
"projects:plugins",
501+
"projects:similarity-view",
502+
)
503+
+ (
504+
# Custom features from values
578505
{{- if .Values.sentry.customFeatures }}
579506
{{- range $CustomFeature := .Values.sentry.customFeatures }}
580507
"{{ $CustomFeature}}",
@@ -641,6 +568,12 @@ sentry.conf.py: |-
641568
SENTRY_RELAY_WHITELIST_PK = []
642569
SENTRY_RELAY_OPEN_REGISTRATION = True
643570

571+
#########
572+
# Tasks #
573+
#########
574+
# Disable taskworker and continue using celery.
575+
SENTRY_OPTIONS["taskworker.enabled"] = False
576+
644577
#######################
645578
# OpenAi Suggestions #
646579
#######################

0 commit comments

Comments
 (0)