diff --git a/sentry/Chart.yaml b/sentry/Chart.yaml index 788263935..3cf97fb69 100644 --- a/sentry/Chart.yaml +++ b/sentry/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: sentry description: A Helm chart for Kubernetes type: application -version: 4.3.0 +version: 4.4.0 appVersion: 20.7.1 dependencies: - name: redis diff --git a/sentry/templates/hooks/sentry-db-init.job.yaml b/sentry/templates/hooks/sentry-db-init.job.yaml index d92e7a5b2..df26e08e1 100644 --- a/sentry/templates/hooks/sentry-db-init.job.yaml +++ b/sentry/templates/hooks/sentry-db-init.job.yaml @@ -39,14 +39,17 @@ spec: - name: db-init-job image: "{{ .Values.images.sentry.repository }}:{{ .Values.images.sentry.tag }}" command: ["sentry","upgrade","--noinput"] - {{- if .Values.postgresql.enabled }} env: + {{- if .Values.postgresql.enabled }} - name: POSTGRES_PASSWORD valueFrom: secretKeyRef: name: {{ include "sentry.postgresql.fullname" . }} key: postgresql-password {{- end }} + {{- if .Values.hooks.dbInit.env }} +{{ toYaml .Values.hooks.dbInit.env | indent 8 }} + {{- end }} volumeMounts: - mountPath: /etc/sentry name: config diff --git a/sentry/templates/hooks/user-create.yaml b/sentry/templates/hooks/user-create.yaml index c94efd426..bc584f6cd 100644 --- a/sentry/templates/hooks/user-create.yaml +++ b/sentry/templates/hooks/user-create.yaml @@ -51,14 +51,17 @@ spec: else \ exit 1; \ fi - {{- if .Values.postgresql.enabled }} env: + {{- if .Values.postgresql.enabled }} - name: POSTGRES_PASSWORD valueFrom: secretKeyRef: name: {{ include "sentry.postgresql.fullname" . }} key: postgresql-password {{- end }} + {{- if .Values.hooks.dbInit.env }} +{{ toYaml .Values.hooks.dbInit.env | indent 8 }} + {{- end }} volumeMounts: - mountPath: /etc/sentry name: config diff --git a/sentry/values.yaml b/sentry/values.yaml index f79eb9cc4..e94e3a4d5 100644 --- a/sentry/values.yaml +++ b/sentry/values.yaml @@ -20,7 +20,7 @@ images: sentry: web: replicas: 1 - env: {} + env: [] probeInitialDelaySeconds: 10 resources: {} affinity: {} @@ -37,7 +37,7 @@ sentry: worker: replicas: 3 # concurrency: 4 - env: {} + env: [] resources: {} affinity: {} nodeSelector: {} @@ -53,7 +53,7 @@ sentry: targetCPUUtilizationPercentage: 50 cron: - env: {} + env: [] resources: {} affinity: {} nodeSelector: {} @@ -61,7 +61,7 @@ sentry: # podLabels: [] postProcessForward: replicas: 1 - env: {} + env: [] resources: {} affinity: {} nodeSelector: {} @@ -71,7 +71,7 @@ sentry: snuba: api: replicas: 1 - env: {} + env: [] probeInitialDelaySeconds: 10 resources: {} affinity: {} @@ -87,7 +87,7 @@ snuba: consumer: replicas: 1 - env: {} + env: [] resources: {} affinity: {} nodeSelector: {} @@ -96,7 +96,7 @@ snuba: outcomesConsumer: replicas: 1 - env: {} + env: [] resources: {} affinity: {} nodeSelector: {} @@ -105,7 +105,7 @@ snuba: sessionsConsumer: replicas: 1 - env: {} + env: [] resources: {} affinity: {} nodeSelector: {} @@ -113,7 +113,7 @@ snuba: # podLabels: [] replacer: - env: {} + env: [] resources: {} affinity: {} nodeSelector: {} @@ -121,15 +121,16 @@ snuba: # podLabels: [] dbInitJob: - env: {} + env: [] migrateJob: - env: {} + env: [] hooks: enabled: true dbInit: + env: [] resources: limits: memory: 2048Mi @@ -444,4 +445,4 @@ metrics: # namespaceSelector: # any: true scrapeInterval: 30s - # honorLabels: true \ No newline at end of file + # honorLabels: true