github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-02-14 18:09:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply only when having finalizer (#270)

Browse Source 
Signed-off-by: Jian Qiu <jqiu@redhat.com>

Signed-off-by: Jian Qiu <jqiu@redhat.com>
This commit is contained in:
Jian Qiu
2022-08-22 22:06:14 +08:00
committed by GitHub
parent 59b5e56fd3
commit b004bcc614
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/operators/klusterlet/controllers/klusterletcontroller/klusterlet_controller.go
View File

@@ -311,6 +311,11 @@ func (n *klusterletController) sync(ctx context.Context, controllerContext facto
return nil
}
// do nothing until finalizer is added.
if !hasFinalizer(klusterlet, klusterletFinalizer) {
return nil
}
if !readyToOperateManagedClusterResources(klusterlet, config.InstallMode) {
// wait for the external managed kubeconfig to exist to apply resources on the manged cluster
return nil
@@ -466,7 +471,7 @@ func readyToOperateManagedClusterResources(klusterlet *operatorapiv1.Klusterlet,
return true
}
return meta.IsStatusConditionTrue(klusterlet.Status.Conditions, klusterletReadyToApply)
return meta.IsStatusConditionTrue(klusterlet.Status.Conditions, klusterletReadyToApply) && hasFinalizer(klusterlet, klusterletHostedFinalizer)
}
// getClusterNameFromHubKubeConfigSecret gets cluster name from hub kubeConfig secret