github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-05-16 22:27:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address remaining comments on pr #25

Browse Source
This commit is contained in:
Yang Le
2020-06-30 17:29:55 +08:00
parent f202c51ee8
commit 25e2dbdab7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/helper/helpers.go
View File

@@ -265,8 +265,8 @@ func DeleteAppliedResources(resources []workapiv1.AppliedManifestResourceMeta, d
}
pendingFinalization := u.GetDeletionTimestamp() != nil && !u.GetDeletionTimestamp().IsZero()
waitingForFinalization := len(resource.UID) > 0
if pendingFinalization {
waitingForFinalization := len(resource.UID) > 0
if waitingForFinalization && resource.UID != string(u.GetUID()) {
// the instance is deleted, so do not add to the resourcesPendingDeletion list
continue
@@ -280,7 +280,7 @@ func DeleteAppliedResources(resources []workapiv1.AppliedManifestResourceMeta, d
}
// forget this item if the UID does not match the resource UID we previously deleted
if len(resource.UID) > 0 && resource.UID != string(u.GetUID()) {
if waitingForFinalization && resource.UID != string(u.GetUID()) {
continue
}

2
test/integration/work_test.go
View File

@@ -391,7 +391,7 @@ var _ = ginkgo.Describe("ManifestWork", func() {
})
ginkgo.Context("Foreground deletion", func() {
var finalizer = "a.b.c/d"
var finalizer = "cluster.open-cluster-management.io/testing"
ginkgo.BeforeEach(func() {
manifests = []workapiv1.Manifest{
util.ToManifest(util.NewConfigmap(o.SpokeClusterName, "cm1", map[string]string{"a": "b"}, []string{finalizer})),