From 3f80c310130b072af75c541993a9311503c3545a Mon Sep 17 00:00:00 2001 From: Subomi Oluwalana Date: Fri, 15 Nov 2024 21:45:31 +0000 Subject: [PATCH 1/3] feat: added new config for v24.11 --- Chart.yaml | 4 ++-- charts/agent/templates/deployment.yaml | 7 +++++++ values.yaml | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 00dc5d6..bab9e7d 100755 --- a/Chart.yaml +++ b/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: convoy description: Open Source Webhooks Gateway type: application -version: "3.1.0" -appVersion: "24.8.2" +version: "3.2.0" +appVersion: "24.11.1" keywords: - Webhooks - Kubernetes diff --git a/charts/agent/templates/deployment.yaml b/charts/agent/templates/deployment.yaml index 6a0a16f..c8273a4 100755 --- a/charts/agent/templates/deployment.yaml +++ b/charts/agent/templates/deployment.yaml @@ -282,6 +282,13 @@ spec: value: {{ .Values.env.worker_execution_mode | quote }} - name: CONVOY_MAX_RETRY_SECONDS value: {{ .Values.env.max_retry_seconds | quote }} + - name: CONVOY_DISPATCHER_INSECURE_SKIP_VERIFY + value: {{ .Values.env.dispatcher.insecure_skip_verify | quote }} + - name: CONVOY_DISPATCHER_ALLOW_LIST + value: {{ .Values.env.dispatcher.allow_list | quote }} + - name: CONVOY_DISPATCHER_DENY_LIST + value: {{ .Values.env.dispatcher.deny_list | quote }} + livenessProbe: httpGet: path: /health diff --git a/values.yaml b/values.yaml index 57b2c0f..9d8239a 100755 --- a/values.yaml +++ b/values.yaml @@ -189,6 +189,10 @@ agent: worker_execution_mode: default max_retry_seconds: 7200 license_key: *licenseKey + dispatcher: + insecure_skip_verify: true + allow_list: ["0.0.0.0/0"] + deny_list: ["127.0.0.1/8", "169.254.169.254/32"] app: replicaCount: 1 resources: {} From ba99951d6ab90d1531b027527dec2daf3736edd0 Mon Sep 17 00:00:00 2001 From: Subomi Oluwalana Date: Fri, 15 Nov 2024 22:37:24 +0000 Subject: [PATCH 2/3] fix: added config to agent values.yaml --- charts/agent/values.yaml | 8 ++++++++ charts/server/values.yaml | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/charts/agent/values.yaml b/charts/agent/values.yaml index 1d6be29..bf4ac48 100755 --- a/charts/agent/values.yaml +++ b/charts/agent/values.yaml @@ -79,7 +79,15 @@ env: worker_execution_mode: default max_retry_seconds: 7200 license_key: "" + dispatcher: + insecure_skip_verify: true + allow_list: ["0.0.0.0/0"] + deny_list: ["127.0.0.1/8", "169.254.169.254/32"] +# These values serve as defaults for standalone deployment +# When deployed as a subchart, these can be overridden by parent values: +# - global.convoy.image +# - global.convoy.tag image: repository: getconvoy/convoy pullPolicy: Always diff --git a/charts/server/values.yaml b/charts/server/values.yaml index 102c3fb..ba4b001 100755 --- a/charts/server/values.yaml +++ b/charts/server/values.yaml @@ -77,6 +77,10 @@ env: max_retry_seconds: 7200 license_key: "" +# These values serve as defaults for standalone deployment +# When deployed as a subchart, these can be overridden by parent values: +# - global.convoy.image +# - global.convoy.tag image: repository: getconvoy/convoy pullPolicy: Always From 9fc17126994c22f3346d5cf6f05bb1d893cc3a08 Mon Sep 17 00:00:00 2001 From: Subomi Oluwalana Date: Sat, 16 Nov 2024 13:02:55 +0000 Subject: [PATCH 3/3] docs: update docs --- README.md | 10 +++++++--- charts/agent/values.yaml | 2 +- values.yaml | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2673414..2473615 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # convoy -![Version: 3.1.0](https://img.shields.io/badge/Version-3.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 24.8.2](https://img.shields.io/badge/AppVersion-24.8.2-informational?style=flat-square) +![Version: 3.2.0](https://img.shields.io/badge/Version-3.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 24.11.1](https://img.shields.io/badge/AppVersion-24.11.1-informational?style=flat-square) Open Source Webhooks Gateway @@ -30,6 +30,10 @@ Open Source Webhooks Gateway | agent.autoscaling.targetMemoryUtilizationPercentage | int | `80` | | | agent.env.analytics_enabled | bool | `true` | | | agent.env.consumer_pool_size | int | `100` | | +| agent.env.dispatcher.allow_list[0] | string | `"0.0.0.0/0"` | | +| 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.enable_feature_flag | list | `[]` | | | agent.env.enable_profiling | bool | `false` | | | agent.env.environment | string | `"oss"` | | @@ -161,7 +165,7 @@ Open Source Webhooks Gateway | server.image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the server image | | server.image.repository | string | `"getconvoy/convoy"` | Repository to be used by the server. The latest tag is used by default | | server.ingress.annotations | object | `{}` | | -| server.ingress.enabled | bool | `false` | Enable ingress for the server | +| server.ingress.enabled | bool | `true` | Enable ingress for the server | | server.ingress.hosts[0].host | string | `"test.com"` | | | server.ingress.hosts[0].http.paths[0].path | string | `"/"` | | | server.ingress.hosts[0].http.paths[0].pathType | string | `"Prefix"` | | @@ -173,4 +177,4 @@ Open Source Webhooks Gateway | server.service.type | string | `"ClusterIP"` | Type of service for the server | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/agent/values.yaml b/charts/agent/values.yaml index bf4ac48..b3ec60f 100755 --- a/charts/agent/values.yaml +++ b/charts/agent/values.yaml @@ -80,7 +80,7 @@ env: max_retry_seconds: 7200 license_key: "" dispatcher: - insecure_skip_verify: true + insecure_skip_verify: false allow_list: ["0.0.0.0/0"] deny_list: ["127.0.0.1/8", "169.254.169.254/32"] diff --git a/values.yaml b/values.yaml index 9d8239a..9645bfe 100755 --- a/values.yaml +++ b/values.yaml @@ -190,7 +190,7 @@ agent: max_retry_seconds: 7200 license_key: *licenseKey dispatcher: - insecure_skip_verify: true + insecure_skip_verify: false allow_list: ["0.0.0.0/0"] deny_list: ["127.0.0.1/8", "169.254.169.254/32"] app: @@ -307,7 +307,7 @@ server: ingress: # -- Enable ingress for the server - enabled: false + enabled: true annotations: {} ingressClassName: "" tls: