From d6ccd5f66085626c65240279e198101789a45f83 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: Fri, 26 May 2023 09:41:56 +0800 Subject: [PATCH] Revert "Hardcode the restore order for IPAM resources" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 88bd00c6dee01846166c26775919ff162c3c819f. Signed-off-by: Wenkai Yin(尹文开) --- changelogs/unreleased/6288-ywk253100 | 1 - pkg/cmd/server/server.go | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 changelogs/unreleased/6288-ywk253100 diff --git a/changelogs/unreleased/6288-ywk253100 b/changelogs/unreleased/6288-ywk253100 deleted file mode 100644 index e54a45042..000000000 --- a/changelogs/unreleased/6288-ywk253100 +++ /dev/null @@ -1 +0,0 @@ -Hardcode the restore order for IPAM resources \ No newline at end of file diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go index 840a11f08..ba8b5685b 100644 --- a/pkg/cmd/server/server.go +++ b/pkg/cmd/server/server.go @@ -510,11 +510,10 @@ func (s *server) veleroResourcesExist() error { // - CAPI ClusterClasses go before Clusters. // - Services go before Clusters so they can be adopted by AKO-operator and no new Services will be created // for the same clusters -// - IPAM GlobalInClusterPool/InClusterPool/IPAddress go before IPAddressClaim so no new IPAddress is created for the claim // // Low priorities: // - Tanzu ClusterBootstraps go last as it can reference any other kind of resources. -// - ClusterBootstraps go before CAPI Clusters otherwise a new default ClusterBootstrap object is created for the cluster +// ClusterBootstraps go before CAPI Clusters otherwise a new default ClusterBootstrap object is created for the cluster // - 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 @@ -540,10 +539,6 @@ var defaultRestorePriorities = restore.Priorities{ "replicasets.apps", "clusterclasses.cluster.x-k8s.io", "services", - "globalinclusterippools.ipam.cluster.x-k8s.io", - "inclusterippools.ipam.cluster.x-k8s.io", - "ipaddresses.ipam.cluster.x-k8s.io", - "ipaddressclaims.ipam.cluster.x-k8s.io", }, LowPriorities: []string{ "clusterbootstraps.run.tanzu.vmware.com",