Skip to content

Commit 253b03c

Browse files
hrakhrak
committed
Lint fixes
Signed-off-by: Hans Rakers <[email protected]>
1 parent 9406e8a commit 253b03c

14 files changed

+73
-97
lines changed

‎api/v1beta1/cloudstackaffinitygroup_conversion.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ func (dst *CloudStackAffinityGroup) ConvertFrom(srcRaw conversion.Hub) error { /
4747
}
4848

4949
// Preserve Hub data on down-conversion
50-
if err := utilconversion.MarshalData(src, dst); err != nil {
51-
return err
52-
}
53-
return nil
50+
return utilconversion.MarshalData(src, dst)
5451
}
5552

5653
func Convert_v1beta3_CloudStackAffinityGroupSpec_To_v1beta1_CloudStackAffinityGroupSpec(in *v1beta3.CloudStackAffinityGroupSpec, out *CloudStackAffinityGroupSpec, s machineryconversion.Scope) error { // nolint

‎api/v1beta1/cloudstackisolatednetwork_conversion.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ func (dst *CloudStackIsolatedNetwork) ConvertFrom(srcRaw conversion.Hub) error {
4747
}
4848

4949
// Preserve Hub data on down-conversion
50-
if err := utilconversion.MarshalData(src, dst); err != nil {
51-
return err
52-
}
53-
return nil
50+
return utilconversion.MarshalData(src, dst)
5451
}
5552

5653
func Convert_v1beta3_CloudStackIsolatedNetworkSpec_To_v1beta1_CloudStackIsolatedNetworkSpec(in *v1beta3.CloudStackIsolatedNetworkSpec, out *CloudStackIsolatedNetworkSpec, s machineryconversion.Scope) error { // nolint

‎api/v1beta1/cloudstackmachine_conversion.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,7 @@ func (dst *CloudStackMachine) ConvertFrom(srcRaw conversion.Hub) error { // noli
5656
}
5757

5858
// Preserve Hub data on down-conversion
59-
if err := utilconversion.MarshalData(src, dst); err != nil {
60-
return err
61-
}
62-
return nil
59+
return utilconversion.MarshalData(src, dst)
6360
}
6461

6562
func Convert_v1beta3_CloudStackMachineSpec_To_v1beta1_CloudStackMachineSpec(in *v1beta3.CloudStackMachineSpec, out *CloudStackMachineSpec, s machineryconversion.Scope) error { // nolint

‎api/v1beta1/cloudstackmachinetemplate_conversion.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,7 @@ func (dst *CloudStackMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
5050
}
5151

5252
// Preserve Hub data on down-conversion
53-
if err := utilconversion.MarshalData(src, dst); err != nil {
54-
return err
55-
}
56-
return nil
53+
return utilconversion.MarshalData(src, dst)
5754
}
5855

