From c1acd9c6c58a30b930c5203fee8b8e6c45380075 Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Fri, 31 Mar 2023 17:03:32 +0800 Subject: [PATCH] Make Velero server continue to work, when CSI feature is enabled and Snapshot CRD group is missing. Signed-off-by: Xun Jiang --- changelogs/unreleased/6062-blackpiglet | 1 + pkg/cmd/server/server.go | 1 + 2 files changed, 2 insertions(+) create mode 100644 changelogs/unreleased/6062-blackpiglet diff --git a/changelogs/unreleased/6062-blackpiglet b/changelogs/unreleased/6062-blackpiglet new file mode 100644 index 000000000..0843b3a8c --- /dev/null +++ b/changelogs/unreleased/6062-blackpiglet @@ -0,0 +1 @@ +Make Velero not exits when EnableCSI is on and CSI snapshot not installed \ No newline at end of file diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go index a2a0516f2..721b7cc35 100644 --- a/pkg/cmd/server/server.go +++ b/pkg/cmd/server/server.go @@ -585,6 +585,7 @@ func (s *server) getCSIVolumeSnapshotListers() (vsLister snapshotv1listers.Volum case apierrors.IsNotFound(err): // CSI is enabled, but the required CRDs aren't installed, so halt. s.logger.Warnf("The '%s' feature flag was specified, but CSI API group [%s] was not found.", velerov1api.CSIFeatureFlag, snapshotv1api.SchemeGroupVersion.String()) + err = nil case err == nil: wrapper := NewCSIInformerFactoryWrapper(s.csiSnapshotClient)