Remove unnecessary controller constants

Removing ID transaction also highlights controllers which still needed
to be updated to use merge for status ID.

internal/controllers/flavor/controller.go

@@ -31,15 +31,9 @@ import (
 )
 
 const (
-	Finalizer = "openstack.k-orc.cloud/flavor"
-
 	FieldOwner = "openstack.k-orc.cloud/flavorcontroller"
-	// Field owner of the object finalizer.
-	SSAFinalizerTxn = "finalizer"
 	// Field owner of transient status.
 	SSAStatusTxn = "status"
-	// Field owner of persistent id field.
-	SSAIDTxn = "id"
 )
 
 // ssaFieldOwner returns the field owner for a specific named SSA transaction.

internal/controllers/flavor/status.go

@@ -40,7 +40,7 @@ func (r *orcFlavorReconciler) setStatusID(ctx context.Context, obj client.Object
 		WithStatus(orcapplyconfigv1alpha1.FlavorStatus().
 			WithID(id))
 
-	return r.client.Status().Patch(ctx, obj, applyconfigs.Patch(types.ApplyPatchType, applyConfig), client.ForceOwnership, ssaFieldOwner(SSAIDTxn))
+	return r.client.Status().Patch(ctx, obj, applyconfigs.Patch(types.MergePatchType, applyConfig))
 }
 
 type updateStatusOpts struct {

internal/controllers/image/controller.go

@@ -32,11 +32,7 @@ import (
 )
 
 const (
-	Finalizer = "openstack.k-orc.cloud/image"
-
 	FieldOwner = "openstack.k-orc.cloud/imagecontroller"
-	// Field owner of the object finalizer.
-	SSAFinalizerTxn = "finalizer"
 	// Field owner of transient status.
 	SSAStatusTxn = "status"
 )

internal/controllers/network/controller.go

@@ -31,15 +31,9 @@ import (
 )
 
 const (
-	Finalizer = "openstack.k-orc.cloud/network"
-
 	FieldOwner = "openstack.k-orc.cloud/networkcontroller"
-	// Field owner of the object finalizer.
-	SSAFinalizerTxn = "finalizer"
 	// Field owner of transient status.
 	SSAStatusTxn = "status"
-	// Field owner of persistent id field.
-	SSAIDTxn = "id"
 )
 
 // ssaFieldOwner returns the field owner for a specific named SSA transaction.

internal/controllers/network/status.go

@@ -40,7 +40,7 @@ func (r *orcNetworkReconciler) setStatusID(ctx context.Context, obj client.Objec
 		WithStatus(orcapplyconfigv1alpha1.NetworkStatus().
 			WithID(id))
 
-	return r.client.Status().Patch(ctx, obj, applyconfigs.Patch(types.ApplyPatchType, applyConfig), client.ForceOwnership, ssaFieldOwner(SSAIDTxn))
+	return r.client.Status().Patch(ctx, obj, applyconfigs.Patch(types.MergePatchType, applyConfig))
 }
 
 type updateStatusOpts struct {

internal/controllers/port/controller.go

@@ -38,12 +38,8 @@ const (
 	Finalizer = "openstack.k-orc.cloud/port"
 
 	FieldOwner = "openstack.k-orc.cloud/portcontroller"
-	// Field owner of the object finalizer.
-	SSAFinalizerTxn = "finalizer"
 	// Field owner of transient status.
 	SSAStatusTxn = "status"
-	// Field owner of persistent id field.
-	SSAIDTxn = "id"
 )
 
 // ssaFieldOwner returns the field owner for a specific named SSA transaction.

internal/controllers/router/controller.go

@@ -38,8 +38,6 @@ const (
 	Finalizer = "openstack.k-orc.cloud/router"
 
 	FieldOwner = "openstack.k-orc.cloud/routercontroller"
-	// Field owner of the object finalizer.
-	SSAFinalizerTxn = "finalizer"
 	// Field owner of transient status.
 	SSAStatusTxn = "status"
 )

internal/controllers/securitygroup/controller.go

@@ -31,11 +31,7 @@ import (
 )
 
 const (
-	Finalizer = "openstack.k-orc.cloud/securitygroup"
-
 	FieldOwner = "openstack.k-orc.cloud/securitygroupcontroller"
-	// Field owner of the object finalizer.
-	SSAFinalizerTxn = "finalizer"
 	// Field owner of transient status.
 	SSAStatusTxn = "status"
 )

internal/controllers/server/controller.go

@@ -39,12 +39,8 @@ const (
 	Finalizer = "openstack.k-orc.cloud/server"
 
 	FieldOwner = "openstack.k-orc.cloud/servercontroller"
-	// Field owner of the object finalizer.
-	SSAFinalizerTxn = "finalizer"
 	// Field owner of transient status.
 	SSAStatusTxn = "status"
-	// Field owner of persistent id field.
-	SSAIDTxn = "id"
 )
 
 // ssaFieldOwner returns the field owner for a specific named SSA transaction.

internal/controllers/server/status.go

@@ -43,7 +43,7 @@ func (r *orcServerReconciler) setStatusID(ctx context.Context, obj client.Object
 		WithStatus(applyconfigv1alpha1.ServerStatus().
 			WithID(id))
 
-	return r.client.Status().Patch(ctx, obj, applyconfigs.Patch(types.ApplyPatchType, applyConfig), client.ForceOwnership, ssaFieldOwner(SSAIDTxn))
+	return r.client.Status().Patch(ctx, obj, applyconfigs.Patch(types.MergePatchType, applyConfig))
 }
 
 type updateStatusOpts struct {

internal/controllers/subnet/controller.go

@@ -41,12 +41,8 @@ const (
 	Finalizer = "openstack.k-orc.cloud/subnet"
 
 	FieldOwner = "openstack.k-orc.cloud/subnetcontroller"
-	// Field owner of the object finalizer.
-	SSAFinalizerTxn = "finalizer"
 	// Field owner of transient status.
 	SSAStatusTxn = "status"
-	// Field owner of persistent id field.
-	SSAIDTxn = "id"
 )
 
 // ssaFieldOwner returns the field owner for a specific named SSA transaction.

internal/controllers/subnet/status.go

@@ -38,7 +38,7 @@ func (r *orcSubnetReconciler) setStatusID(ctx context.Context, obj client.Object
 		WithStatus(orcapplyconfigv1alpha1.SubnetStatus().
 			WithID(id))
 
-	return r.client.Status().Patch(ctx, obj, applyconfigs.Patch(types.ApplyPatchType, applyConfig), client.ForceOwnership, ssaFieldOwner(SSAIDTxn))
+	return r.client.Status().Patch(ctx, obj, applyconfigs.Patch(types.MergePatchType, applyConfig))
 }
 
 type updateStatusOpts struct {