chore: move finalizer to api v1

rxbn · rxbn · commit 3a6ef0f2d6f6 · 2025-02-20T21:09:06.000+01:00
diff --git a/api/v1/common.go b/api/v1/common.go
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package common
+package v1
 
 const CloudflareOperatorFinalizer = "cloudflare-operator.io/finalizer"
diff --git a/internal/controller/account_controller.go b/internal/controller/account_controller.go
@@ -90,8 +90,8 @@ func (r *AccountReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re
 		return ctrl.Result{}, nil
 	}
 
-	if !controllerutil.ContainsFinalizer(account, common.CloudflareOperatorFinalizer) {
-		controllerutil.AddFinalizer(account, common.CloudflareOperatorFinalizer)
+	if !controllerutil.ContainsFinalizer(account, cloudflareoperatoriov1.CloudflareOperatorFinalizer) {
+		controllerutil.AddFinalizer(account, cloudflareoperatoriov1.CloudflareOperatorFinalizer)
 		return ctrl.Result{Requeue: true}, nil
 	}
 
@@ -129,5 +129,5 @@ func (r *AccountReconciler) reconcileAccount(ctx context.Context, account *cloud
 // reconcileDelete reconciles the deletion of the account
 func (r *AccountReconciler) reconcileDelete(account *cloudflareoperatoriov1.Account) {
 	metrics.AccountFailureCounter.DeleteLabelValues(account.Name)
-	controllerutil.RemoveFinalizer(account, common.CloudflareOperatorFinalizer)
+	controllerutil.RemoveFinalizer(account, cloudflareoperatoriov1.CloudflareOperatorFinalizer)
 }
diff --git a/internal/controller/dnsrecord_controller.go b/internal/controller/dnsrecord_controller.go
@@ -140,8 +140,8 @@ func (r *DNSRecordReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		return ctrl.Result{}, nil
 	}
 
-	if !controllerutil.ContainsFinalizer(dnsrecord, common.CloudflareOperatorFinalizer) {
-		controllerutil.AddFinalizer(dnsrecord, common.CloudflareOperatorFinalizer)
+	if !controllerutil.ContainsFinalizer(dnsrecord, cloudflareoperatoriov1.CloudflareOperatorFinalizer) {
+		controllerutil.AddFinalizer(dnsrecord, cloudflareoperatoriov1.CloudflareOperatorFinalizer)
 		return ctrl.Result{Requeue: true}, nil
 	}
 
@@ -323,7 +323,7 @@ func (r *DNSRecordReconciler) reconcileDelete(ctx context.Context, zoneID string
 		return err
 	}
 	metrics.DnsRecordFailureCounter.DeleteLabelValues(dnsrecord.Namespace, dnsrecord.Name, dnsrecord.Spec.Name)
-	controllerutil.RemoveFinalizer(dnsrecord, common.CloudflareOperatorFinalizer)
+	controllerutil.RemoveFinalizer(dnsrecord, cloudflareoperatoriov1.CloudflareOperatorFinalizer)
 
 	return nil
 }
diff --git a/internal/controller/ip_controller.go b/internal/controller/ip_controller.go
@@ -98,8 +98,8 @@ func (r *IPReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result
 		return ctrl.Result{}, nil
 	}
 
-	if !controllerutil.ContainsFinalizer(ip, common.CloudflareOperatorFinalizer) {
-		controllerutil.AddFinalizer(ip, common.CloudflareOperatorFinalizer)
+	if !controllerutil.ContainsFinalizer(ip, cloudflareoperatoriov1.CloudflareOperatorFinalizer) {
+		controllerutil.AddFinalizer(ip, cloudflareoperatoriov1.CloudflareOperatorFinalizer)
 		return ctrl.Result{Requeue: true}, nil
 	}
 
@@ -279,5 +279,5 @@ func (r *IPReconciler) getIPSource(ctx context.Context, source cloudflareoperato
 // reconcileDelete reconciles the deletion of the ip
 func (r *IPReconciler) reconcileDelete(ip *cloudflareoperatoriov1.IP) {
 	metrics.IpFailureCounter.DeleteLabelValues(ip.Name, ip.Spec.Type)
-	controllerutil.RemoveFinalizer(ip, common.CloudflareOperatorFinalizer)
+	controllerutil.RemoveFinalizer(ip, cloudflareoperatoriov1.CloudflareOperatorFinalizer)
 }
diff --git a/internal/controller/zone_controller.go b/internal/controller/zone_controller.go
@@ -96,8 +96,8 @@ func (r *ZoneReconciler) Reconcile(ctx context.Context, req ctrl.Request) (resul
 		return ctrl.Result{}, nil
 	}
 
-	if !controllerutil.ContainsFinalizer(zone, common.CloudflareOperatorFinalizer) {
-		controllerutil.AddFinalizer(zone, common.CloudflareOperatorFinalizer)
+	if !controllerutil.ContainsFinalizer(zone, cloudflareoperatoriov1.CloudflareOperatorFinalizer) {
+		controllerutil.AddFinalizer(zone, cloudflareoperatoriov1.CloudflareOperatorFinalizer)
 		return ctrl.Result{Requeue: true}, nil
 	}
 
@@ -170,5 +170,5 @@ func (r *ZoneReconciler) handlePrune(ctx context.Context, zone *cloudflareoperat
 // reconcileDelete reconciles the deletion of the zone
 func (r *ZoneReconciler) reconcileDelete(zone *cloudflareoperatoriov1.Zone) {
 	metrics.ZoneFailureCounter.DeleteLabelValues(zone.Name, zone.Spec.Name)
-	controllerutil.RemoveFinalizer(zone, common.CloudflareOperatorFinalizer)
+	controllerutil.RemoveFinalizer(zone, cloudflareoperatoriov1.CloudflareOperatorFinalizer)
 }

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,8 @@ func (r *AccountReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re`
`90`	`90`	`return ctrl.Result{}, nil`
`91`	`91`	`}`
`92`	`92`
`93`		`- if !controllerutil.ContainsFinalizer(account, common.CloudflareOperatorFinalizer) {`
`94`		`- controllerutil.AddFinalizer(account, common.CloudflareOperatorFinalizer)`
	`93`	`+ if !controllerutil.ContainsFinalizer(account, cloudflareoperatoriov1.CloudflareOperatorFinalizer) {`
	`94`	`+ controllerutil.AddFinalizer(account, cloudflareoperatoriov1.CloudflareOperatorFinalizer)`
`95`	`95`	`return ctrl.Result{Requeue: true}, nil`
`96`	`96`	`}`
`97`	`97`
`@@ -129,5 +129,5 @@ func (r AccountReconciler) reconcileAccount(ctx context.Context, account cloud`
`129`	`129`	`// reconcileDelete reconciles the deletion of the account`
`130`	`130`	`func (r AccountReconciler) reconcileDelete(account cloudflareoperatoriov1.Account) {`
`131`	`131`	`metrics.AccountFailureCounter.DeleteLabelValues(account.Name)`
`132`		`- controllerutil.RemoveFinalizer(account, common.CloudflareOperatorFinalizer)`
	`132`	`+ controllerutil.RemoveFinalizer(account, cloudflareoperatoriov1.CloudflareOperatorFinalizer)`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,8 @@ func (r *DNSRecordReconciler) Reconcile(ctx context.Context, req ctrl.Request) (`
`140`	`140`	`return ctrl.Result{}, nil`
`141`	`141`	`}`
`142`	`142`
`143`		`- if !controllerutil.ContainsFinalizer(dnsrecord, common.CloudflareOperatorFinalizer) {`
`144`		`- controllerutil.AddFinalizer(dnsrecord, common.CloudflareOperatorFinalizer)`
	`143`	`+ if !controllerutil.ContainsFinalizer(dnsrecord, cloudflareoperatoriov1.CloudflareOperatorFinalizer) {`
	`144`	`+ controllerutil.AddFinalizer(dnsrecord, cloudflareoperatoriov1.CloudflareOperatorFinalizer)`
`145`	`145`	`return ctrl.Result{Requeue: true}, nil`
`146`	`146`	`}`
`147`	`147`
`@@ -323,7 +323,7 @@ func (r *DNSRecordReconciler) reconcileDelete(ctx context.Context, zoneID string`
`323`	`323`	`return err`
`324`	`324`	`}`
`325`	`325`	`metrics.DnsRecordFailureCounter.DeleteLabelValues(dnsrecord.Namespace, dnsrecord.Name, dnsrecord.Spec.Name)`
`326`		`- controllerutil.RemoveFinalizer(dnsrecord, common.CloudflareOperatorFinalizer)`
	`326`	`+ controllerutil.RemoveFinalizer(dnsrecord, cloudflareoperatoriov1.CloudflareOperatorFinalizer)`
`327`	`327`
`328`	`328`	`return nil`
`329`	`329`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,8 @@ func (r *IPReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result`
`98`	`98`	`return ctrl.Result{}, nil`
`99`	`99`	`}`
`100`	`100`
`101`		`- if !controllerutil.ContainsFinalizer(ip, common.CloudflareOperatorFinalizer) {`
`102`		`- controllerutil.AddFinalizer(ip, common.CloudflareOperatorFinalizer)`
	`101`	`+ if !controllerutil.ContainsFinalizer(ip, cloudflareoperatoriov1.CloudflareOperatorFinalizer) {`
	`102`	`+ controllerutil.AddFinalizer(ip, cloudflareoperatoriov1.CloudflareOperatorFinalizer)`
`103`	`103`	`return ctrl.Result{Requeue: true}, nil`
`104`	`104`	`}`
`105`	`105`
`@@ -279,5 +279,5 @@ func (r *IPReconciler) getIPSource(ctx context.Context, source cloudflareoperato`
`279`	`279`	`// reconcileDelete reconciles the deletion of the ip`
`280`	`280`	`func (r IPReconciler) reconcileDelete(ip cloudflareoperatoriov1.IP) {`
`281`	`281`	`metrics.IpFailureCounter.DeleteLabelValues(ip.Name, ip.Spec.Type)`
`282`		`- controllerutil.RemoveFinalizer(ip, common.CloudflareOperatorFinalizer)`
	`282`	`+ controllerutil.RemoveFinalizer(ip, cloudflareoperatoriov1.CloudflareOperatorFinalizer)`
`283`	`283`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,8 @@ func (r *ZoneReconciler) Reconcile(ctx context.Context, req ctrl.Request) (resul`
`96`	`96`	`return ctrl.Result{}, nil`
`97`	`97`	`}`
`98`	`98`
`99`		`- if !controllerutil.ContainsFinalizer(zone, common.CloudflareOperatorFinalizer) {`
`100`		`- controllerutil.AddFinalizer(zone, common.CloudflareOperatorFinalizer)`
	`99`	`+ if !controllerutil.ContainsFinalizer(zone, cloudflareoperatoriov1.CloudflareOperatorFinalizer) {`
	`100`	`+ controllerutil.AddFinalizer(zone, cloudflareoperatoriov1.CloudflareOperatorFinalizer)`
`101`	`101`	`return ctrl.Result{Requeue: true}, nil`
`102`	`102`	`}`
`103`	`103`
`@@ -170,5 +170,5 @@ func (r ZoneReconciler) handlePrune(ctx context.Context, zone cloudflareoperat`
`170`	`170`	`// reconcileDelete reconciles the deletion of the zone`
`171`	`171`	`func (r ZoneReconciler) reconcileDelete(zone cloudflareoperatoriov1.Zone) {`
`172`	`172`	`metrics.ZoneFailureCounter.DeleteLabelValues(zone.Name, zone.Spec.Name)`
`173`		`- controllerutil.RemoveFinalizer(zone, common.CloudflareOperatorFinalizer)`
	`173`	`+ controllerutil.RemoveFinalizer(zone, cloudflareoperatoriov1.CloudflareOperatorFinalizer)`
`174`	`174`	`}`