From 5bff736ced7659114f8d8b1e2279c1b33c9c84bd Mon Sep 17 00:00:00 2001 From: Smart Mekiliuwa Date: Mon, 23 Mar 2026 16:05:46 +0100 Subject: [PATCH] fix(agent): render dispatcher allow/deny lists without JSON string encoding Sprig toJson on the comma-joined CIDR string produced a JSON-quoted value (e.g. "0.0.0.0/0"), which broke netip.ParsePrefix in the agent worker. Match CONVOY_ENABLE_FEATURE_FLAG by using join + quote only. Bump chart version to 3.7.6. --- Chart.yaml | 2 +- charts/agent/Chart.yaml | 2 +- charts/agent/templates/deployment.yaml | 4 ++-- charts/agent/templates/rollout.yaml | 4 ++-- charts/server/Chart.yaml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 4a4719a..e0535a4 100755 --- a/Chart.yaml +++ b/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: convoy description: Open Source Webhooks Gateway type: application -version: "3.7.5" +version: "3.7.6" appVersion: "v26.1.4" keywords: - Webhooks diff --git a/charts/agent/Chart.yaml b/charts/agent/Chart.yaml index a038fc1..40852e6 100755 --- a/charts/agent/Chart.yaml +++ b/charts/agent/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: agent description: Convoy Agent Chart type: application -version: "3.7.5" +version: "3.7.6" appVersion: "v26.1.4" maintainers: - name: Convoy Engineering Team diff --git a/charts/agent/templates/deployment.yaml b/charts/agent/templates/deployment.yaml index d20f089..62df5fa 100755 --- a/charts/agent/templates/deployment.yaml +++ b/charts/agent/templates/deployment.yaml @@ -375,9 +375,9 @@ spec: - name: CONVOY_DISPATCHER_INSECURE_SKIP_VERIFY value: {{ .Values.env.dispatcher.insecure_skip_verify | quote }} - name: CONVOY_DISPATCHER_ALLOW_LIST - value: {{ join "," .Values.env.dispatcher.allow_list | toJson | quote }} + value: {{ join "," .Values.env.dispatcher.allow_list | quote }} - name: CONVOY_DISPATCHER_DENY_LIST - value: {{ join "," .Values.env.dispatcher.deny_list | toJson | quote }} + value: {{ join "," .Values.env.dispatcher.deny_list | quote }} {{- if .Values.global.convoy.google_oauth_enabled }} # -- Google OAuth SSO configuration diff --git a/charts/agent/templates/rollout.yaml b/charts/agent/templates/rollout.yaml index 3f5aec9..596860d 100644 --- a/charts/agent/templates/rollout.yaml +++ b/charts/agent/templates/rollout.yaml @@ -339,9 +339,9 @@ spec: - name: CONVOY_DISPATCHER_INSECURE_SKIP_VERIFY value: {{ .Values.env.dispatcher.insecure_skip_verify | quote }} - name: CONVOY_DISPATCHER_ALLOW_LIST - value: {{ join "," .Values.env.dispatcher.allow_list | toJson | quote }} + value: {{ join "," .Values.env.dispatcher.allow_list | quote }} - name: CONVOY_DISPATCHER_DENY_LIST - value: {{ join "," .Values.env.dispatcher.deny_list | toJson | quote }} + value: {{ join "," .Values.env.dispatcher.deny_list | quote }} {{- if .Values.global.convoy.google_oauth_enabled }} # -- Google OAuth SSO configuration diff --git a/charts/server/Chart.yaml b/charts/server/Chart.yaml index 628391e..d75927e 100755 --- a/charts/server/Chart.yaml +++ b/charts/server/Chart.yaml @@ -15,7 +15,7 @@ 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.5" +version: "3.7.6" # 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