Skip to content

Commit 48aebb9

Browse files
Karthik-K-NKarthik-K-N
authored
⚠️ Adjust import alias to align with CAPI migration recommendation (#2393)
* Adjust import alias to align with CAPI migration recommendation * Adjust import alias to align with CAPI migration recommendation
1 parent 4af31ed commit 48aebb9

File tree

68 files changed

+3726
-3714
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+3726
-3714
lines changed

‎.golangci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ linters-settings:
8989
- pkg: sigs.k8s.io/cluster-api/api/v1alpha4
9090
alias: capiv1alpha4
9191
- pkg: sigs.k8s.io/cluster-api/api/core/v1beta1
92-
alias: capiv1beta1
92+
alias: clusterv1beta1
9393
- pkg: sigs.k8s.io/cluster-api/api/core/v1beta2
9494
alias: clusterv1
9595
# CAPI-IBMCLOUD
9696
- pkg: sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1
9797
alias: infrav1beta1
9898
- pkg: sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2
99-
alias: infrav1beta2
99+
alias: infrav1
100100
nolintlint:
101101
allow-unused: false
102102
allow-leading-space: false

‎api/v1beta1/conditions_consts.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1beta1
1818

1919
import (
20-
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
20+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
2121
)
2222

2323
const (
@@ -42,7 +42,7 @@ const (
4242

4343
const (
4444
// InstanceReadyCondition reports on current status of the instance. Ready indicates the instance is in a Running state.
45-
InstanceReadyCondition clusterv1.ConditionType = "InstanceReady"
45+
InstanceReadyCondition clusterv1beta1.ConditionType = "InstanceReady"
4646
)
4747

4848
const (
@@ -60,10 +60,10 @@ const (
6060

6161
const (
6262
// ImageReadyCondition reports on current status of the image. Ready indicates the image is in a active state.
63-
ImageReadyCondition clusterv1.ConditionType = "ImageReady"
63+
ImageReadyCondition clusterv1beta1.ConditionType = "ImageReady"
6464

6565
// ImageImportedCondition reports on current status of the image import job. Ready indicates the import job is finished.
66-
ImageImportedCondition clusterv1.ConditionType = "ImageImported"
66+
ImageImportedCondition clusterv1beta1.ConditionType = "ImageImported"
6767
)
6868

6969
const (
@@ -73,5 +73,5 @@ const (
7373

7474
const (
7575
// LoadBalancerReadyCondition reports on current status of the load balancer. Ready indicates the load balancer is in a active state.
76-
LoadBalancerReadyCondition clusterv1.ConditionType = "LoadBalancerReady"
76+
LoadBalancerReadyCondition clusterv1beta1.ConditionType = "LoadBalancerReady"
7777
)

‎api/v1beta1/ibmpowervs_conversion.go‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -26,130 +26,130 @@ import (
2626

2727
"sigs.k8s.io/controller-runtime/pkg/conversion"
2828

29-
infrav1beta2 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
29+
infrav1 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
3030
)
3131

3232
func (src *IBMPowerVSCluster) ConvertTo(dstRaw conversion.Hub) error {
33-
dst := dstRaw.(*infrav1beta2.IBMPowerVSCluster)
33+
dst := dstRaw.(*infrav1.IBMPowerVSCluster)
3434

3535
return Convert_v1beta1_IBMPowerVSCluster_To_v1beta2_IBMPowerVSCluster(src, dst, nil)
3636
}
3737

3838
func (dst *IBMPowerVSCluster) ConvertFrom(srcRaw conversion.Hub) error {
39-
src := srcRaw.(*infrav1beta2.IBMPowerVSCluster)
39+
src := srcRaw.(*infrav1.IBMPowerVSCluster)
4040

4141
return Convert_v1beta2_IBMPowerVSCluster_To_v1beta1_IBMPowerVSCluster(src, dst, nil)
4242
}
4343

4444
func (src *IBMPowerVSClusterList) ConvertTo(dstRaw conversion.Hub) error {
45-
dst := dstRaw.(*infrav1beta2.IBMPowerVSClusterList)
45+
dst := dstRaw.(*infrav1.IBMPowerVSClusterList)
4646

4747
return Convert_v1beta1_IBMPowerVSClusterList_To_v1beta2_IBMPowerVSClusterList(src, dst, nil)
4848
}
4949

5050
func (dst *IBMPowerVSClusterList) ConvertFrom(srcRaw conversion.Hub) error {
51-
src := srcRaw.(*infrav1beta2.IBMPowerVSClusterList)
51+
src := srcRaw.(*infrav1.IBMPowerVSClusterList)
5252

5353
return Convert_v1beta2_IBMPowerVSClusterList_To_v1beta1_IBMPowerVSClusterList(src, dst, nil)
5454
}
5555

5656
func (src *IBMPowerVSClusterTemplate) ConvertTo(dstRaw conversion.Hub) error {
57-
dst := dstRaw.(*infrav1beta2.IBMPowerVSClusterTemplate)
57+
dst := dstRaw.(*infrav1.IBMPowerVSClusterTemplate)
5858

5959
return Convert_v1beta1_IBMPowerVSClusterTemplate_To_v1beta2_IBMPowerVSClusterTemplate(src, dst, nil)
6060
}
6161

6262
func (dst *IBMPowerVSClusterTemplate) ConvertFrom(srcRaw conversion.Hub) error {
63-
src := srcRaw.(*infrav1beta2.IBMPowerVSClusterTemplate)
63+
src := srcRaw.(*infrav1.IBMPowerVSClusterTemplate)
6464

6565
return Convert_v1beta2_IBMPowerVSClusterTemplate_To_v1beta1_IBMPowerVSClusterTemplate(src, dst, nil)
6666
}
6767

6868
func (src *IBMPowerVSClusterTemplateList) ConvertTo(dstRaw conversion.Hub) error {
69-
dst := dstRaw.(*infrav1beta2.IBMPowerVSClusterTemplateList)
69+
dst := dstRaw.(*infrav1.IBMPowerVSClusterTemplateList)
7070

7171
return Convert_v1beta1_IBMPowerVSClusterTemplateList_To_v1beta2_IBMPowerVSClusterTemplateList(src, dst, nil)
7272
}
7373

7474
func (dst *IBMPowerVSClusterTemplateList) ConvertFrom(srcRaw conversion.Hub) error {
75-
src := srcRaw.(*infrav1beta2.IBMPowerVSClusterTemplateList)
75+
src := srcRaw.(*infrav1.IBMPowerVSClusterTemplateList)
7676

7777
return Convert_v1beta2_IBMPowerVSClusterTemplateList_To_v1beta1_IBMPowerVSClusterTemplateList(src, dst, nil)
7878
}
7979

8080
func (src *IBMPowerVSMachine) ConvertTo(dstRaw conversion.Hub) error {
81-
dst := dstRaw.(*infrav1beta2.IBMPowerVSMachine)
81+
dst := dstRaw.(*infrav1.IBMPowerVSMachine)
8282

8383
return Convert_v1beta1_IBMPowerVSMachine_To_v1beta2_IBMPowerVSMachine(src, dst, nil)
8484
}
8585

8686
func (dst *IBMPowerVSMachine) ConvertFrom(srcRaw conversion.Hub) error {
87-
src := srcRaw.(*infrav1beta2.IBMPowerVSMachine)
87+
src := srcRaw.(*infrav1.IBMPowerVSMachine)
8888

8989
return Convert_v1beta2_IBMPowerVSMachine_To_v1beta1_IBMPowerVSMachine(src, dst, nil)
9090
}
9191

9292
func (src *IBMPowerVSMachineList) ConvertTo(dstRaw conversion.Hub) error {
93-
dst := dstRaw.(*infrav1beta2.IBMPowerVSMachineList)
93+
dst := dstRaw.(*infrav1.IBMPowerVSMachineList)
9494

9595
return Convert_v1beta1_IBMPowerVSMachineList_To_v1beta2_IBMPowerVSMachineList(src, dst, nil)
9696
}
9797

9898
func (dst *IBMPowerVSMachineList) ConvertFrom(srcRaw conversion.Hub) error {
99-
src := srcRaw.(*infrav1beta2.IBMPowerVSMachineList)
99+
src := srcRaw.(*infrav1.IBMPowerVSMachineList)
100100

101101
return Convert_v1beta2_IBMPowerVSMachineList_To_v1beta1_IBMPowerVSMachineList(src, dst, nil)
102102
}
103103

104104
func (src *IBMPowerVSMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
105-
dst := dstRaw.(*infrav1beta2.IBMPowerVSMachineTemplate)
105+
dst := dstRaw.(*infrav1.IBMPowerVSMachineTemplate)
106106

107107
return Convert_v1beta1_IBMPowerVSMachineTemplate_To_v1beta2_IBMPowerVSMachineTemplate(src, dst, nil)
108108
}
109109

110110
func (dst *IBMPowerVSMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
111-
src := srcRaw.(*infrav1beta2.IBMPowerVSMachineTemplate)
111+
src := srcRaw.(*infrav1.IBMPowerVSMachineTemplate)
112112

113113
return Convert_v1beta2_IBMPowerVSMachineTemplate_To_v1beta1_IBMPowerVSMachineTemplate(src, dst, nil)
114114
}
115115

116116
func (src *IBMPowerVSMachineTemplateList) ConvertTo(dstRaw conversion.Hub) error {
117-
dst := dstRaw.(*infrav1beta2.IBMPowerVSMachineTemplateList)
117+
dst := dstRaw.(*infrav1.IBMPowerVSMachineTemplateList)
118118

119119
return Convert_v1beta1_IBMPowerVSMachineTemplateList_To_v1beta2_IBMPowerVSMachineTemplateList(src, dst, nil)
120120
}
121121

122122
func (dst *IBMPowerVSMachineTemplateList) ConvertFrom(srcRaw conversion.Hub) error {
123-
src := srcRaw.(*infrav1beta2.IBMPowerVSMachineTemplateList)
123+
src := srcRaw.(*infrav1.IBMPowerVSMachineTemplateList)
124124

125125
return Convert_v1beta2_IBMPowerVSMachineTemplateList_To_v1beta1_IBMPowerVSMachineTemplateList(src, dst, nil)
126126
}
127127

128128
func (src *IBMPowerVSImage) ConvertTo(dstRaw conversion.Hub) error {
129-
dst := dstRaw.(*infrav1beta2.IBMPowerVSImage)
129+
dst := dstRaw.(*infrav1.IBMPowerVSImage)
130130

131131
return Convert_v1beta1_IBMPowerVSImage_To_v1beta2_IBMPowerVSImage(src, dst, nil)
132132
}
133133

134134
func (dst *IBMPowerVSImage) ConvertFrom(srcRaw conversion.Hub) error {
135-
src := srcRaw.(*infrav1beta2.IBMPowerVSImage)
135+
src := srcRaw.(*infrav1.IBMPowerVSImage)
136136

137137
return Convert_v1beta2_IBMPowerVSImage_To_v1beta1_IBMPowerVSImage(src, dst, nil)
138138
}
139139

140140
func (src *IBMPowerVSImageList) ConvertTo(dstRaw conversion.Hub) error {
141-
dst := dstRaw.(*infrav1beta2.IBMPowerVSImageList)
141+
dst := dstRaw.(*infrav1.IBMPowerVSImageList)
142142

143143
return Convert_v1beta1_IBMPowerVSImageList_To_v1beta2_IBMPowerVSImageList(src, dst, nil)
144144
}
145145

146146
func (dst *IBMPowerVSImageList) ConvertFrom(srcRaw conversion.Hub) error {
147-
src := srcRaw.(*infrav1beta2.IBMPowerVSImageList)
147+
src := srcRaw.(*infrav1.IBMPowerVSImageList)
148148

149149
return Convert_v1beta2_IBMPowerVSImageList_To_v1beta1_IBMPowerVSImageList(src, dst, nil)
150150
}
151151

152-
func Convert_v1beta1_IBMPowerVSMachineSpec_To_v1beta2_IBMPowerVSMachineSpec(in *IBMPowerVSMachineSpec, out *infrav1beta2.IBMPowerVSMachineSpec, s apiconversion.Scope) error {
152+
func Convert_v1beta1_IBMPowerVSMachineSpec_To_v1beta2_IBMPowerVSMachineSpec(in *IBMPowerVSMachineSpec, out *infrav1.IBMPowerVSMachineSpec, s apiconversion.Scope) error {
153153
out.SystemType = in.SysType
154154
out.Processors = intstr.FromString(in.Processors)
155155

@@ -160,18 +160,18 @@ func Convert_v1beta1_IBMPowerVSMachineSpec_To_v1beta2_IBMPowerVSMachineSpec(in *
160160
out.MemoryGiB = int32(memory)
161161

162162
switch in.ProcType {
163-
case strings.ToLower(string(infrav1beta2.PowerVSProcessorTypeDedicated)):
164-
out.ProcessorType = infrav1beta2.PowerVSProcessorTypeDedicated
165-
case strings.ToLower(string(infrav1beta2.PowerVSProcessorTypeShared)):
166-
out.ProcessorType = infrav1beta2.PowerVSProcessorTypeShared
167-
case strings.ToLower(string(infrav1beta2.PowerVSProcessorTypeCapped)):
168-
out.ProcessorType = infrav1beta2.PowerVSProcessorTypeCapped
163+
case strings.ToLower(string(infrav1.PowerVSProcessorTypeDedicated)):
164+
out.ProcessorType = infrav1.PowerVSProcessorTypeDedicated
165+
case strings.ToLower(string(infrav1.PowerVSProcessorTypeShared)):
166+
out.ProcessorType = infrav1.PowerVSProcessorTypeShared
167+
case strings.ToLower(string(infrav1.PowerVSProcessorTypeCapped)):
168+
out.ProcessorType = infrav1.PowerVSProcessorTypeCapped
169169
}
170170

171171
return autoConvert_v1beta1_IBMPowerVSMachineSpec_To_v1beta2_IBMPowerVSMachineSpec(in, out, s)
172172
}
173173

174-
func Convert_v1beta2_IBMPowerVSMachineSpec_To_v1beta1_IBMPowerVSMachineSpec(in *infrav1beta2.IBMPowerVSMachineSpec, out *IBMPowerVSMachineSpec, s apiconversion.Scope) error {
174+
func Convert_v1beta2_IBMPowerVSMachineSpec_To_v1beta1_IBMPowerVSMachineSpec(in *infrav1.IBMPowerVSMachineSpec, out *IBMPowerVSMachineSpec, s apiconversion.Scope) error {
175175
out.SysType = in.SystemType
176176
out.Memory = strconv.FormatInt(int64(in.MemoryGiB), 10)
177177

@@ -183,33 +183,33 @@ func Convert_v1beta2_IBMPowerVSMachineSpec_To_v1beta1_IBMPowerVSMachineSpec(in *
183183
}
184184

185185
switch in.ProcessorType {
186-
case infrav1beta2.PowerVSProcessorTypeDedicated:
187-
out.ProcType = strings.ToLower(string(infrav1beta2.PowerVSProcessorTypeDedicated))
188-
case infrav1beta2.PowerVSProcessorTypeShared:
189-
out.ProcType = strings.ToLower(string(infrav1beta2.PowerVSProcessorTypeShared))
190-
case infrav1beta2.PowerVSProcessorTypeCapped:
191-
out.ProcType = strings.ToLower(string(infrav1beta2.PowerVSProcessorTypeCapped))
186+
case infrav1.PowerVSProcessorTypeDedicated:
187+
out.ProcType = strings.ToLower(string(infrav1.PowerVSProcessorTypeDedicated))
188+
case infrav1.PowerVSProcessorTypeShared:
189+
out.ProcType = strings.ToLower(string(infrav1.PowerVSProcessorTypeShared))
190+
case infrav1.PowerVSProcessorTypeCapped:
191+
out.ProcType = strings.ToLower(string(infrav1.PowerVSProcessorTypeCapped))
192192
}
193193

194194
return autoConvert_v1beta2_IBMPowerVSMachineSpec_To_v1beta1_IBMPowerVSMachineSpec(in, out, s)
195195
}
196196

197-
func Convert_v1beta2_IBMPowerVSClusterSpec_To_v1beta1_IBMPowerVSClusterSpec(in *infrav1beta2.IBMPowerVSClusterSpec, out *IBMPowerVSClusterSpec, s apiconversion.Scope) error {
197+
func Convert_v1beta2_IBMPowerVSClusterSpec_To_v1beta1_IBMPowerVSClusterSpec(in *infrav1.IBMPowerVSClusterSpec, out *IBMPowerVSClusterSpec, s apiconversion.Scope) error {
198198
if in.ServiceInstance != nil && in.ServiceInstance.ID != nil {
199199
out.ServiceInstanceID = *in.ServiceInstance.ID
200200
}
201201
return autoConvert_v1beta2_IBMPowerVSClusterSpec_To_v1beta1_IBMPowerVSClusterSpec(in, out, s)
202202
}
203203

204-
func Convert_v1beta2_IBMPowerVSClusterStatus_To_v1beta1_IBMPowerVSClusterStatus(in *infrav1beta2.IBMPowerVSClusterStatus, out *IBMPowerVSClusterStatus, s apiconversion.Scope) error {
204+
func Convert_v1beta2_IBMPowerVSClusterStatus_To_v1beta1_IBMPowerVSClusterStatus(in *infrav1.IBMPowerVSClusterStatus, out *IBMPowerVSClusterStatus, s apiconversion.Scope) error {
205205
return autoConvert_v1beta2_IBMPowerVSClusterStatus_To_v1beta1_IBMPowerVSClusterStatus(in, out, s)
206206
}
207207

208-
func Convert_v1beta2_IBMPowerVSImageSpec_To_v1beta1_IBMPowerVSImageSpec(in *infrav1beta2.IBMPowerVSImageSpec, out *IBMPowerVSImageSpec, s apiconversion.Scope) error {
208+
func Convert_v1beta2_IBMPowerVSImageSpec_To_v1beta1_IBMPowerVSImageSpec(in *infrav1.IBMPowerVSImageSpec, out *IBMPowerVSImageSpec, s apiconversion.Scope) error {
209209
return autoConvert_v1beta2_IBMPowerVSImageSpec_To_v1beta1_IBMPowerVSImageSpec(in, out, s)
210210
}
211211

212-
func Convert_v1beta2_IBMPowerVSMachineStatus_To_v1beta1_IBMPowerVSMachineStatus(in *infrav1beta2.IBMPowerVSMachineStatus, out *IBMPowerVSMachineStatus, s apiconversion.Scope) error {
212+
func Convert_v1beta2_IBMPowerVSMachineStatus_To_v1beta1_IBMPowerVSMachineStatus(in *infrav1.IBMPowerVSMachineStatus, out *IBMPowerVSMachineStatus, s apiconversion.Scope) error {
213213
// CAPI V1Beta2 was added in CAPIBM v1beta2
214214
return autoConvert_v1beta2_IBMPowerVSMachineStatus_To_v1beta1_IBMPowerVSMachineStatus(in, out, s)
215215
}

‎api/v1beta1/ibmpowervscluster_types.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
22+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
2323
)
2424

2525
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
@@ -44,7 +44,7 @@ type IBMPowerVSClusterSpec struct {
4444

4545
// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
4646
// +optional
47-
ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
47+
ControlPlaneEndpoint clusterv1beta1.APIEndpoint `json:"controlPlaneEndpoint"`
4848
}
4949

5050
// IBMPowerVSClusterStatus defines the observed state of IBMPowerVSCluster.

‎api/v1beta1/ibmpowervsclustertemplate_types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
22+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
2323
)
2424

2525
// IBMPowerVSClusterTemplateSpec defines the desired state of IBMPowerVSClusterTemplate.
@@ -53,8 +53,8 @@ type IBMPowerVSClusterTemplateResource struct {
5353
// Standard object's metadata.
5454
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
5555
// +optional
56-
ObjectMeta clusterv1.ObjectMeta `json:"metadata,omitempty"`
57-
Spec IBMPowerVSClusterSpec `json:"spec"`
56+
ObjectMeta clusterv1beta1.ObjectMeta `json:"metadata,omitempty"`
57+
Spec IBMPowerVSClusterSpec `json:"spec"`
5858
}
5959

6060
func init() {

‎api/v1beta1/ibmpowervsimage_types.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121

22-
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
22+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
2323
)
2424

2525
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
@@ -82,7 +82,7 @@ type IBMPowerVSImageStatus struct {
8282

8383
// Conditions defines current service state of the IBMPowerVSImage.
8484
// +optional
85-
Conditions clusterv1.Conditions `json:"conditions,omitempty"`
85+
Conditions clusterv1beta1.Conditions `json:"conditions,omitempty"`
8686
}
8787

8888
//+kubebuilder:object:root=true
@@ -100,12 +100,12 @@ type IBMPowerVSImage struct {
100100
}
101101

102102
// GetConditions returns the observations of the operational state of the IBMPowerVSImage resource.
103-
func (r *IBMPowerVSImage) GetConditions() clusterv1.Conditions {
103+
func (r *IBMPowerVSImage) GetConditions() clusterv1beta1.Conditions {
104104
return r.Status.Conditions
105105
}
106106

107-
// SetConditions sets the underlying service state of the IBMPowerVSImage to the predescribed clusterv1.Conditions.
108-
func (r *IBMPowerVSImage) SetConditions(conditions clusterv1.Conditions) {
107+
// SetConditions sets the underlying service state of the IBMPowerVSImage to the predescribed clusterv1beta1.Conditions.
108+
func (r *IBMPowerVSImage) SetConditions(conditions clusterv1beta1.Conditions) {
109109
r.Status.Conditions = conditions
110110
}
111111

‎api/v1beta1/ibmpowervsmachine_types.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
corev1 "k8s.io/api/core/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222

23-
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
23+
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
2424
)
2525

2626
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
@@ -164,7 +164,7 @@ type IBMPowerVSMachineStatus struct {
164164

165165
// Conditions defines current service state of the IBMPowerVSMachine.
166166
// +optional
167-
Conditions clusterv1.Conditions `json:"conditions,omitempty"`
167+
Conditions clusterv1beta1.Conditions `json:"conditions,omitempty"`
168168

169169
// Region specifies the Power VS Service instance region.
170170
Region *string `json:"region,omitempty"`
@@ -194,12 +194,12 @@ type IBMPowerVSMachine struct {
194194
}
195195

196196
// GetConditions returns the observations of the operational state of the IBMPowerVSMachine resource.
197-
func (r *IBMPowerVSMachine) GetConditions() clusterv1.Conditions {
197+
func (r *IBMPowerVSMachine) GetConditions() clusterv1beta1.Conditions {
198198
return r.Status.Conditions
199199
}
200200

201-
// SetConditions sets the underlying service state of the IBMPowerVSMachine to the predescribed clusterv1.Conditions.
202-
func (r *IBMPowerVSMachine) SetConditions(conditions clusterv1.Conditions) {
201+
// SetConditions sets the underlying service state of the IBMPowerVSMachine to the predescribed clusterv1beta1.Conditions.
202+
func (r *IBMPowerVSMachine) SetConditions(conditions clusterv1beta1.Conditions) {
203203
r.Status.Conditions = conditions
204204
}
205205

0 commit comments

Comments
 (0)