Revert: moving patch to v1beta1 patch

Signed-off-by: Suhas Agasthya <suhasagasthya@gmail.com>

Author: suhasagasthya

.golangci.yml

@@ -191,9 +191,6 @@ issues:
     - text: "SA1019: scope.Cluster.Status.Deprecated.V1Beta1.Conditions is deprecated"
       linters:
         - staticcheck
-    - text: "SA1019: \"sigs\\.k8s\\.io\\/cluster-api\\/util\\/deprecated\\/v1beta1\\/patch\" is deprecated"
-      linters:
-        - staticcheck
     - path: api/v1beta3/webhook_suite_test.go
       linters:
         - goimports

internal/controllers/cloudstackisolatednetwork_controller.go

@@ -32,7 +32,7 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/annotations"
-	v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
+	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/cluster-api/util/predicates"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
@@ -171,7 +171,7 @@ func (r *CloudStackIsolatedNetworkReconciler) reconcileNormal(ctx context.Contex
 
 	// Setup isolated network, endpoint, egress, and load balancing.
 	// Set endpoint of CloudStackCluster if it is not currently set. (uses patcher to do so)
-	csClusterPatcher, err := v1beta1patch.NewHelper(scope.CloudStackCluster, r.Client)
+	csClusterPatcher, err := patch.NewHelper(scope.CloudStackCluster, r.Client)
 	if err != nil {
 		return ctrl.Result{}, errors.Wrap(err, "setting up CloudStackCluster patcher")
 	}

internal/controllers/cloudstackmachine_controller_test.go

@@ -35,7 +35,7 @@ import (
 	"k8s.io/client-go/tools/record"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	"sigs.k8s.io/cluster-api/util"
-	v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
+	"sigs.k8s.io/cluster-api/util/patch"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -158,7 +158,7 @@ func TestCloudStackMachineReconcilerIntegrationTests(t *testing.T) {
 
 		// Set owner ref from CAPI machine to CS machine and patch back the CS machine.
 		g.Eventually(func() error {
-			ph, err := v1beta1patch.NewHelper(dummies.CSMachine1, testEnv.Client)
+			ph, err := patch.NewHelper(dummies.CSMachine1, testEnv.Client)
 			g.Expect(err).ToNot(HaveOccurred())
 			dummies.CSMachine1.OwnerReferences = append(dummies.CSMachine1.OwnerReferences, metav1.OwnerReference{
 				Kind:       "Machine",
@@ -172,7 +172,7 @@ func TestCloudStackMachineReconcilerIntegrationTests(t *testing.T) {
 			dummies.CSMachine1.Labels[infrav1.FailureDomainLabelName] =
 				infrav1.FailureDomainHashedMetaName(dummies.CSMachine1.Spec.FailureDomainName, dummies.CAPICluster.Name)
 
-			return ph.Patch(ctx, dummies.CSMachine1, v1beta1patch.WithStatusObservedGeneration{})
+			return ph.Patch(ctx, dummies.CSMachine1, patch.WithStatusObservedGeneration{})
 		}, timeout).Should(Succeed())
 		// Mark both Cluster and CloudStackCluster ready (v1beta2 readiness semantics).
 		markClustersReady(ctx, g, testEnv.Client, dummies.CAPICluster, dummies.CSCluster)
@@ -215,13 +215,13 @@ func TestCloudStackMachineReconcilerIntegrationTests(t *testing.T) {
 
 		// Set node ref on CAPI machine to simulate that the machine is operational.
 		g.Eventually(func() error {
-			ph, err := v1beta1patch.NewHelper(dummies.CAPIMachine, testEnv.Client)
+			ph, err := patch.NewHelper(dummies.CAPIMachine, testEnv.Client)
 			g.Expect(err).ToNot(HaveOccurred())
 			dummies.CAPIMachine.Status.NodeRef = clusterv1.MachineNodeReference{
 				Name: "test-node",
 			}
 
-			return ph.Patch(ctx, dummies.CAPIMachine, v1beta1patch.WithStatusObservedGeneration{})
+			return ph.Patch(ctx, dummies.CAPIMachine, patch.WithStatusObservedGeneration{})
 		}, timeout).Should(Succeed())
 
 		// Reconcile again (it is running).
@@ -317,13 +317,13 @@ func TestCloudStackMachineReconcilerIntegrationTests(t *testing.T) {
 		g.Expect(testEnv.Create(ctx, dummies.CAPIMachine)).To(Succeed())
 		// Set the NodeRef on the CAPI machine to simulate that the machine is operational.
 		g.Eventually(func() error {
-			ph, err := v1beta1patch.NewHelper(dummies.CAPIMachine, testEnv.Client)
+			ph, err := patch.NewHelper(dummies.CAPIMachine, testEnv.Client)
 			g.Expect(err).ToNot(HaveOccurred())
 			dummies.CAPIMachine.Status.NodeRef = clusterv1.MachineNodeReference{
 				Name: "test-node",
 			}
 
-			return ph.Patch(ctx, dummies.CAPIMachine, v1beta1patch.WithStatusObservedGeneration{})
+			return ph.Patch(ctx, dummies.CAPIMachine, patch.WithStatusObservedGeneration{})
 		}, timeout).Should(Succeed())
 		g.Expect(testEnv.Create(ctx, dummies.CSMachine1)).To(Succeed())
 
@@ -335,7 +335,7 @@ func TestCloudStackMachineReconcilerIntegrationTests(t *testing.T) {
 
 		// Set owner ref from CAPI machine to CS machine and patch back the CS machine.
 		g.Eventually(func() error {
-			ph, err := v1beta1patch.NewHelper(dummies.CSMachine1, testEnv.Client)
+			ph, err := patch.NewHelper(dummies.CSMachine1, testEnv.Client)
 			g.Expect(err).ToNot(HaveOccurred())
 			dummies.CSMachine1.OwnerReferences = append(dummies.CSMachine1.OwnerReferences, metav1.OwnerReference{
 				Kind:       "Machine",
@@ -352,7 +352,7 @@ func TestCloudStackMachineReconcilerIntegrationTests(t *testing.T) {
 			dummies.CSMachine1.Labels[infrav1.FailureDomainLabelName] =
 				infrav1.FailureDomainHashedMetaName(dummies.CSMachine1.Spec.FailureDomainName, dummies.CAPICluster.Name)
 
-			return ph.Patch(ctx, dummies.CSMachine1, v1beta1patch.WithStatusObservedGeneration{})
+			return ph.Patch(ctx, dummies.CSMachine1, patch.WithStatusObservedGeneration{})
 		}, timeout).Should(Succeed())
 
 		// Mark clusters ready (replaces setClusterReady & checkClusterReady).

internal/controllers/helpers_test.go

@@ -22,7 +22,7 @@ import (
 	. "github.com/onsi/gomega"
 	"k8s.io/utils/ptr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
-	v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
+	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
@@ -31,24 +31,24 @@ import (
 // markClustersReady patches Cluster & CloudStackCluster status to satisfy controller readiness checks (v1beta2 semantics).
 func markClustersReady(ctx context.Context, g *WithT, c client.Client, cluster *clusterv1.Cluster, csCluster *infrav1.CloudStackCluster) {
 	g.Eventually(func() error {
-		ph, err := v1beta1patch.NewHelper(cluster, c)
+		ph, err := patch.NewHelper(cluster, c)
 		if err != nil {
 			return err
 		}
 		if cluster.Status.Initialization.InfrastructureProvisioned == nil || !*cluster.Status.Initialization.InfrastructureProvisioned {
 			cluster.Status.Initialization.InfrastructureProvisioned = ptr.To(true)
 		}
-		return ph.Patch(ctx, cluster, v1beta1patch.WithStatusObservedGeneration{})
+		return ph.Patch(ctx, cluster, patch.WithStatusObservedGeneration{})
 	}, timeout).Should(Succeed())
 
 	g.Eventually(func() error {
-		ph, err := v1beta1patch.NewHelper(csCluster, c)
+		ph, err := patch.NewHelper(csCluster, c)
 		if err != nil {
 			return err
 		}
 		if !csCluster.Status.Ready {
 			csCluster.Status.Ready = true
 		}
-		return ph.Patch(ctx, csCluster, v1beta1patch.WithStatusObservedGeneration{})
+		return ph.Patch(ctx, csCluster, patch.WithStatusObservedGeneration{})
 	}, timeout).Should(Succeed())
 }

pkg/scope/affinitygroup.go

@@ -22,7 +22,7 @@ import (
 	"github.com/pkg/errors"
 	"k8s.io/klog/v2"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
-	v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
+	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
@@ -63,7 +63,7 @@ func NewAffinityGroupScope(params AffinityGroupScopeParams) (*AffinityGroupScope
 		CSClientsProvider:       params.CSClients,
 	}
 
-	helper, err := v1beta1patch.NewHelper(params.CloudStackAffinityGroup, params.Client)
+	helper, err := patch.NewHelper(params.CloudStackAffinityGroup, params.Client)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to init patch helper")
 	}
@@ -77,7 +77,7 @@ func NewAffinityGroupScope(params AffinityGroupScopeParams) (*AffinityGroupScope
 type AffinityGroupScope struct {
 	logger.Logger
 	client      client.Client
-	patchHelper *v1beta1patch.Helper
+	patchHelper *patch.Helper
 
 	Cluster                 *clusterv1.Cluster
 	CloudStackFailureDomain *infrav1.CloudStackFailureDomain

pkg/scope/cluster.go

@@ -26,7 +26,7 @@ import (
 	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
-	v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
+	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
@@ -65,7 +65,7 @@ func NewClusterScope(params ClusterScopeParams) (*ClusterScope, error) {
 		controllerName:    params.ControllerName,
 	}
 
-	helper, err := v1beta1patch.NewHelper(params.CloudStackCluster, params.Client)
+	helper, err := patch.NewHelper(params.CloudStackCluster, params.Client)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to init patch helper")
 	}
@@ -79,7 +79,7 @@ func NewClusterScope(params ClusterScopeParams) (*ClusterScope, error) {
 type ClusterScope struct {
 	logger.Logger
 	client      client.Client
-	patchHelper *v1beta1patch.Helper
+	patchHelper *patch.Helper
 
 	Cluster           *clusterv1.Cluster
 	CloudStackCluster *infrav1.CloudStackCluster
@@ -129,9 +129,9 @@ func (s *ClusterScope) PatchObject() error {
 	return s.patchHelper.Patch(
 		context.TODO(),
 		s.CloudStackCluster,
-		v1beta1patch.WithOwnedConditions{Conditions: []clusterv1beta1.ConditionType{
-			clusterv1beta1.ReadyCondition,
-			infrav1.FailureDomainsReadyCondition,
+		patch.WithOwnedConditions{Conditions: []string{
+			clusterv1.ReadyCondition,
+			string(infrav1.FailureDomainsReadyCondition),
 		}},
 	)
 }

pkg/scope/failuredomain.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/klog/v2"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
-	v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
+	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
@@ -70,7 +70,7 @@ func NewFailureDomainScope(params FailureDomainScopeParams) (*FailureDomainScope
 		CSClientsProvider:       params.CSClients,
 	}
 
-	helper, err := v1beta1patch.NewHelper(params.CloudStackFailureDomain, params.Client)
+	helper, err := patch.NewHelper(params.CloudStackFailureDomain, params.Client)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to init patch helper")
 	}
@@ -84,7 +84,7 @@ func NewFailureDomainScope(params FailureDomainScopeParams) (*FailureDomainScope
 type FailureDomainScope struct {
 	logger.Logger
 	client      client.Client
-	patchHelper *v1beta1patch.Helper
+	patchHelper *patch.Helper
 
 	Cluster                 *clusterv1.Cluster
 	CloudStackFailureDomain *infrav1.CloudStackFailureDomain

pkg/scope/isolatednetwork.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/klog/v2"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
-	v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
+	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
@@ -69,7 +69,7 @@ func NewIsolatedNetworkScope(params IsolatedNetworkScopeParams) (*IsolatedNetwor
 		CSClientsProvider:         params.CSClients,
 	}
 
-	helper, err := v1beta1patch.NewHelper(params.CloudStackIsolatedNetwork, params.Client)
+	helper, err := patch.NewHelper(params.CloudStackIsolatedNetwork, params.Client)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to init patch helper")
 	}
@@ -83,7 +83,7 @@ func NewIsolatedNetworkScope(params IsolatedNetworkScopeParams) (*IsolatedNetwor
 type IsolatedNetworkScope struct {
 	logger.Logger
 	client      client.Client
-	patchHelper *v1beta1patch.Helper
+	patchHelper *patch.Helper
 
 	Cluster                   *clusterv1.Cluster
 	CloudStackCluster         *infrav1.CloudStackCluster

pkg/scope/machinescope.go

@@ -33,7 +33,7 @@ import (
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/annotations"
 	v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
-	v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
+	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
@@ -85,7 +85,7 @@ func NewMachineScope(params MachineScopeParams) (*MachineScope, error) {
 		CSClientsProvider:       params.CSClients,
 	}
 
-	helper, err := v1beta1patch.NewHelper(params.CloudStackMachine, params.Client)
+	helper, err := patch.NewHelper(params.CloudStackMachine, params.Client)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to init patch helper")
 	}
@@ -99,7 +99,7 @@ func NewMachineScope(params MachineScopeParams) (*MachineScope, error) {
 type MachineScope struct {
 	logger.Logger
 	client      client.Client
-	patchHelper *v1beta1patch.Helper
+	patchHelper *patch.Helper
 
 	Cluster                   *clusterv1.Cluster
 	CloudStackCluster         *infrav1.CloudStackCluster
@@ -174,10 +174,10 @@ func (s *MachineScope) PatchObject() error {
 	return s.patchHelper.Patch(
 		context.TODO(),
 		s.CloudStackMachine,
-		v1beta1patch.WithOwnedConditions{Conditions: []clusterv1beta1.ConditionType{
-			clusterv1beta1.ReadyCondition,
-			infrav1.InstanceReadyCondition,
-			infrav1.LoadBalancerAttachedCondition,
+		patch.WithOwnedConditions{Conditions: []string{
+			clusterv1.ReadyCondition,
+			string(infrav1.InstanceReadyCondition),
+			string(infrav1.LoadBalancerAttachedCondition),
 		}},
 	)
 }

pkg/scope/machinetemplate.go

@@ -6,7 +6,7 @@ import (
 	"github.com/pkg/errors"
 	"k8s.io/klog/v2"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
-	v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
+	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
@@ -47,7 +47,7 @@ func NewMachineTemplateScope(params MachineTemplateScopeParams) (*MachineTemplat
 		CSClientsProvider:         params.CSClients,
 	}
 
-	helper, err := v1beta1patch.NewHelper(params.CloudStackMachineTemplate, params.Client)
+	helper, err := patch.NewHelper(params.CloudStackMachineTemplate, params.Client)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to init patch helper")
 	}
@@ -61,7 +61,7 @@ func NewMachineTemplateScope(params MachineTemplateScopeParams) (*MachineTemplat
 type MachineTemplateScope struct {
 	logger.Logger
 	client      client.Client
-	patchHelper *v1beta1patch.Helper
+	patchHelper *patch.Helper
 
 	Cluster                   *clusterv1.Cluster
 	CloudStackMachineTemplate *infrav1.CloudStackMachineTemplate