From 6bb4aeff959fb5d46ad194480aa7d28d5530d33a Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Tue, 7 Oct 2025 20:46:31 +0300 Subject: [PATCH 1/2] Fix `--storage-adv-addr` for source-watcher Signed-off-by: Stefan Prodan (cherry picked from commit 8c45f25f33883045f3d7381994aab8895bd727a0) --- pkg/manifestgen/install/templates.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/manifestgen/install/templates.go b/pkg/manifestgen/install/templates.go index d531d1f2..4971bb61 100644 --- a/pkg/manifestgen/install/templates.go +++ b/pkg/manifestgen/install/templates.go @@ -83,7 +83,7 @@ patches: value: --log-level={{$logLevel}} - op: replace path: /spec/template/spec/containers/0/args/6 - value: --storage-adv-addr=source-controller.$(RUNTIME_NAMESPACE).svc.{{$clusterDomain}}. + value: --storage-adv-addr={{$component}}.$(RUNTIME_NAMESPACE).svc.{{$clusterDomain}}. {{- else }} - target: group: apps From bb9b4e8533e75294d400e06dd0eaddc3e80358e8 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Tue, 7 Oct 2025 20:47:37 +0300 Subject: [PATCH 2/2] Use `RUNTIME_NAMESPACE` when setting `--events-addr` Signed-off-by: Stefan Prodan (cherry picked from commit f2ff083b8ee9c2b20df184d40ac956c1081adae9) --- pkg/manifestgen/install/manifests.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/manifestgen/install/manifests.go b/pkg/manifestgen/install/manifests.go index e48eac0a..4a1463b0 100644 --- a/pkg/manifestgen/install/manifests.go +++ b/pkg/manifestgen/install/manifests.go @@ -75,7 +75,7 @@ func generate(base string, options Options) error { // traffic from going through http proxy. Without fully specified // domain they need to mention `notifications-controller` explicitly in // `no_proxy` variable after debugging http proxy logs. - options.EventsAddr = fmt.Sprintf("http://%s.%s.svc.%s./", options.NotificationController, options.Namespace, options.ClusterDomain) + options.EventsAddr = fmt.Sprintf("http://%s.$(RUNTIME_NAMESPACE).svc.%s./", options.NotificationController, options.ClusterDomain) } if err := execTemplate(options, namespaceTmpl, path.Join(base, "namespace.yaml")); err != nil {