5956
func Convert_v1beta1_CloudStackMachineTemplateSpec_To_v1beta3_CloudStackMachineTemplateSpec(in *CloudStackMachineTemplateSpec, out *v1beta3.CloudStackMachineTemplateSpec, s machineryconversion.Scope) error { // nolint

‎api/v1beta1/conversion.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package v1beta1
1919
import (
2020
"context"
2121
"fmt"
22+
2223
corev1 "k8s.io/api/core/v1"
2324
conv "k8s.io/apimachinery/pkg/conversion"
2425
"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
@@ -90,7 +91,7 @@ func GetFailureDomains(csCluster *CloudStackCluster) ([]v1beta3.CloudStackFailur
9091
var failureDomains []v1beta3.CloudStackFailureDomainSpec
9192
namespace := csCluster.Namespace
9293
for _, zone := range csCluster.Spec.Zones {
93-
name, err := GetDefaultFailureDomainName(namespace, csCluster.Name, zone.ID, zone.Name)
94+
name, err := GetDefaultFailureDomainName(namespace, zone.ID, zone.Name)
9495
if err != nil {
9596
return nil, err
9697
}
@@ -122,7 +123,7 @@ func GetFailureDomains(csCluster *CloudStackCluster) ([]v1beta3.CloudStackFailur
122123
// When upgrading cluster using eks-a, a secret named global will be created by eks-a, and it is used by following
123124
// method to get zoneID by calling cloudstack API.
124125
// When upgrading cluster using clusterctl directly, zoneID is fetched directly from kubernetes cluster in cloudstackzones.
125-
func GetDefaultFailureDomainName(namespace string, clusterName string, zoneID string, zoneName string) (string, error) {
126+
func GetDefaultFailureDomainName(namespace string, zoneID string, zoneName string) (string, error) {
126127
if len(zoneID) > 0 {
127128
return zoneID, nil
128129
}

‎controllers/cloudstackisolatednetwork_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func (r *CloudStackIsoNetReconciliationRunner) Reconcile() (retRes ctrl.Result,
9696

9797
func (r *CloudStackIsoNetReconciliationRunner) ReconcileDelete() (retRes ctrl.Result, retErr error) {
9898
r.Log.Info("Deleting IsolatedNetwork.")
99-
if err := r.CSUser.DisposeIsoNetResources(r.FailureDomain, r.ReconciliationSubject, r.CSCluster); err != nil {
99+
if err := r.CSUser.DisposeIsoNetResources(r.ReconciliationSubject, r.CSCluster); err != nil {
100100
if !strings.Contains(strings.ToLower(err.Error()), "no match found") {
101101
return ctrl.Result{}, err
102102
}

‎controllers/cloudstackmachine_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ func (r *CloudStackMachineReconciliationRunner) GetOrCreateVMInstance() (retRes
237237
}
238238

239239
userData := processCustomMetadata(data, r)
240-
err := r.CSUser.GetOrCreateVMInstance(r.ReconciliationSubject, r.CAPIMachine, r.CSCluster, r.FailureDomain, r.AffinityGroup, userData)
240+
err := r.CSUser.GetOrCreateVMInstance(r.ReconciliationSubject, r.CAPIMachine, r.FailureDomain, r.AffinityGroup, userData)
241241
if err != nil {
242242
r.Log.Error(err, "GetOrCreateVMInstance returned error")
243243
r.Recorder.Eventf(r.ReconciliationSubject, "Warning", "Creating", CSMachineCreationFailed, err.Error())
@@ -355,7 +355,7 @@ func (r *CloudStackMachineReconciliationRunner) ReconcileDelete() (retRes ctrl.R
355355
// SetupWithManager registers the machine reconciler to the CAPI controller manager.
356356
func (reconciler *CloudStackMachineReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opts controller.Options) error {
357357
reconciler.Recorder = mgr.GetEventRecorderFor("capc-machine-controller")
358-
CloudStackClusterToCloudStackMachines, err := utils.CloudStackClusterToCloudStackMachines(ctx, reconciler.K8sClient, &infrav1.CloudStackMachineList{}, reconciler.Scheme, ctrl.LoggerFrom(ctx))
358+
CloudStackClusterToCloudStackMachines, err := utils.CloudStackClusterToCloudStackMachines(reconciler.K8sClient, &infrav1.CloudStackMachineList{}, reconciler.Scheme, ctrl.LoggerFrom(ctx))
359359
if err != nil {
360360
return errors.Wrap(err, "failed to create CloudStackClusterToCloudStackMachines mapper")
361361
}

‎controllers/cloudstackmachine_controller_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ var _ = Describe("CloudStackMachineReconciler", func() {
6060
// Mock a call to GetOrCreateVMInstance and set the machine to running.
6161
mockCloudClient.EXPECT().GetOrCreateVMInstance(
6262
gomock.Any(), gomock.Any(), gomock.Any(),
63-
gomock.Any(), gomock.Any(), gomock.Any()).Do(
64-
func(arg1, _, _, _, _, _ interface{}) {
63+
gomock.Any(), gomock.Any()).Do(
64+
func(arg1, _, _, _, _ interface{}) {
6565
arg1.(*infrav1.CloudStackMachine).Status.InstanceState = "Running"
6666
}).AnyTimes()
6767

@@ -85,8 +85,8 @@ var _ = Describe("CloudStackMachineReconciler", func() {
8585
// Mock a call to GetOrCreateVMInstance and set the machine to running.
8686
mockCloudClient.EXPECT().GetOrCreateVMInstance(
8787
gomock.Any(), gomock.Any(), gomock.Any(),
88-
gomock.Any(), gomock.Any(), gomock.Any()).Do(
89-
func(arg1, _, _, _, _, _ interface{}) {
88+
gomock.Any(), gomock.Any()).Do(
89+
func(arg1, _, _, _, _ interface{}) {
9090
arg1.(*infrav1.CloudStackMachine).Status.InstanceState = "Running"
9191
controllerutil.AddFinalizer(arg1.(*infrav1.CloudStackMachine), infrav1.MachineFinalizer)
9292
}).AnyTimes()
@@ -125,8 +125,8 @@ var _ = Describe("CloudStackMachineReconciler", func() {
125125
// Mock a call to GetOrCreateVMInstance and set the machine to running.
126126
mockCloudClient.EXPECT().GetOrCreateVMInstance(
127127
gomock.Any(), gomock.Any(), gomock.Any(),
128-
gomock.Any(), gomock.Any(), gomock.Any()).Do(
129-
func(arg1, _, _, _, _, _ interface{}) {
128+
gomock.Any(), gomock.Any()).Do(
129+
func(arg1, _, _, _, _ interface{}) {
130130
arg1.(*infrav1.CloudStackMachine).Status.InstanceState = "Running"
131131
controllerutil.AddFinalizer(arg1.(*infrav1.CloudStackMachine), infrav1.MachineFinalizer)
132132
}).AnyTimes()
@@ -174,8 +174,8 @@ var _ = Describe("CloudStackMachineReconciler", func() {
174174
// Mock a call to GetOrCreateVMInstance and set the machine to running.
175175
mockCloudClient.EXPECT().GetOrCreateVMInstance(
176176
gomock.Any(), gomock.Any(), gomock.Any(),
177-
gomock.Any(), gomock.Any(), gomock.Any()).Do(
178-
func(arg1, _, _, _, _, userdata interface{}) {
177+
gomock.Any(), gomock.Any()).Do(
178+
func(arg1, _, _, _, userdata interface{}) {
179179
expectedUserdata := fmt.Sprintf("%s{{%s}}", dummies.CAPIMachine.Name, dummies.CSMachine1.Spec.FailureDomainName)
180180
Ω(userdata == expectedUserdata).Should(BeTrue())
181181
arg1.(*infrav1.CloudStackMachine).Status.InstanceState = "Running"
@@ -236,8 +236,8 @@ var _ = Describe("CloudStackMachineReconciler", func() {
236236
})
237237
mockCloudClient.EXPECT().GetOrCreateVMInstance(
238238
gomock.Any(), gomock.Any(), gomock.Any(),
239-
gomock.Any(), gomock.Any(), gomock.Any()).Do(
240-
func(arg1, _, _, _, _, _ interface{}) {
239+
gomock.Any(), gomock.Any()).Do(
240+
func(arg1, _, _, _, _ interface{}) {
241241
arg1.(*infrav1.CloudStackMachine).Status.InstanceState = "Running"
242242
}).AnyTimes()
243243
Ω(fakeCtrlClient.Get(ctx, key, dummies.CSCluster)).Should(Succeed())

‎controllers/utils/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ func GetOwnerClusterName(obj metav1.ObjectMeta) (string, error) {
204204

205205
// CloudStackClusterToCloudStackMachines is a handler.ToRequestsFunc to be used to enqeue requests for reconciliation
206206
// of CloudStackMachines.
207-
func CloudStackClusterToCloudStackMachines(ctx context.Context, c client.Client, obj runtime.Object, scheme *runtime.Scheme, log logr.Logger) (handler.MapFunc, error) {
207+
func CloudStackClusterToCloudStackMachines(c client.Client, obj runtime.Object, scheme *runtime.Scheme, log logr.Logger) (handler.MapFunc, error) {
208208
gvk, err := apiutil.GVKForObject(obj, scheme)
209209
if err != nil {
210210
return nil, errors.Wrap(err, "failed to find GVK for CloudStackMachine")

‎pkg/cloud/affinity_groups_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ var _ = Describe("AffinityGroup Unit Tests", func() {
142142
dummies.CSMachine1.Spec.DiskOffering.Name = ""
143143

144144
Ω(client.GetOrCreateVMInstance(
145-
dummies.CSMachine1, dummies.CAPIMachine, dummies.CSCluster, dummies.CSFailureDomain1, dummies.CSAffinityGroup, "",
145+
dummies.CSMachine1, dummies.CAPIMachine, dummies.CSFailureDomain1, dummies.CSAffinityGroup, "",
146146
)).Should(Succeed())
147147

148148
Ω(client.GetOrCreateAffinityGroup(dummies.AffinityGroup)).Should(Succeed())

‎pkg/cloud/instance.go

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
)
3636

3737
type VMIface interface {
38-
GetOrCreateVMInstance(*infrav1.CloudStackMachine, *clusterv1.Machine, *infrav1.CloudStackCluster, *infrav1.CloudStackFailureDomain, *infrav1.CloudStackAffinityGroup, string) error
38+
GetOrCreateVMInstance(*infrav1.CloudStackMachine, *clusterv1.Machine, *infrav1.CloudStackFailureDomain, *infrav1.CloudStackAffinityGroup, string) error
3939
ResolveVMInstanceDetails(*infrav1.CloudStackMachine) error
4040
DestroyVMInstance(*infrav1.CloudStackMachine) error
4141
}
@@ -117,7 +117,6 @@ func (c *client) ResolveServiceOffering(csMachine *infrav1.CloudStackMachine, zo
117117
}
118118

119119
func (c *client) ResolveTemplate(
120-
csCluster *infrav1.CloudStackCluster,
121120
csMachine *infrav1.CloudStackMachine,
122121
zoneID string,
123122
) (templateID string, retErr error) {
@@ -208,7 +207,7 @@ func verifyDiskoffering(csMachine *infrav1.CloudStackMachine, c *client, diskOff
208207
}
209208

210209
// CheckAccountLimits Checks the account's limit of VM, CPU & Memory
211-
func (c *client) CheckAccountLimits(fd *infrav1.CloudStackFailureDomain, offering *cloudstack.ServiceOffering) error {
210+
func (c *client) CheckAccountLimits(offering *cloudstack.ServiceOffering) error {
212211
if c.user.Account.CPUAvailable != "Unlimited" {
213212
cpuAvailable, err := strconv.ParseInt(c.user.Account.CPUAvailable, 10, 0)
214213
if err == nil && int64(offering.Cpunumber) > cpuAvailable {
@@ -233,7 +232,7 @@ func (c *client) CheckAccountLimits(fd *infrav1.CloudStackFailureDomain, offerin
233232
}
234233

235234
// CheckDomainLimits Checks the domain's limit of VM, CPU & Memory
236-
func (c *client) CheckDomainLimits(fd *infrav1.CloudStackFailureDomain, offering *cloudstack.ServiceOffering) error {
235+
func (c *client) CheckDomainLimits(offering *cloudstack.ServiceOffering) error {
237236
if c.user.Account.Domain.CPUAvailable != "Unlimited" {
238237
cpuAvailable, err := strconv.ParseInt(c.user.Account.Domain.CPUAvailable, 10, 0)
239238
if err == nil && int64(offering.Cpunumber) > cpuAvailable {
@@ -259,15 +258,14 @@ func (c *client) CheckDomainLimits(fd *infrav1.CloudStackFailureDomain, offering
259258

260259
// CheckLimits will check the account & domain limits
261260
func (c *client) CheckLimits(
262-
fd *infrav1.CloudStackFailureDomain,
263261
offering *cloudstack.ServiceOffering,
264262
) error {
265-
err := c.CheckAccountLimits(fd, offering)
263+
err := c.CheckAccountLimits(offering)
266264
if err != nil {
267265
return err
268266
}
269267

270-
err = c.CheckDomainLimits(fd, offering)
268+
err = c.CheckDomainLimits(offering)
271269
if err != nil {
272270
return err
273271
}
@@ -280,13 +278,12 @@ func (c *client) CheckLimits(
280278
func (c *client) DeployVM(
281279
csMachine *infrav1.CloudStackMachine,
282280
capiMachine *clusterv1.Machine,
283-
csCluster *infrav1.CloudStackCluster,
284281
fd *infrav1.CloudStackFailureDomain,
285282
affinity *infrav1.CloudStackAffinityGroup,
286283
offering *cloudstack.ServiceOffering,
287284
userData string,
288285
) error {
289-
templateID, err := c.ResolveTemplate(csCluster, csMachine, fd.Spec.Zone.ID)
286+
templateID, err := c.ResolveTemplate(csMachine, fd.Spec.Zone.ID)
290287
if err != nil {
291288
return err
292289
}
@@ -358,7 +355,6 @@ func (c *client) DeployVM(
358355
func (c *client) GetOrCreateVMInstance(
359356
csMachine *infrav1.CloudStackMachine,
360357
capiMachine *clusterv1.Machine,
361-
csCluster *infrav1.CloudStackCluster,
362358
fd *infrav1.CloudStackFailureDomain,
363359
affinity *infrav1.CloudStackAffinityGroup,
364360
userData string,
@@ -374,12 +370,12 @@ func (c *client) GetOrCreateVMInstance(
374370
return err
375371
}
376372

377-
err = c.CheckLimits(fd, &offering)
373+
err = c.CheckLimits(&offering)
378374
if err != nil {
379375
return err
380376
}
381377

382-
if err := c.DeployVM(csMachine, capiMachine, csCluster, fd, affinity, &offering, userData); err != nil {
378+
if err := c.DeployVM(csMachine, capiMachine, fd, affinity, &offering, userData); err != nil {
383379
return err
384380
}
385381

0 commit comments

Comments
 (0)