Skip to content

Commit 7a80174

Browse files
Karthik-K-NKarthik-K-N
committed
Adjust import alias to align with CAPI migration recommendation
1 parent 0301e92 commit 7a80174

9 files changed

+23
-22
lines changed

‎cloud/scope/cluster.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"sigs.k8s.io/controller-runtime/pkg/client"
3232

3333
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
34-
"sigs.k8s.io/cluster-api/util/patch"
34+
v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch" //nolint:staticcheck
3535

3636
infrav1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
3737
"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/utils"
@@ -56,7 +56,7 @@ type ClusterScopeParams struct {
5656
type ClusterScope struct {
5757
logr.Logger
5858
Client client.Client
59-
patchHelper *patch.Helper
59+
patchHelper *v1beta1patch.Helper
6060

6161
IBMVPCClient vpc.Vpc
6262
Cluster *clusterv1.Cluster
@@ -77,7 +77,7 @@ func NewClusterScope(params ClusterScopeParams) (*ClusterScope, error) {
7777
params.Logger = klog.Background()
7878
}
7979

80-
helper, err := patch.NewHelper(params.IBMVPCCluster, params.Client)
80+
helper, err := v1beta1patch.NewHelper(params.IBMVPCCluster, params.Client)
8181
if err != nil {
8282
return nil, fmt.Errorf("failed to init patch helper: %w", err)
8383
}

‎cloud/scope/machine.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
"sigs.k8s.io/controller-runtime/pkg/client"
3737

3838
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
39-
"sigs.k8s.io/cluster-api/util/patch"
39+
v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch" //nolint:staticcheck
4040

4141
infrav1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
4242
"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/authenticator"
@@ -64,7 +64,7 @@ type MachineScopeParams struct {
6464
type MachineScope struct {
6565
logr.Logger
6666
Client client.Client
67-
patchHelper *patch.Helper
67+
patchHelper *v1beta1patch.Helper
6868

6969
IBMVPCClient vpc.Vpc
7070
GlobalTaggingClient globaltagging.GlobalTagging
@@ -88,7 +88,7 @@ func NewMachineScope(params MachineScopeParams) (*MachineScope, error) {
8888
params.Logger = klog.Background()
8989
}
9090

91-
helper, err := patch.NewHelper(params.IBMVPCMachine, params.Client)
91+
helper, err := v1beta1patch.NewHelper(params.IBMVPCMachine, params.Client)
9292
if err != nil {
9393
return nil, fmt.Errorf("failed to init patch helper: %w", err)
9494
}

‎cloud/scope/powervs_cluster.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import (
4646
"sigs.k8s.io/controller-runtime/pkg/client"
4747

4848
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
49-
"sigs.k8s.io/cluster-api/util/patch"
49+
v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch" //nolint:staticcheck
5050

5151
infrav1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
5252
"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/authenticator"
@@ -107,7 +107,7 @@ type ClientFactory struct {
107107
// PowerVSClusterScope defines a scope defined around a Power VS Cluster.
108108
type PowerVSClusterScope struct {
109109
Client client.Client
110-
patchHelper *patch.Helper
110+
patchHelper *v1beta1patch.Helper
111111

112112
IBMPowerVSClient powervs.PowerVS
113113
IBMVPCClient vpc.Vpc
@@ -147,7 +147,7 @@ func NewPowerVSClusterScope(params PowerVSClusterScopeParams) (*PowerVSClusterSc
147147
params.Logger = klog.Background()
148148
}
149149

150-
helper, err := patch.NewHelper(params.IBMPowerVSCluster, params.Client)
150+
helper, err := v1beta1patch.NewHelper(params.IBMPowerVSCluster, params.Client)
151151
if err != nil {
152152
err = fmt.Errorf("failed to init patch helper: %w", err)
153153
return nil, err

‎cloud/scope/powervs_image.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232

3333
"sigs.k8s.io/controller-runtime/pkg/client"
3434

35-
"sigs.k8s.io/cluster-api/util/patch"
35+
v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch" //nolint:staticcheck
3636

3737
infrav1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
3838
"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/powervs"
@@ -57,7 +57,7 @@ type PowerVSImageScopeParams struct {
5757
type PowerVSImageScope struct {
5858
logr.Logger
5959
Client client.Client
60-
patchHelper *patch.Helper
60+
patchHelper *v1beta1patch.Helper
6161

6262
IBMPowerVSClient powervs.PowerVS
6363
IBMPowerVSImage *infrav1.IBMPowerVSImage
@@ -85,7 +85,7 @@ func NewPowerVSImageScope(params PowerVSImageScopeParams) (scope *PowerVSImageSc
8585
}
8686
scope.Logger = params.Logger
8787

88-
helper, err := patch.NewHelper(params.IBMPowerVSImage, params.Client)
88+
helper, err := v1beta1patch.NewHelper(params.IBMPowerVSImage, params.Client)
8989
if err != nil {
9090
err = fmt.Errorf("failed to init patch helper: %w", err)
9191
return nil, err

‎cloud/scope/vpc_cluster.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"sigs.k8s.io/controller-runtime/pkg/client"
3838

3939
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
40-
"sigs.k8s.io/cluster-api/util/patch"
40+
v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch" //nolint:staticcheck
4141

4242
infrav1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
4343
"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/authenticator"
@@ -77,7 +77,7 @@ type VPCClusterScopeParams struct {
7777
type VPCClusterScope struct {
7878
logr.Logger
7979
Client client.Client
80-
patchHelper *patch.Helper
80+
patchHelper *v1beta1patch.Helper
8181

8282
COSClient cos.Cos
8383
GlobalTaggingClient globaltagging.GlobalTagging
@@ -108,7 +108,7 @@ func NewVPCClusterScope(params VPCClusterScopeParams) (*VPCClusterScope, error)
108108
params.Logger = textlogger.NewLogger(textlogger.NewConfig())
109109
}
110110

111-
helper, err := patch.NewHelper(params.IBMVPCCluster, params.Client)
111+
helper, err := v1beta1patch.NewHelper(params.IBMVPCCluster, params.Client)
112112
if err != nil {
113113
return nil, fmt.Errorf("error failed to init patch helper: %w", err)
114114
}

‎controllers/ibmpowervscluster_controller.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ import (
3939
"sigs.k8s.io/controller-runtime/pkg/handler"
4040
"sigs.k8s.io/controller-runtime/pkg/reconcile"
4141

42-
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck //nolint:staticcheck
42+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
43+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
4344
"sigs.k8s.io/cluster-api/util"
4445
v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions" //nolint:staticcheck
4546
v1beta2conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions/v1beta2" //nolint:staticcheck
@@ -828,7 +829,7 @@ func (r *IBMPowerVSClusterReconciler) SetupWithManager(ctx context.Context, mgr
828829
WithEventFilter(predicates.ResourceHasFilterLabel(r.Scheme, predicateLog, r.WatchFilterValue)).
829830
WithEventFilter(predicates.ResourceIsNotExternallyManaged(r.Scheme, predicateLog)).
830831
Watches(
831-
&clusterv1beta1.Cluster{},
832+
&clusterv1.Cluster{},
832833
handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(ctx, infrav1.GroupVersion.WithKind("IBMPowerVSCluster"), mgr.GetClient(), &infrav1.IBMPowerVSCluster{})),
833834
builder.WithPredicates(predicates.All(r.Scheme, predicateLog,
834835
predicates.ResourceIsChanged(r.Scheme, predicateLog),

‎controllers/ibmpowervsmachine_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import (
4242
"sigs.k8s.io/cluster-api/util/conditions"
4343
v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions" //nolint:staticcheck
4444
v1beta2conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions/v1beta2" //nolint:staticcheck
45-
v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch" //nolint:staticcheck
45+
v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch" //nolint:staticcheck //nolint:staticcheck
4646
"sigs.k8s.io/cluster-api/util/deprecated/v1beta1/paused"
4747
"sigs.k8s.io/cluster-api/util/finalizers"
4848
clog "sigs.k8s.io/cluster-api/util/log"

‎controllers/ibmpowervsmachinetemplate_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
ctrl "sigs.k8s.io/controller-runtime"
3333
"sigs.k8s.io/controller-runtime/pkg/client"
3434

35-
"sigs.k8s.io/cluster-api/util/patch"
35+
v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch" //nolint:staticcheck
3636

3737
infrav1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
3838
)
@@ -65,7 +65,7 @@ func (r *IBMPowerVSMachineTemplateReconciler) Reconcile(ctx context.Context, req
6565
return ctrl.Result{}, client.IgnoreNotFound(err)
6666
}
6767

68-
helper, err := patch.NewHelper(&machineTemplate, r.Client)
68+
helper, err := v1beta1patch.NewHelper(&machineTemplate, r.Client)
6969
if err != nil {
7070
return ctrl.Result{}, fmt.Errorf("failed to init patch helper: %w", err)
7171
}

‎controllers/ibmvpcmachinetemplate_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
ctrl "sigs.k8s.io/controller-runtime"
3232
"sigs.k8s.io/controller-runtime/pkg/client"
3333

34-
"sigs.k8s.io/cluster-api/util/patch"
34+
v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch" //nolint:staticcheck
3535

3636
infrav1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
3737
"sigs.k8s.io/cluster-api-provider-ibmcloud/pkg/cloud/services/vpc"
@@ -79,7 +79,7 @@ func (r *IBMVPCMachineTemplateReconciler) Reconcile(ctx context.Context, req ctr
7979

8080
func (r *IBMVPCMachineTemplateReconciler) reconcileNormal(ctx context.Context, vpcClient vpc.Vpc, machineTemplate infrav1.IBMVPCMachineTemplate) (ctrl.Result, error) {
8181
log := ctrl.LoggerFrom(ctx)
82-
helper, err := patch.NewHelper(&machineTemplate, r.Client)
82+
helper, err := v1beta1patch.NewHelper(&machineTemplate, r.Client)
8383
if err != nil {
8484
return ctrl.Result{}, fmt.Errorf("failed to init patch helper: %w", err)
8585
}

0 commit comments

Comments
 (0)