Skip to content

MGMT-18702: Fix error due to missing local cluster name #6721

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

Merged
openshift-merge-bot merged 1 commit into from
Sep 3, 2024
Merged

MGMT-18702: Fix error due to missing local cluster name #6721

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
4 changes: 4 additions & 0 deletions internal/controller/controllers/local_cluster_import_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,10 @@ func (r *LocalClusterImportReconciler) hasLocalManagedCluster(ctx context.Contex
// If they are present, they will be deleted
// No error will be returned if these are not found as this is the desired state.
func (r *LocalClusterImportReconciler) ensureLocalClusterCRsDeleted(ctx context.Context) error {
if r.localClusterName == "" {
r.log.Infof("skipping local cluster import cleanup as feature has not previously been enabled")
return nil
}
err := r.deleteClusterDeployment(ctx, r.localClusterName, r.localClusterName)
if err != nil && !k8serrors.IsNotFound(err) {
r.log.Errorf("could not delete local cluster ClusterDeployment due to error %s", err.Error())
Expand Down