Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions charts/agent/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,12 @@ spec:
value: {{ .Values.env.tracer.otel.insecure_skip_verify | quote }}
- name: CONVOY_SENTRY_DSN
value: {{ .Values.env.tracer.sentry.dsn | quote }}
- name: CONVOY_SENTRY_DEBUG
value: {{ .Values.env.tracer.sentry.debug | quote }}
{{- if .Values.env.tracer.sentry.environment }}
- name: CONVOY_SENTRY_ENVIRONMENT
value: {{ .Values.env.tracer.sentry.environment | quote }}
{{- end }}
{{- end }}

{{- if .Values.env.storage.enabled }}
Expand Down
2 changes: 2 additions & 0 deletions charts/agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ env:
insecure_skip_verify: true
sentry:
dsn: ""
debug: false
environment: ""
pyroscope:
enabled: false
url: ""
Expand Down
8 changes: 7 additions & 1 deletion charts/server/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
- name: HTTP_PROXY
value: {{ .Values.env.proxy | quote }}
- name: CONVOY_ENV
value: {{ .Values.env.environment | quote }}
value: {{ .Values.global.convoy.environment | quote }}
- name: CONVOY_HOST
value: {{ .Values.env.host | quote }}
- name: CONVOY_ROOT_PATH
Expand Down Expand Up @@ -240,6 +240,12 @@ spec:
value: {{ .Values.env.tracer.otel.insecure_skip_verify | quote }}
- name: CONVOY_SENTRY_DSN
value: {{ .Values.env.tracer.sentry.dsn | quote }}
- name: CONVOY_SENTRY_DEBUG
value: {{ .Values.env.tracer.sentry.debug | quote }}
{{- if .Values.env.tracer.sentry.environment }}
- name: CONVOY_SENTRY_ENVIRONMENT
value: {{ .Values.global.convoy.environment | quote }}
{{- end }}
{{- end }}

- name: CONVOY_INSTANCE_INGEST_RATE
Expand Down
6 changes: 4 additions & 2 deletions charts/server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ global:
portal_realm_enabled: false
sentry_sample_rate: 1.0
read_replica_dsn: ""
environment: ""

externalDatabase:
enabled: false
Expand Down Expand Up @@ -94,6 +95,8 @@ env:
insecure_skip_verify: true
sentry:
dsn: ""
debug: false
environment: ""
storage:
enabled: false
type: ""
Expand Down Expand Up @@ -187,8 +190,7 @@ podDisruptionBudget: {}
# minAvailable: 1

# Extra environment variables to be set in the server pods
extraEnvs:
[]
extraEnvs: []
# - name: CUSTOM_ENV_VAR
# value: "custom_value"
# - name: SECRET_ENV_VAR
Expand Down
16 changes: 11 additions & 5 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ global:
otel_insecure_skip_verify: &otelInsecureSkipVerify true
# -- Sentry DSN
sentry_dsn: &sentryDsn ""
# -- Retention policy duration
# -- Sentry debug mode
sentry_debug: &sentryDebug false
# -- Sentry environment
sentry_environment: *environment

retention_policy_duration: &retentionPolicyDuration 720h
# -- Retention policy enabled
retention_policy_enabled: &retentionPolicyEnabled false
Expand Down Expand Up @@ -196,6 +200,8 @@ agent:
insecure_skip_verify: *otelInsecureSkipVerify
sentry:
dsn: *sentryDsn
debug: *sentryDebug
environment: *environment
pyroscope:
enabled: false
url: ""
Expand Down Expand Up @@ -282,8 +288,7 @@ agent:
periodSeconds: 60
selectPolicy: Max

podDisruptionBudget:
{}
podDisruptionBudget: {}
# -- Pod disruption budget
# maxUnavailable: 1
# minAvailable: 1
Expand Down Expand Up @@ -334,6 +339,8 @@ server:
insecure_skip_verify: *otelInsecureSkipVerify
sentry:
dsn: *sentryDsn
debug: *sentryDebug
environment: *environment
pyroscope:
enabled: false
url: ""
Expand Down Expand Up @@ -434,8 +441,7 @@ server:
periodSeconds: 60
selectPolicy: Max

podDisruptionBudget:
{}
podDisruptionBudget: {}
# -- Pod disruption budget
# maxUnavailable: 1
# minAvailable: 1
Expand Down
Loading