Update staticcheck exclude-rules for SA1019

Author: ChandrikaHarish

.golangci.yml

@@ -196,6 +196,18 @@ linters:
           - gocritic
         path: _test\.go
         text: 'deferInLoop: Possible resource leak, ''defer'' is called in the ''for'' loop'
+      - linters:
+          - staticcheck
+        text: 'SA1019: .*(i|s|m)\.IBMPowerVSCluster.Spec.ServiceInstanceID is deprecated: use ServiceInstance instead'
+      - linters:
+          - staticcheck
+        text: 'SA1019: .*(i|s|m)\.IBMPowerVSImage.Spec.ServiceInstanceID is deprecated: use ServiceInstance instead'
+      - linters:
+          - staticcheck
+        text: 'SA1019: .*(i|s|m|params)\.IBMPowerVSMachine.Spec.ServiceInstanceID is deprecated: use ServiceInstance instead'
+      - linters:
+          - staticcheck
+        text: 'SA1019: spec.ServiceInstanceID is deprecated: use ServiceInstance instead'
     paths:
       - zz_generated.*\.go$
       - third_party$
@@ -228,4 +240,4 @@ formatters:
       - third_party$
       - builtin$
       - examples$
-      - _test\.go
+      - _test\.go

api/v1beta1/types.go

@@ -94,7 +94,7 @@ type VPCEndpoint struct {
 	Address *string `json:"address"`
 
 	// Deprecated: This field has no function and is going to be removed in the next release.
-
+	//
 	// +optional
 	FIPID *string `json:"floatingIPID,omitempty"`
 	// +optional

api/v1beta2/ibmpowervscluster_types.go

@@ -34,7 +34,7 @@ const (
 type IBMPowerVSClusterSpec struct {
 
 	// Deprecated: use ServiceInstance instead
-
+	//
 	// ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
 	ServiceInstanceID string `json:"serviceInstanceID"`
 

api/v1beta2/ibmpowervsimage_types.go

@@ -38,7 +38,7 @@ type IBMPowerVSImageSpec struct {
 	ClusterName string `json:"clusterName"`
 
 	// Deprecated: use ServiceInstance instead
-
+	//
 	// ServiceInstanceID is the id of the power cloud instance where the image will get imported.
 	ServiceInstanceID string `json:"serviceInstanceID"`
 

api/v1beta2/ibmpowervsmachine_types.go

@@ -49,7 +49,7 @@ type IBMPowerVSMachineSpec struct {
 	// Important: Run "make" to regenerate code after modifying this file
 
 	// Deprecated: use ServiceInstance instead
-
+	//
 	// ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
 	ServiceInstanceID string `json:"serviceInstanceID"`
 

api/v1beta2/types.go

@@ -563,9 +563,9 @@ type Subnet struct {
 // VPCEndpoint describes a VPCEndpoint.
 type VPCEndpoint struct {
 	Address *string `json:"address"`
-	// +optional
 	// Deprecated: This field has no function and is going to be removed in the next release.
-
+	//
+	// +optional
 	FIPID *string `json:"floatingIPID,omitempty"`
 	// +optional
 	LBID *string `json:"loadBalancerIPID,omitempty"`

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

@@ -580,8 +580,10 @@ spec:
                     type: string
                 type: object
               serviceInstanceID:
-                description: ServiceInstanceID is the id of the power cloud instance
-                  where the vsi instance will get deployed.
+                description: |-
+                  Deprecated: use ServiceInstance instead
+
+                  ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
                 type: string
               transitGateway:
                 description: |-

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

@@ -618,8 +618,10 @@ spec:
                             type: string
                         type: object
                       serviceInstanceID:
-                        description: ServiceInstanceID is the id of the power cloud
-                          instance where the vsi instance will get deployed.
+                        description: |-
+                          Deprecated: use ServiceInstance instead
+
+                          ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
                         type: string
                       transitGateway:
                         description: |-

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

@@ -245,8 +245,10 @@ spec:
                     type: string
                 type: object
               serviceInstanceID:
-                description: ServiceInstanceID is the id of the power cloud instance
-                  where the image will get imported.
+                description: |-
+                  Deprecated: use ServiceInstance instead
+
+                  ServiceInstanceID is the id of the power cloud instance where the image will get imported.
                 type: string
               storageType:
                 default: tier1

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

@@ -484,8 +484,10 @@ spec:
                     type: string
                 type: object
               serviceInstanceID:
-                description: ServiceInstanceID is the id of the power cloud instance
-                  where the vsi instance will get deployed.
+                description: |-
+                  Deprecated: use ServiceInstance instead
+
+                  ServiceInstanceID is the id of the power cloud instance where the vsi instance will get deployed.
                 type: string
               sshKey:
                 description: SSHKey is the name of the SSH key pair provided to the