From cbfda6ddf9e0b915923c63d07dc7d4674e3bf96b Mon Sep 17 00:00:00 2001 From: Sylvain Rabot Date: Fri, 22 May 2026 18:10:55 +0200 Subject: [PATCH 1/3] chore: replace benthos with redpanda/connect Signed-off-by: Sylvain Rabot --- internal/resources/benthos/controller.go | 4 ++-- internal/resources/registries/image.go | 3 +-- tests/e2e/chainsaw/23-benthos-module/chainsaw-test.yaml | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/internal/resources/benthos/controller.go b/internal/resources/benthos/controller.go index 77a740c71..2f014c456 100644 --- a/internal/resources/benthos/controller.go +++ b/internal/resources/benthos/controller.go @@ -200,7 +200,7 @@ func createDeployment(ctx Context, stack *v1beta1.Stack, b *v1beta1.Benthos) err } cmd := []string{ - "/benthos", + "/redpanda-connect", "-r", "/resources/*.yaml", "-t", "/templates/*.yaml", } @@ -311,7 +311,7 @@ func createDeployment(ctx Context, stack *v1beta1.Stack, b *v1beta1.Benthos) err return streams[i].Name < streams[j].Name }) - benthosImage, err := registries.GetBenthosImage(ctx, stack, "v4.23.1-es") + benthosImage, err := registries.GetBenthosImage(ctx, stack, "4.93.0") if err != nil { return err } diff --git a/internal/resources/registries/image.go b/internal/resources/registries/image.go index 73c3d8361..ec47a3e40 100644 --- a/internal/resources/registries/image.go +++ b/internal/resources/registries/image.go @@ -11,7 +11,6 @@ import ( // Format Accepted: // ENDPOINT/ORGANIZATION/REPOSITORY:VERSION // ghcr.io//: -// public.ecr.aws//jeffail/benthos // docker.io//: func NormalizeVersion(version string) string { @@ -33,7 +32,7 @@ func GetBenthosImage(ctx core.Context, stack *v1beta1.Stack, version string) (*I return GetImageConfiguration( ctx, stack.Name, - fmt.Sprintf("public.ecr.aws/formance-internal/jeffail/benthos:%s", NormalizeVersion(version)), + fmt.Sprintf("redpandadata/connect:%s", NormalizeVersion(version)), ) } diff --git a/tests/e2e/chainsaw/23-benthos-module/chainsaw-test.yaml b/tests/e2e/chainsaw/23-benthos-module/chainsaw-test.yaml index 8e42a17ea..8a8feaedf 100644 --- a/tests/e2e/chainsaw/23-benthos-module/chainsaw-test.yaml +++ b/tests/e2e/chainsaw/23-benthos-module/chainsaw-test.yaml @@ -49,7 +49,7 @@ spec: kubectl wait --for=jsonpath='{.status.ready}'=true benthos/chainsaw-benthos --timeout=2m kubectl wait --for=create deployment/benthos -n chainsaw-benthos --timeout=2m kubectl wait --for=create service/benthos -n chainsaw-benthos --timeout=2m - kubectl wait --for=jsonpath='{.spec.template.spec.containers[0].image}'=public.ecr.aws/formance-internal/jeffail/benthos:v4.23.1-es deployment/benthos -n chainsaw-benthos --timeout=2m + kubectl wait --for=jsonpath='{.spec.template.spec.containers[0].image}'=redpandadata/connect:4.93.0 deployment/benthos -n chainsaw-benthos --timeout=2m kubectl wait --for=jsonpath='{.spec.ports[0].port}'=4195 service/benthos -n chainsaw-benthos --timeout=2m assert_jsonpath deployment/benthos '{.spec.template.spec.serviceAccountName}' 'chainsaw-benthos-sa' assert_jsonpath deployment/benthos '{.spec.template.spec.containers[0].ports[0].containerPort}' '4195' @@ -64,7 +64,7 @@ spec: grep -Fx 'NATS_URL=nats.chainsaw-benthos.svc.cluster.local:4222' /tmp/chainsaw-benthos-env grep -Fx 'NATS_BIND=true' /tmp/chainsaw-benthos-env grep -Fx 'AWS_IAM_ENABLED=true' /tmp/chainsaw-benthos-env - assert_jsonpath deployment/benthos '{.spec.template.spec.containers[0].command[0]}' '/benthos' + assert_jsonpath deployment/benthos '{.spec.template.spec.containers[0].command[0]}' '/redpanda-connect' assert_jsonpath deployment/benthos '{.spec.template.spec.containers[0].command[2]}' '/resources/*.yaml' assert_jsonpath deployment/benthos '{.spec.template.spec.containers[0].command[4]}' '/templates/*.yaml' assert_jsonpath deployment/benthos '{.spec.template.spec.containers[0].command[8]}' '/streams/*.yaml' From e5fe52cb90a3b25e9683cbc831f26ae8d77287d2 Mon Sep 17 00:00:00 2001 From: Maxence Maireaux Date: Thu, 23 Jul 2026 12:05:59 +0200 Subject: [PATCH 2/3] fix(registries): qualify redpanda connect image --- docs/09-Configuration reference/settings.catalog.json | 2 +- internal/resources/registries/image.go | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/docs/09-Configuration reference/settings.catalog.json b/docs/09-Configuration reference/settings.catalog.json index 64a2c5a38..1425eff8c 100644 --- a/docs/09-Configuration reference/settings.catalog.json +++ b/docs/09-Configuration reference/settings.catalog.json @@ -42,7 +42,7 @@ "valueType": "string", "default": "defaultCaddyImage", "sources": [ - "internal/resources/registries/image.go:49" + "internal/resources/registries/image.go:44" ] }, { diff --git a/internal/resources/registries/image.go b/internal/resources/registries/image.go index ec47a3e40..63ebd7763 100644 --- a/internal/resources/registries/image.go +++ b/internal/resources/registries/image.go @@ -8,11 +8,6 @@ import ( "github.com/formancehq/operator/v3/internal/resources/settings" ) -// Format Accepted: -// ENDPOINT/ORGANIZATION/REPOSITORY:VERSION -// ghcr.io//: -// docker.io//: - func NormalizeVersion(version string) string { if version == "" { version = "latest" @@ -32,7 +27,7 @@ func GetBenthosImage(ctx core.Context, stack *v1beta1.Stack, version string) (*I return GetImageConfiguration( ctx, stack.Name, - fmt.Sprintf("redpandadata/connect:%s", NormalizeVersion(version)), + fmt.Sprintf("docker.io/redpandadata/connect:%s", NormalizeVersion(version)), ) } From d129a4f476ac8fe6552d189dc01a6faf48f77b23 Mon Sep 17 00:00:00 2001 From: Maxence Maireaux Date: Thu, 23 Jul 2026 12:17:54 +0200 Subject: [PATCH 3/3] test(e2e): expect qualified connect image --- tests/e2e/chainsaw/23-benthos-module/chainsaw-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/chainsaw/23-benthos-module/chainsaw-test.yaml b/tests/e2e/chainsaw/23-benthos-module/chainsaw-test.yaml index 8a8feaedf..e2a873f4a 100644 --- a/tests/e2e/chainsaw/23-benthos-module/chainsaw-test.yaml +++ b/tests/e2e/chainsaw/23-benthos-module/chainsaw-test.yaml @@ -49,7 +49,7 @@ spec: kubectl wait --for=jsonpath='{.status.ready}'=true benthos/chainsaw-benthos --timeout=2m kubectl wait --for=create deployment/benthos -n chainsaw-benthos --timeout=2m kubectl wait --for=create service/benthos -n chainsaw-benthos --timeout=2m - kubectl wait --for=jsonpath='{.spec.template.spec.containers[0].image}'=redpandadata/connect:4.93.0 deployment/benthos -n chainsaw-benthos --timeout=2m + kubectl wait --for=jsonpath='{.spec.template.spec.containers[0].image}'=docker.io/redpandadata/connect:4.93.0 deployment/benthos -n chainsaw-benthos --timeout=2m kubectl wait --for=jsonpath='{.spec.ports[0].port}'=4195 service/benthos -n chainsaw-benthos --timeout=2m assert_jsonpath deployment/benthos '{.spec.template.spec.serviceAccountName}' 'chainsaw-benthos-sa' assert_jsonpath deployment/benthos '{.spec.template.spec.containers[0].ports[0].containerPort}' '4195'