Skip to content

feat: rename finalizerString to FinalizerString #556

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
ack-prow merged 1 commit into from
Oct 30, 2024
Merged

feat: rename finalizerString to FinalizerString #556

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions templates/pkg/resource/descriptor.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
)

const (
finalizerString = "finalizers.{{ .APIGroup }}/{{ .CRD.Kind }}"
FinalizerString = "finalizers.{{ .APIGroup }}/{{ .CRD.Kind }}"
)

var (
Expand Down Expand Up @@ -75,8 +75,8 @@ func (d *resourceDescriptor) IsManaged(
// https://github.com/kubernetes-sigs/controller-runtime/issues/994 is
// fixed. This should be able to be:
//
// return k8sctrlutil.ContainsFinalizer(obj, finalizerString)
return containsFinalizer(obj, finalizerString)
// return k8sctrlutil.ContainsFinalizer(obj, FinalizerString)
return containsFinalizer(obj, FinalizerString)
}

// Remove once https://github.com/kubernetes-sigs/controller-runtime/issues/994
Expand Down Expand Up @@ -105,7 +105,7 @@ func (d *resourceDescriptor) MarkManaged(
// Should not happen. If it does, there is a bug in the code
panic("nil RuntimeMetaObject in AWSResource")
}
k8sctrlutil.AddFinalizer(obj, finalizerString)
k8sctrlutil.AddFinalizer(obj, FinalizerString)
}

// MarkUnmanaged removes the supplied resource from management by ACK. What
Expand All @@ -120,7 +120,7 @@ func (d *resourceDescriptor) MarkUnmanaged(
// Should not happen. If it does, there is a bug in the code
panic("nil RuntimeMetaObject in AWSResource")
}
k8sctrlutil.RemoveFinalizer(obj, finalizerString)
k8sctrlutil.RemoveFinalizer(obj, FinalizerString)
}

// MarkAdopted places descriptors on the custom resource that indicate the
Expand Down