Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Hardcode the restore order for IPAM resources" #6312

Merged
merged 1 commit into from
May 30, 2023
Merged

Revert "Hardcode the restore order for IPAM resources" #6312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion changelogs/unreleased/6288-ywk253100
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions pkg/cmd/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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",
Expand Down