Skip to content

Commit baa4acb

Browse files
committed
fix conditions.MarkFalse usage where error strings are passed as formats
Fixes "printf: non-constant format string in call to sigs.k8s.io/cluster-api/util/conditions.MarkFalse (govet)"
1 parent 9f56613 commit baa4acb

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

internal/controller/proxmoxcluster_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ func (r *ProxmoxClusterReconciler) reconcileNormal(ctx context.Context, clusterS
233233
}
234234

235235
if err := r.reconcileNormalCredentialsSecret(ctx, clusterScope); err != nil {
236-
conditions.MarkFalse(clusterScope.ProxmoxCluster, infrav1alpha1.ProxmoxClusterReady, infrav1alpha1.ProxmoxUnreachableReason, clusterv1.ConditionSeverityError, err.Error())
236+
conditions.MarkFalse(clusterScope.ProxmoxCluster, infrav1alpha1.ProxmoxClusterReady, infrav1alpha1.ProxmoxUnreachableReason, clusterv1.ConditionSeverityError, "%s", err)
237237
if apierrors.IsNotFound(err) {
238238
clusterScope.ProxmoxCluster.Status.FailureMessage = ptr.To("credentials secret not found")
239239
clusterScope.ProxmoxCluster.Status.FailureReason = ptr.To(clustererrors.InvalidConfigurationClusterError)

internal/service/taskservice/task.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,10 @@ func checkAndRetryTask(scope *scope.MachineScope, task *proxmox.Task) (bool, err
117117

118118
if task.ExitStatus != "OK" {
119119
errorMessage = task.ExitStatus
120+
} else {
121+
errorMessage = "task failed but its exit status is OK; this should not happen"
120122
}
121-
conditions.MarkFalse(scope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.TaskFailure, clusterv1.ConditionSeverityInfo, errorMessage)
123+
conditions.MarkFalse(scope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.TaskFailure, clusterv1.ConditionSeverityInfo, "%s", errorMessage)
122124

123125
// Instead of directly requeuing the failed task, wait for the RetryAfter duration to pass
124126
// before resetting the taskRef from the ProxmoxMachine status.

internal/service/vmservice/bootstrap.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ func reconcileBootstrapData(ctx context.Context, machineScope *scope.MachineScop
5858
// Get the bootstrap data.
5959
bootstrapData, format, err := getBootstrapData(ctx, machineScope)
6060
if err != nil {
61-
conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.CloningFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
61+
conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.CloningFailedReason, clusterv1.ConditionSeverityWarning, "%s", err)
6262
return false, err
6363
}
6464

6565
biosUUID := extractUUID(machineScope.VirtualMachine.VirtualMachineConfig.SMBios1)
6666

6767
nicData, err := getNetworkConfigData(ctx, machineScope)
6868
if err != nil {
69-
conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.WaitingForStaticIPAllocationReason, clusterv1.ConditionSeverityWarning, err.Error())
69+
conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.WaitingForStaticIPAllocationReason, clusterv1.ConditionSeverityWarning, "%s", err)
7070
return false, err
7171
}
7272

@@ -101,7 +101,7 @@ func injectCloudInit(ctx context.Context, machineScope *scope.MachineScope, boot
101101

102102
injector := getISOInjector(machineScope.VirtualMachine, bootstrapData, metadata, network)
103103
if err := injector.Inject(ctx, inject.CloudConfigFormat); err != nil {
104-
conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.VMProvisionFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
104+
conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.VMProvisionFailedReason, clusterv1.ConditionSeverityWarning, "%s", err)
105105
return errors.Wrap(err, "cloud-init iso inject failed")
106106
}
107107
return nil
@@ -122,7 +122,7 @@ func injectIgnition(ctx context.Context, machineScope *scope.MachineScope, boots
122122

123123
injector := getIgnitionISOInjector(machineScope.VirtualMachine, metadata, enricher)
124124
if err := injector.Inject(ctx, inject.IgnitionFormat); err != nil {
125-
conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.VMProvisionFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
125+
conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.VMProvisionFailedReason, clusterv1.ConditionSeverityWarning, "%s", err)
126126
return errors.Wrap(err, "ignition iso inject failed")
127127
}
128128
return nil

internal/service/vmservice/power.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func reconcilePowerState(ctx context.Context, machineScope *scope.MachineScope)
4343

4444
t, err := startVirtualMachine(ctx, machineScope.InfraCluster.ProxmoxClient, machineScope.VirtualMachine)
4545
if err != nil {
46-
conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.PoweringOnFailedReason, clusterv1.ConditionSeverityInfo, err.Error())
46+
conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.PoweringOnFailedReason, clusterv1.ConditionSeverityInfo, "%s", err)
4747
return false, err
4848
}
4949

internal/service/vmservice/vm.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func checkCloudInitStatus(ctx context.Context, machineScope *scope.MachineScope)
130130
return true, nil
131131
}
132132
if errors.Is(goproxmox.ErrCloudInitFailed, err) {
133-
conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.VMProvisionFailedReason, clusterv1.ConditionSeverityError, err.Error())
133+
conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.VMProvisionFailedReason, clusterv1.ConditionSeverityError, "%s", err)
134134
machineScope.SetFailureMessage(err)
135135
machineScope.SetFailureReason(capierrors.MachineStatusError("BootstrapFailed"))
136136
}
@@ -174,7 +174,7 @@ func ensureVirtualMachine(ctx context.Context, machineScope *scope.MachineScope)
174174
// Create the VM.
175175
resp, err := createVM(ctx, machineScope)
176176
if err != nil {
177-
conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.CloningFailedReason, clusterv1.ConditionSeverityWarning, err.Error())
177+
conditions.MarkFalse(machineScope.ProxmoxMachine, infrav1alpha1.VMProvisionedCondition, infrav1alpha1.CloningFailedReason, clusterv1.ConditionSeverityWarning, "%s", err)
178178
return false, err
179179
}
180180
machineScope.Logger.V(4).Info("Task created", "taskID", resp.Task.ID)

0 commit comments

Comments
 (0)