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

some code refactor (#118)

Browse Source 
1. use resourceIdentifier to track resource
2. pass context for deleteAppliedResource

Signed-off-by: Jian Qiu <jqiu@redhat.com>
This commit is contained in:
Jian Qiu
2022-02-25 15:52:47 +08:00
committed by GitHub
parent 7aed123b07
commit 61c038e3f3
5 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/helper/helper_test.go
View File

@@ -417,7 +417,7 @@ func TestDeleteAppliedResourcess(t *testing.T) {
for _, c := range cases {
t.Run(c.name, func(t *testing.T) {
fakeDynamicClient := fakedynamic.NewSimpleDynamicClient(scheme, c.existingResources...)
actual, err := DeleteAppliedResources(c.resourcesToRemove, "testing", fakeDynamicClient, eventstesting.NewTestingEventRecorder(t), c.owner)
actual, err := DeleteAppliedResources(context.TODO(), c.resourcesToRemove, "testing", fakeDynamicClient, eventstesting.NewTestingEventRecorder(t), c.owner)
if err != nil {
t.Errorf("unexpected err: %v", err)
}

5
pkg/helper/helpers.go
View File

@@ -192,6 +192,7 @@ func updateManifestWorkStatus(
// DeleteAppliedResources deletes all given applied resources and returns those pending for finalization
// If the uid recorded in resources is different from what we get by client, ignore the deletion.
func DeleteAppliedResources(
ctx context.Context,
resources []workapiv1.AppliedManifestResourceMeta,
reason string,
dynamicClient dynamic.Interface,
@@ -214,7 +215,7 @@ func DeleteAppliedResources(
u, err := dynamicClient.
Resource(gvr).
Namespace(resource.Namespace).
Get(context.TODO(), resource.Name, metav1.GetOptions{})
Get(ctx, resource.Name, metav1.GetOptions{})
if errors.IsNotFound(err) {
klog.V(2).Infof("Resource %v with key %s/%s is removed Successfully", gvr, resource.Namespace, resource.Name)
continue
@@ -245,7 +246,7 @@ func DeleteAppliedResources(
}
u.SetOwnerReferences(existingOwner)
_, err = dynamicClient.Resource(gvr).Namespace(resource.Namespace).Update(context.TODO(), u, metav1.UpdateOptions{})
_, err = dynamicClient.Resource(gvr).Namespace(resource.Namespace).Update(ctx, u, metav1.UpdateOptions{})
if err != nil {
errs = append(errs, fmt.Errorf(
"Failed to remove owner from resource %v with key %s/%s: %w",

12
pkg/spoke/controllers/appliedmanifestcontroller/appliedmanifestwork_controller.go
View File

@@ -163,7 +163,7 @@ func (m *AppliedManifestWorkController) syncManifestWork(
reason := fmt.Sprintf("it is no longer maintained by manifestwork %s", manifestWork.Name)
resourcesPendingFinalization, errs := helper.DeleteAppliedResources(
noLongerMaintainedResources, reason, m.spokeDynamicClient, controllerContext.Recorder(), *owner)
ctx, noLongerMaintainedResources, reason, m.spokeDynamicClient, controllerContext.Recorder(), *owner)
if len(errs) != 0 {
return utilerrors.NewAggregate(errs)
}
@@ -218,17 +218,13 @@ func (m *AppliedManifestWorkController) syncManifestWork(
func findUntrackedResources(appliedResources, newAppliedResources []workapiv1.AppliedManifestResourceMeta) []workapiv1.AppliedManifestResourceMeta {
var untracked []workapiv1.AppliedManifestResourceMeta
resourceIndex := map[workapiv1.AppliedManifestResourceMeta]struct{}{}
resourceIndex := map[workapiv1.ResourceIdentifier]struct{}{}
for _, resource := range newAppliedResources {
key := resource.DeepCopy()
key.UID, key.Version = "", ""
resourceIndex[*key] = struct{}{}
resourceIndex[resource.ResourceIdentifier] = struct{}{}
}
for _, resource := range appliedResources {
key := resource.DeepCopy()
key.UID, key.Version = "", ""
if _, ok := resourceIndex[*key]; !ok {
if _, ok := resourceIndex[resource.ResourceIdentifier]; !ok {
untracked = append(untracked, resource)
}
}

6
pkg/spoke/controllers/finalizercontroller/appliedmanifestwork_finalize_controller.go
View File

@@ -100,7 +100,7 @@ func (m *AppliedManifestWorkFinalizeController) syncAppliedManifestWork(ctx cont
// scoped resource correctly.
reason := fmt.Sprintf("manifestwork %s is terminating", appliedManifestWork.Spec.ManifestWorkName)
resourcesPendingFinalization, errs := helper.DeleteAppliedResources(
appliedManifestWork.Status.AppliedResources, reason, m.spokeDynamicClient, controllerContext.Recorder(), *owner)
ctx, appliedManifestWork.Status.AppliedResources, reason, m.spokeDynamicClient, controllerContext.Recorder(), *owner)
updatedAppliedManifestWork := false
if len(appliedManifestWork.Status.AppliedResources) != len(resourcesPendingFinalization) {
@@ -109,7 +109,7 @@ func (m *AppliedManifestWorkFinalizeController) syncAppliedManifestWork(ctx cont
appliedManifestWork, err = m.appliedManifestWorkClient.UpdateStatus(ctx, appliedManifestWork, metav1.UpdateOptions{})
if err != nil {
errs = append(errs, fmt.Errorf(
"Failed to update status of AppliedManifestWork %s: %w", originalManifestWork.Name, err))
"failed to update status of AppliedManifestWork %s: %w", originalManifestWork.Name, err))
} else {
updatedAppliedManifestWork = true
}
@@ -132,7 +132,7 @@ func (m *AppliedManifestWorkFinalizeController) syncAppliedManifestWork(ctx cont
helper.RemoveFinalizer(appliedManifestWork, controllers.AppliedManifestWorkFinalizer)
_, err = m.appliedManifestWorkClient.Update(ctx, appliedManifestWork, metav1.UpdateOptions{})
if err != nil {
return fmt.Errorf("Failed to remove finalizer from AppliedManifestWork %s: %w", appliedManifestWork.Name, err)
return fmt.Errorf("failed to remove finalizer from AppliedManifestWork %s: %w", appliedManifestWork.Name, err)
}
return nil
}

2
pkg/spoke/controllers/finalizercontroller/manifestwork_finalize_controller.go
View File

@@ -107,7 +107,7 @@ func (m *ManifestWorkFinalizeController) sync(ctx context.Context, controllerCon
helper.RemoveFinalizer(manifestWork, controllers.ManifestWorkFinalizer)
_, err = m.manifestWorkClient.Update(ctx, manifestWork, metav1.UpdateOptions{})
if err != nil {
return fmt.Errorf("Failed to remove finalizer from ManifestWork %s/%s: %w", manifestWork.Namespace, manifestWork.Name, err)
return fmt.Errorf("failed to remove finalizer from ManifestWork %s/%s: %w", manifestWork.Namespace, manifestWork.Name, err)
}
return nil