From 526590007c571c8f24f7bcab94bc0cd179f50582 Mon Sep 17 00:00:00 2001 From: shashidharatd Date: Sat, 31 Dec 2016 00:50:27 +0530 Subject: [PATCH] Fix a bug in cascading deletion of federation objects --- .../util/deletionhelper/deletion_helper.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/federation/pkg/federation-controller/util/deletionhelper/deletion_helper.go b/federation/pkg/federation-controller/util/deletionhelper/deletion_helper.go index 99371f93087..6bf9132bad8 100644 --- a/federation/pkg/federation-controller/util/deletionhelper/deletion_helper.go +++ b/federation/pkg/federation-controller/util/deletionhelper/deletion_helper.go @@ -126,11 +126,11 @@ func (dh *DeletionHelper) HandleObjectInUnderlyingClusters(obj runtime.Object) ( // If the obj has FinalizerOrphan finalizer, then we need to orphan the // corresponding objects in underlying clusters. // Just remove both the finalizers in that case. - obj, err := dh.removeFinalizerFunc(obj, api_v1.FinalizerOrphan) + obj, err := dh.removeFinalizerFunc(obj, FinalizerDeleteFromUnderlyingClusters) if err != nil { return obj, err } - return dh.removeFinalizerFunc(obj, FinalizerDeleteFromUnderlyingClusters) + return dh.removeFinalizerFunc(obj, api_v1.FinalizerOrphan) } glog.V(2).Infof("Deleting obj %s from underlying clusters", objName)