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
8 changes: 4 additions & 4 deletions Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ dependencies:
version: 17.11.3
- name: agent
repository: ""
version: 3.7.6
version: 3.7.7
- name: server
repository: ""
version: 3.7.6
digest: sha256:25afc9b03cd96a3fa18053eedbf24f0a47747536278a093c7918d6a46ddaa9e3
generated: "2026-03-23T21:35:32.093441+01:00"
version: 3.7.7
digest: sha256:b4f07cde63f5a8f23f7f8ba0c1c3fceeb01558a67e2ee067382854ad4553b0e1
generated: "2026-05-28T21:06:56.373195+01:00"
8 changes: 4 additions & 4 deletions Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: convoy
description: Open Source Webhooks Gateway
type: application
version: "3.7.6"
appVersion: "v26.3.5"
version: "3.7.7"
Comment thread
cursor[bot] marked this conversation as resolved.
appVersion: "v26.3.7"
keywords:
- Webhooks
- Kubernetes
Expand All @@ -26,11 +26,11 @@ dependencies:

# Vendored subcharts under charts/agent and charts/server (see charts/ directory).
- name: agent
version: 3.7.6
version: 3.7.7
repository: ""
condition: agent.enabled

- name: server
version: 3.7.6
version: 3.7.7
repository: ""
condition: server.enabled
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# convoy

