From 390ac497bb1ec11c784ec56b43654fba5758b662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wenkai=20Yin=28=E5=B0=B9=E6=96=87=E5=BC=80=29?= Date: Thu, 19 Sep 2024 16:44:33 +0800 Subject: [PATCH] Add the Carvel package related resources to the restore priority list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add the Carvel package related resources to the restore priority list Signed-off-by: Wenkai Yin(尹文开) --- changelogs/unreleased/8228-ywk253100 | 1 + pkg/cmd/server/config/config.go | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 changelogs/unreleased/8228-ywk253100 diff --git a/changelogs/unreleased/8228-ywk253100 b/changelogs/unreleased/8228-ywk253100 new file mode 100644 index 000000000..1b7a988c9 --- /dev/null +++ b/changelogs/unreleased/8228-ywk253100 @@ -0,0 +1 @@ +Add the Carvel package related resources to the restore priority list \ No newline at end of file diff --git a/pkg/cmd/server/config/config.go b/pkg/cmd/server/config/config.go index ac9fe69df..65d28ec8e 100644 --- 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", }, } )