Skip to content

Commit 5bd9a47

Browse files
ChandrikaHarishChandrikaHarish
committed
Bump github.com/golangci/golangci-lint/v2 from 2.5.0 to 2.6.0
1 parent abbe3ef commit 5bd9a47

17 files changed

+204
-155
lines changed

‎.golangci.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,18 @@ linters:
196196
- gocritic
197197
path: _test\.go
198198
text: 'deferInLoop: Possible resource leak, ''defer'' is called in the ''for'' loop'
199+
- linters:
200+
- staticcheck
201+
text: 'SA1019: .*(i|s|m)\.IBMPowerVSCluster.Spec.ServiceInstanceID is deprecated: use ServiceInstance instead'
202+
- linters:
203+
- staticcheck
204+
text: 'SA1019: .*(i|s|m)\.IBMPowerVSImage.Spec.ServiceInstanceID is deprecated: use ServiceInstance instead'
205+
- linters:
206+
- staticcheck
207+
text: 'SA1019: .*(i|s|m|params)\.IBMPowerVSMachine.Spec.ServiceInstanceID is deprecated: use ServiceInstance instead'
208+
- linters:
209+
- staticcheck
210+
text: 'SA1019: spec.ServiceInstanceID is deprecated: use ServiceInstance instead'
199211
paths:
200212
- zz_generated.*\.go$
201213
- third_party$

‎api/v1beta1/types.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@ type Subnet struct {
9292
// VPCEndpoint describes a VPCEndpoint.
9393
type VPCEndpoint struct {
9494
Address *string `json:"address"`
95-
// +optional
95+
9696
// Deprecated: This field has no function and is going to be removed in the next release.
97+
//
98+
// +optional
9799
FIPID *string `json:"floatingIPID,omitempty"`
98100
// +optional
99101
LBID *string `json:"loadBalancerIPID,omitempty"`

‎api/v1beta2/ibmpowervscluster_types.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ const (
3232

3333
// IBMPowerVSClusterSpec defines the desired state of IBMPowerVSCluster.
3434
type IBMPowerVSClusterSpec struct {
35-
// ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
35+
3636
// Deprecated: use ServiceInstance instead
37+
//
38+
// ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
3739
ServiceInstanceID string `json:"serviceInstanceID"`
3840

3941
// Network is the reference to the Network to use for this cluster.

‎api/v1beta2/ibmpowervsimage_types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ type IBMPowerVSImageSpec struct {
3737
// +kubebuilder:validation:MinLength=1
3838
ClusterName string `json:"clusterName"`
3939

40-
// ServiceInstanceID is the id of the power cloud instance where the image will get imported.
4140
// Deprecated: use ServiceInstance instead
41+
//
42+
// ServiceInstanceID is the id of the power cloud instance where the image will get imported.
4243
ServiceInstanceID string `json:"serviceInstanceID"`
4344

4445
// serviceInstance is the reference to the Power VS workspace on which the server instance(VM) will be created.

‎api/v1beta2/ibmpowervsmachine_types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ type IBMPowerVSMachineSpec struct {
4848
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
4949
// Important: Run "make" to regenerate code after modifying this file
5050

51-
// ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
5251
// Deprecated: use ServiceInstance instead
52+
//
53+
// ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
5354
ServiceInstanceID string `json:"serviceInstanceID"`
5455

5556
// serviceInstance is the reference to the Power VS workspace on which the server instance(VM) will be created.

‎api/v1beta2/types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,8 +563,9 @@ type Subnet struct {
563563
// VPCEndpoint describes a VPCEndpoint.
564564
type VPCEndpoint struct {
565565
Address *string `json:"address"`
566-
// +optional
567566
// Deprecated: This field has no function and is going to be removed in the next release.
567+
//
568+
// +optional
568569
FIPID *string `json:"floatingIPID,omitempty"`
569570
// +optional
570571
LBID *string `json:"loadBalancerIPID,omitempty"`

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclusters.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,9 @@ spec:
581581
type: object
582582
serviceInstanceID:
583583
description: |-
584-
ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
585584
Deprecated: use ServiceInstance instead
585+
586+
ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
586587
type: string
587588
transitGateway:
588589
description: |-

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclustertemplates.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,8 +619,9 @@ spec:
619619
type: object
620620
serviceInstanceID:
621621
description: |-
622-
ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
623622
Deprecated: use ServiceInstance instead
623+
624+
ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
624625
type: string
625626
transitGateway:
626627
description: |-

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsimages.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,9 @@ spec:
246246
type: object
247247
serviceInstanceID:
248248
description: |-
249-
ServiceInstanceID is the id of the power cloud instance where the image will get imported.
250249
Deprecated: use ServiceInstance instead
250+
251+
ServiceInstanceID is the id of the power cloud instance where the image will get imported.
251252
type: string
252253
storageType:
253254
default: tier1

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsmachines.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,9 @@ spec:
485485
type: object
486486
serviceInstanceID:
487487
description: |-
488-
ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
489488
Deprecated: use ServiceInstance instead
489+
490+
ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
490491
type: string
491492
sshKey:
492493
description: SSHKey is the name of the SSH key pair provided to the

0 commit comments

Comments
 (0)