Skip to content

fix: usage endless loop #94

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
bobh66 merged 3 commits into from
Feb 4, 2026
+12 −3
Merged

fix: usage endless loop #94

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c98496
fix: usage endless loop
fernandezcuesta Feb 3, 2026
9365054
fix: usages should be skipped from observed resources
fernandezcuesta Feb 3, 2026
1573468
chore: filter by GVK
fernandezcuesta Feb 4, 2026
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
15 changes: 12 additions & 3 deletions fn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,11 @@ func (f *Function) RunFunction(_ context.Context, req *v1.RunFunctionRequest) (*
break
}
if in.EnableDeletionSequencing {
for c := range observedComposed {
if currentRegex.MatchString(string(c)) {
for c, o := range observedComposed {
if currentRegex.MatchString(string(c)) && !isUsage(o, in.UsageVersion) {
for _, k := range keys {
f.log.Debug("Generate Usage of ", "k:", k, "by c:", c)
usage := GenerateUsage(&observedComposed[k].Resource.Unstructured, &observedComposed[c].Resource.Unstructured, in.ReplayDeletion, in.UsageVersion)
usage := GenerateUsage(&observedComposed[k].Resource.Unstructured, &o.Resource.Unstructured, in.ReplayDeletion, in.UsageVersion)
usageComposed := composed.New()
if err := convertViaJSON(usageComposed, usage); err != nil {
response.Fatal(rsp, errors.Wrapf(err, "cannot convert to JSON %s", usage))
Expand Down Expand Up @@ -295,3 +295,12 @@ func convertViaJSON(to, from any) error {
}
return json.Unmarshal(bs, to)
}

func isUsage(composed resource.ObservedComposed, usageVersion v1beta1.UsageVersion) bool {
apiVersion := composed.Resource.GetAPIVersion()
kind := composed.Resource.GetKind()
if usageVersion == v1beta1.UsageV1 {
return apiVersion == ProtectionV1GroupVersion && kind == apiextensionsv1beta1.UsageKind
}
return apiVersion == ProtectionGroupVersion && (kind == protectionv1beta1.ClusterUsageKind || kind == protectionv1beta1.UsageKind)
}
Loading