Add ClusterClasses to the restore priority list

Make sure ClusterClasses are stored before Clusters. Fixes vmware-tanzu#4767 Signed-off-by: Daniel Jiang <[email protected]>
reasonerjt · Apr 27, 2022 · f89691c · f89691c
1 parent de17605
commit f89691c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/changelogs/unreleased/4866-reasonerjt b/changelogs/unreleased/4866-reasonerjt
@@ -0,0 +1 @@
+Add ClusterClasses to the restore priority list
diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go
@@ -476,6 +476,7 @@ func (s *server) veleroResourcesExist() error {
 //	 have restic restores run before controllers adopt the pods.
 // - Replica sets go before deployments/other controllers so they can be explicitly
 //	 restored and be adopted by controllers.
+// - CAPI ClusterClasses go before Clusters.
 // - CAPI Clusters come before ClusterResourceSets because failing to do so means the CAPI controller-manager will panic.
 //	 Both Clusters and ClusterResourceSets need to come before ClusterResourceSetBinding in order to properly restore workload clusters.
 //   See https://github.com/kubernetes-sigs/cluster-api/issues/4105
@@ -498,6 +499,7 @@ var defaultRestorePriorities = []string{
 	// to ensure that we prioritize restoring from "apps" too, since this is how they're stored
 	// in the backup.
 	"replicasets.apps",
+	"clusterclasses.cluster.x-k8s.io",
 	"clusters.cluster.x-k8s.io",
 	"clusterresourcesets.addons.cluster.x-k8s.io",
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add ClusterClasses to the restore priority list