From 4e90c30706e79cf292684f4b44514dbdf2dd2eb7 Mon Sep 17 00:00:00 2001 From: lyndon <98304688+Lyndon-Li@users.noreply.github.com> Date: Fri, 21 Jul 2023 21:29:56 +0800 Subject: [PATCH] restict namespace to node-agent cache (#6527) Signed-off-by: Lyndon-Li --- changelogs/unreleased/6527-Lyndon-Li | 1 + pkg/cmd/cli/nodeagent/server.go | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 changelogs/unreleased/6527-Lyndon-Li diff --git a/changelogs/unreleased/6527-Lyndon-Li b/changelogs/unreleased/6527-Lyndon-Li new file mode 100644 index 0000000000..c1fd3f8d96 --- /dev/null +++ b/changelogs/unreleased/6527-Lyndon-Li @@ -0,0 +1 @@ +Fix issue #6519. Restrict the client manager of node-agent server to include only Velero resources from the server's namespace, otherwise, the controllers will try to reconcile CRs from all the installed Velero namespaces. \ No newline at end of file diff --git a/pkg/cmd/cli/nodeagent/server.go b/pkg/cmd/cli/nodeagent/server.go index 2cc091158f..e5e2c190cb 100644 --- a/pkg/cmd/cli/nodeagent/server.go +++ b/pkg/cmd/cli/nodeagent/server.go @@ -132,6 +132,12 @@ func newNodeAgentServer(logger logrus.FieldLogger, factory client.Factory, metri &v1.Pod{}: { Field: fields.Set{"spec.nodeName": nodeName}.AsSelector(), }, + &velerov1api.PodVolumeBackup{}: { + Field: fields.Set{"metadata.namespace": factory.Namespace()}.AsSelector(), + }, + &velerov1api.PodVolumeRestore{}: { + Field: fields.Set{"metadata.namespace": factory.Namespace()}.AsSelector(), + }, }, } mgr, err := ctrl.NewManager(clientConfig, ctrl.Options{