Merge pull request #8228 from ywk253100/240919_restore_priority

Add the Carvel package related resources to the restore priority list
vmware-tanzu · Sep 23, 2024 · 60e9277 · 60e9277
2 parents 0b74a73 + 390ac49
commit 60e9277
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/changelogs/unreleased/8228-ywk253100 b/changelogs/unreleased/8228-ywk253100
@@ -0,0 +1 @@
+Add the Carvel package related resources to the restore priority list
diff --git a/pkg/cmd/server/config/config.go b/pkg/cmd/server/config/config.go
@@ -105,6 +105,8 @@ var (
 		  - 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
+		  - apps.kappctrl.k14s.io and packageinstalls.packaging.carvel.dev go after workloads(pod/replicaset/etc.), otherwise the controller may
+		    creates new workloads before restoring them
 	*/
 	defaultRestorePriorities = types.Priorities{
 		HighPriorities: []string{
@@ -135,6 +137,8 @@ var (
 			"clusterbootstraps.run.tanzu.vmware.com",
 			"clusters.cluster.x-k8s.io",
 			"clusterresourcesets.addons.cluster.x-k8s.io",
+			"apps.kappctrl.k14s.io",
+			"packageinstalls.packaging.carvel.dev",
 		},
 	}
 )