⚠️ Updated function name HasPausedAnnotation to HasPaused and HasSkipRemediationAnnotation to HasSkipRemediation

controllers/machinehealthcheck_targets.go

@@ -337,11 +337,11 @@ func minDuration(durations []time.Duration) time.Duration {
 // shouldSkipRemediation checks if the machine should be skipped for remediation.
 // Returns true if it should be skipped along with the reason for skipping.
 func shouldSkipRemediation(m *clusterv1.Machine) (bool, string) {
-	if annotations.HasPausedAnnotation(m) {
+	if annotations.HasPaused(m) {
 		return true, fmt.Sprintf("machine has %q annotation", clusterv1.PausedAnnotation)
 	}
 
-	if annotations.HasSkipRemediationAnnotation(m) {
+	if annotations.HasSkipRemediation(m) {
 		return true, fmt.Sprintf("machine has %q annotation", clusterv1.MachineSkipRemediationAnnotation)
 	}
 

controllers/topology/clusterclass_controller.go

@@ -80,7 +80,7 @@ func (r *ClusterClassReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	}
 
 	// Return early if the ClusterClass is paused.
-	if annotations.HasPausedAnnotation(clusterClass) {
+	if annotations.HasPaused(clusterClass) {
 		log.Info("Reconciliation is paused for this object")
 		return ctrl.Result{}, nil
 	}
@@ -172,7 +172,7 @@ func (r *ClusterClassReconciler) reconcileExternal(ctx context.Context, clusterC
 	}
 
 	// If external ref is paused, return early.
-	if annotations.HasPausedAnnotation(obj) {
+	if annotations.HasPaused(obj) {
 		log.V(3).Info("External object referenced is paused", "refGroupVersionKind", ref.GroupVersionKind(), "refName", ref.Name)
 		return nil
 	}

util/annotations/helpers.go

@@ -29,7 +29,7 @@ func IsPaused(cluster *clusterv1.Cluster, o metav1.Object) bool {
 	if cluster.Spec.Paused {
 		return true
 	}
-	return HasPausedAnnotation(o)
+	return HasPaused(o)
 }
 
 // IsExternallyManaged returns true if the object has the `managed-by` annotation.
@@ -38,15 +38,27 @@ func IsExternallyManaged(o metav1.Object) bool {
 }
 
 // HasPausedAnnotation returns true if the object has the `paused` annotation.
+// Deprecated: this is going to be removed in a next release. Please use `HasPaused` instead.
 func HasPausedAnnotation(o metav1.Object) bool {
 	return hasAnnotation(o, clusterv1.PausedAnnotation)
 }
 
+// HasPaused returns true if the object has the `paused` annotation.
+func HasPaused(o metav1.Object) bool {
+	return hasAnnotation(o, clusterv1.PausedAnnotation)
+}
+
 // HasSkipRemediationAnnotation returns true if the object has the `skip-remediation` annotation.
+// Deprecated: this is going to be removed in a next release. Please use `HasSkipRemediation` instead.
 func HasSkipRemediationAnnotation(o metav1.Object) bool {
 	return hasAnnotation(o, clusterv1.MachineSkipRemediationAnnotation)
 }
 
+// HasSkipRemediation returns true if the object has the `skip-remediation` annotation.
+func HasSkipRemediation(o metav1.Object) bool {
+	return hasAnnotation(o, clusterv1.MachineSkipRemediationAnnotation)
+}
+
 // HasWithPrefix returns true if at least one of the annotations has the prefix specified.
 func HasWithPrefix(prefix string, annotations map[string]string) bool {
 	for key := range annotations {

util/predicates/generic_predicates.go

@@ -186,7 +186,7 @@ func ResourceNotPausedAndHasFilterLabel(logger logr.Logger, labelValue string) p
 func processIfNotPaused(logger logr.Logger, obj client.Object) bool {
 	kind := strings.ToLower(obj.GetObjectKind().GroupVersionKind().Kind)
 	log := logger.WithValues("namespace", obj.GetNamespace(), kind, obj.GetName())
-	if annotations.HasPausedAnnotation(obj) {
+	if annotations.HasPaused(obj) {
 		log.V(4).Info("Resource is paused, will not attempt to map resource")
 		return false
 	}