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.

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

PWX-33569: Creating objectstore locations in destination cluster in unidirectional clusterpair creation with storkctl #1501

Merged
merged 3 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions pkg/migration/controllers/clusterpair.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,6 @@ func (c *ClusterPairController) cleanup(clusterPair *stork_api.ClusterPair) erro
}
}
}
if !skipDelete && clusterPair.Status.RemoteStorageID != "" {
return c.volDriver.DeletePair(clusterPair)
}

// Delete the backuplocation and secret associated with clusterpair as part of the delete
if backuplocationName, ok := clusterPair.Spec.Options["backuplocation"]; ok {
Expand Down Expand Up @@ -259,6 +256,11 @@ func (c *ClusterPairController) cleanup(clusterPair *stork_api.ClusterPair) erro
}
}
}

if !skipDelete && clusterPair.Status.RemoteStorageID != "" {
return c.volDriver.DeletePair(clusterPair)
}

return nil
}

Expand Down
Loading