![Version: 3.7.6](https://img.shields.io/badge/Version-3.7.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v26.3.5](https://img.shields.io/badge/AppVersion-v26.3.5-informational?style=flat-square)
![Version: 3.7.7](https://img.shields.io/badge/Version-3.7.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v26.3.7](https://img.shields.io/badge/AppVersion-v26.3.7-informational?style=flat-square)

Open Source Webhooks Gateway

Expand Down Expand Up @@ -78,6 +78,9 @@ helm install convoy .
| agent.env.dispatcher.deny_list[0] | string | `"127.0.0.1/8"` | |
| agent.env.dispatcher.deny_list[1] | string | `"169.254.169.254/32"` | |
| agent.env.dispatcher.insecure_skip_verify | bool | `false` | |
| agent.env.auth.jwt.enabled | bool | `true` | |
| agent.env.auth.jwt.refresh_secret | string | `"convoy-refresh-secret"` | |
| agent.env.auth.jwt.secret | string | `"convoy-secret"` | |
| agent.env.enable_feature_flag | list | `[]` | |
| agent.env.enable_profiling | bool | `false` | |
| agent.env.environment | string | `"oss"` | |
Expand Down Expand Up @@ -135,7 +138,7 @@ helm install convoy .
| global.convoy.image | string | `"getconvoy/convoy"` | Docker image tags for all convoy components |
| global.convoy.jwt_refresh_secret | string | `"convoy-refresh-secret"` | JWT Refresh Secret key |
| global.convoy.jwt_secret | string | `"convoy-secret"` | JWT Secret key |
| global.convoy.jwt_secret_name | string | `""` | If this secret parameter is not empty, JWT secret values will be ignored. The secrets should be in the 'jwt_secret' and 'jwt_refresh_secret' keys |
| global.convoy.jwt_secret_name | string | `""` | Existing Kubernetes Secret name for JWT secrets. Recommended for production. When set, JWT secret values are ignored; the secret must contain 'jwt_secret' and 'jwt_refresh_secret' keys. |
| global.convoy.license_key | string | `""` | License Key |
| global.convoy.license_key_secret_name | string | `""` | If this secret parameter is not empty, the inline license key value will be ignored. The license key should be present in the 'license_key' key of the specified secret. |
| global.convoy.log_level | string | `"error"` | Logger Level for all convoy components |
Expand All @@ -152,7 +155,7 @@ helm install convoy .
| global.convoy.sentry_dsn | string | `""` | Sentry DSN |
| global.convoy.sentry_environment | string | `"oss"` | Sentry environment |
| global.convoy.sentry_sample_rate | float | `1` | Sentry sample rate for error sampling (0.0 to 1.0) |
| global.convoy.tag | string | `"v26.3.5"` | Docker image tags for all convoy components |
| global.convoy.tag | string | `"v26.3.7"` | Docker image tags for all convoy components |
| global.convoy.tracer_enabled | bool | `false` | Tracing config for all convoy services |
| global.convoy.tracer_type | string | `"otel"` | Tracing provider type |
| global.externalDatabase.database | string | `"convoy"` | Database name for the external database |
Expand Down
4 changes: 2 additions & 2 deletions charts/agent/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: agent
description: Convoy Agent Chart
type: application
version: "3.7.6"
appVersion: "v26.3.5"
version: "3.7.7"
appVersion: "v26.3.7"
maintainers:
- name: Convoy Engineering Team
email: engineering@getconvoy.io
Expand Down
8 changes: 8 additions & 0 deletions charts/agent/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,11 @@ Selector labels
app.kubernetes.io/name: {{ include "convoy-agent.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{- define "convoy-agent.jwtSecretName" -}}
{{- if .Values.global.convoy.jwt_secret_name -}}
{{- .Values.global.convoy.jwt_secret_name -}}
{{- else -}}
{{- include "convoy-agent.fullname" . }}-jwt
{{- end -}}
{{- end }}
38 changes: 38 additions & 0 deletions charts/agent/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,25 @@ spec:
- name: CONVOY_DB_OPTIONS
value: {{ .Values.global.externalDatabase.options | quote }}
{{- end }}
{{- if or .Values.global.convoy.jwt_secret_name .Values.global.convoy.jwt_secret .Values.global.convoy.jwt_refresh_secret }}
- name: CONVOY_JWT_SECRET
valueFrom:
secretKeyRef:
name: "{{ include "convoy-agent.jwtSecretName" . }}"
key: jwt_secret
- name: CONVOY_JWT_REFRESH_SECRET
valueFrom:
secretKeyRef:
name: "{{ include "convoy-agent.jwtSecretName" . }}"
key: jwt_refresh_secret
{{- else }}
- name: CONVOY_JWT_SECRET
value: {{ .Values.env.auth.jwt.secret | quote }}
- name: CONVOY_JWT_REFRESH_SECRET
value: {{ .Values.env.auth.jwt.refresh_secret | quote }}
{{- end }}
- name: CONVOY_JWT_REALM_ENABLED
value: {{ .Values.env.auth.jwt.enabled | quote }}
command: [ "/cmd" ]
args: [ "migrate", "up" ]
{{- with .Values.securityContext }}
Expand Down Expand Up @@ -100,6 +119,25 @@ spec:
- name: CONVOY_DISPATCHER_CACERT_PATH
value: "/etc/convoy/ca.crt"
{{- end }}
{{- if or .Values.global.convoy.jwt_secret_name .Values.global.convoy.jwt_secret .Values.global.convoy.jwt_refresh_secret }}
- name: CONVOY_JWT_SECRET
valueFrom:
secretKeyRef:
name: "{{ include "convoy-agent.jwtSecretName" . }}"
key: jwt_secret
- name: CONVOY_JWT_REFRESH_SECRET
valueFrom:
secretKeyRef:
name: "{{ include "convoy-agent.jwtSecretName" . }}"
key: jwt_refresh_secret
{{- else }}
- name: CONVOY_JWT_SECRET
value: {{ .Values.env.auth.jwt.secret | quote }}
- name: CONVOY_JWT_REFRESH_SECRET
value: {{ .Values.env.auth.jwt.refresh_secret | quote }}
{{- end }}
- name: CONVOY_JWT_REALM_ENABLED
value: {{ .Values.env.auth.jwt.enabled | quote }}
{{- if and .Values.env.auth.file.secret (ne .Values.env.auth.file.secret "") }}
- name: CONVOY_BASIC_AUTH_CONFIG
valueFrom:
Expand Down
15 changes: 15 additions & 0 deletions charts/agent/templates/jwt-secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{{- if and (not .Values.global.convoy.jwt_secret_name) (or .Values.global.convoy.jwt_secret .Values.global.convoy.jwt_refresh_secret) }}
apiVersion: v1
kind: Secret
metadata:
name: {{ include "convoy-agent.jwtSecretName" . }}
labels:
app.kubernetes.io/name: {{ include "convoy-agent.name" . }}
helm.sh/chart: {{ include "convoy-agent.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
type: Opaque
data:
jwt_secret: {{ .Values.global.convoy.jwt_secret | default (randAlphaNum 32) | b64enc | quote }}
jwt_refresh_secret: {{ .Values.global.convoy.jwt_refresh_secret | default (randAlphaNum 32) | b64enc | quote }}
{{- end }}
38 changes: 38 additions & 0 deletions charts/agent/templates/rollout.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,25 @@ spec:
- name: CONVOY_DB_OPTIONS
value: {{ .Values.global.externalDatabase.options | quote }}
{{- end }}
{{- if or .Values.global.convoy.jwt_secret_name .Values.global.convoy.jwt_secret .Values.global.convoy.jwt_refresh_secret }}
- name: CONVOY_JWT_SECRET
valueFrom:
secretKeyRef:
name: "{{ include "convoy-agent.jwtSecretName" . }}"
key: jwt_secret
- name: CONVOY_JWT_REFRESH_SECRET
valueFrom:
secretKeyRef:
name: "{{ include "convoy-agent.jwtSecretName" . }}"
key: jwt_refresh_secret
{{- else }}
- name: CONVOY_JWT_SECRET
value: {{ .Values.env.auth.jwt.secret | quote }}
- name: CONVOY_JWT_REFRESH_SECRET
value: {{ .Values.env.auth.jwt.refresh_secret | quote }}
{{- end }}
- name: CONVOY_JWT_REALM_ENABLED
value: {{ .Values.env.auth.jwt.enabled | quote }}
command: [ "/cmd" ]
args: [ "migrate", "up" ]
{{- with .Values.securityContext }}
Expand Down Expand Up @@ -102,6 +121,25 @@ spec:
- name: CONVOY_DISPATCHER_CACERT_PATH
value: "/etc/convoy/ca.crt"
{{- end }}
{{- if or .Values.global.convoy.jwt_secret_name .Values.global.convoy.jwt_secret .Values.global.convoy.jwt_refresh_secret }}
- name: CONVOY_JWT_SECRET
valueFrom:
secretKeyRef:
name: "{{ include "convoy-agent.jwtSecretName" . }}"
key: jwt_secret
- name: CONVOY_JWT_REFRESH_SECRET
valueFrom:
secretKeyRef:
name: "{{ include "convoy-agent.jwtSecretName" . }}"
key: jwt_refresh_secret
{{- else }}
- name: CONVOY_JWT_SECRET
value: {{ .Values.env.auth.jwt.secret | quote }}
- name: CONVOY_JWT_REFRESH_SECRET
value: {{ .Values.env.auth.jwt.refresh_secret | quote }}
{{- end }}
- name: CONVOY_JWT_REALM_ENABLED
value: {{ .Values.env.auth.jwt.enabled | quote }}
{{- if and .Values.env.auth.file.secret (ne .Values.env.auth.file.secret "") }}
- name: CONVOY_BASIC_AUTH_CONFIG
valueFrom:
Expand Down
6 changes: 5 additions & 1 deletion charts/agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ env:
sign_up_enabled: false
log_level: "error"
auth:
jwt:
enabled: true
secret: "convoy-secret"
refresh_secret: "convoy-refresh-secret"
file:
basic: []
# -- If this secret parameter is not empty, basic auth inline value will be ignored. The basic auth config should be in the 'basic_auth_config' key
Expand Down Expand Up @@ -154,7 +158,7 @@ env:
image:
repository: getconvoy/convoy
pullPolicy: IfNotPresent
tag: v26.3.5
tag: v26.3.7

nameOverride: "convoy-agent"
fullNameOverride: "convoy-agent"
Expand Down
4 changes: 2 additions & 2 deletions charts/server/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: "3.7.6"
version: "3.7.7"

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "v26.3.5"
appVersion: "v26.3.7"

maintainers:
- name: Convoy Engineering Team
Expand Down
8 changes: 8 additions & 0 deletions charts/server/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,11 @@ Selector labels
app.kubernetes.io/name: {{ include "convoy-server.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{- define "convoy-server.jwtSecretName" -}}
{{- if .Values.global.convoy.jwt_secret_name -}}
{{- .Values.global.convoy.jwt_secret_name -}}
{{- else -}}
{{- include "convoy-server.fullname" . }}-jwt
{{- end -}}
{{- end }}
19 changes: 19 additions & 0 deletions charts/server/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,25 @@ spec:
- name: CONVOY_DB_OPTIONS
value: {{ .Values.global.externalDatabase.options | quote }}
{{- end }}
{{- if or .Values.global.convoy.jwt_secret_name .Values.global.convoy.jwt_secret .Values.global.convoy.jwt_refresh_secret }}
- name: CONVOY_JWT_SECRET
valueFrom:
secretKeyRef:
name: "{{ include "convoy-server.jwtSecretName" . }}"
key: jwt_secret
- name: CONVOY_JWT_REFRESH_SECRET
valueFrom:
secretKeyRef:
name: "{{ include "convoy-server.jwtSecretName" . }}"
key: jwt_refresh_secret
{{- else }}
- name: CONVOY_JWT_SECRET
value: {{ .Values.env.auth.jwt.secret | quote }}
- name: CONVOY_JWT_REFRESH_SECRET
value: {{ .Values.env.auth.jwt.refresh_secret | quote }}
{{- end }}
- name: CONVOY_JWT_REALM_ENABLED
value: {{ .Values.env.auth.jwt.enabled | quote }}
Comment thread
cursor[bot] marked this conversation as resolved.
command: [ "/cmd" ]
args: [ "migrate", "up" ]
{{- with .Values.securityContext }}
Expand Down
19 changes: 19 additions & 0 deletions charts/server/templates/rollout.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,25 @@ spec:
- name: CONVOY_DB_OPTIONS
value: {{ .Values.global.externalDatabase.options | quote }}
{{- end }}
{{- if or .Values.global.convoy.jwt_secret_name .Values.global.convoy.jwt_secret .Values.global.convoy.jwt_refresh_secret }}
- name: CONVOY_JWT_SECRET
valueFrom:
secretKeyRef:
name: "{{ include "convoy-server.jwtSecretName" . }}"
key: jwt_secret
- name: CONVOY_JWT_REFRESH_SECRET
valueFrom:
secretKeyRef:
name: "{{ include "convoy-server.jwtSecretName" . }}"
key: jwt_refresh_secret
{{- else }}
- name: CONVOY_JWT_SECRET
value: {{ .Values.env.auth.jwt.secret | quote }}
- name: CONVOY_JWT_REFRESH_SECRET
value: {{ .Values.env.auth.jwt.refresh_secret | quote }}
{{- end }}
- name: CONVOY_JWT_REALM_ENABLED
value: {{ .Values.env.auth.jwt.enabled | quote }}
command: [ "/cmd" ]
args: [ "migrate", "up" ]
{{- with .Values.securityContext }}
Expand Down
2 changes: 1 addition & 1 deletion charts/server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ env:
image:
repository: getconvoy/convoy
pullPolicy: Always
tag: v26.3.5
tag: v26.3.7

nameOverride: "convoy-server"
fullNameOverride: "convoy-server"
Expand Down
9 changes: 7 additions & 2 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ global:
# -- Docker image tags for all convoy components
image: &image "getconvoy/convoy"
# -- Docker image tags for all convoy components
tag: &tag "v26.3.5"
tag: &tag "v26.3.7"
# -- Logger Level for all convoy components
log_level: &logLevel "error"
# -- Convoy Environment
Expand All @@ -12,7 +12,7 @@ global:
jwt_secret: &jwtSecret "convoy-secret"
# -- JWT Refresh Secret key
jwt_refresh_secret: &jwtRefreshSecret "convoy-refresh-secret"
# -- If this secret parameter is not empty, JWT secret values will be ignored. The secrets should be in the 'jwt_secret' and 'jwt_refresh_secret' keys
# -- Existing Kubernetes Secret name for JWT secrets. Recommended for production. When set, JWT secret values are ignored; the secret must contain 'jwt_secret' and 'jwt_refresh_secret' keys.
jwt_secret_name: ""
# -- Tracing config for all convoy services
tracer_enabled: &tracerEnabled false
Expand Down Expand Up @@ -188,6 +188,11 @@ agent:
proxy: ""
sign_up_enabled: false
log_level: *logLevel
auth:
jwt:
enabled: true
secret: *jwtSecret
refresh_secret: *jwtRefreshSecret
smtp:
enabled: false
from: ""
Expand Down
Loading