Skip to content

Commit 0028772

Browse files
sivcharisivchari
authored
🌱 Bump Go 1.24 (#12128)
* Bump Go 1.24 Signed-off-by: sivchari <shibuuuu5@gmail.com> * Disable 2 rules of golangci-lint Signed-off-by: sivchari <shibuuuu5@gmail.com> * apply for printf Signed-off-by: sivchari <shibuuuu5@gmail.com> * Upgrade Go to 1.24.3 to avoid vulnerability Signed-off-by: sivchari <shibuuuu5@gmail.com> * update cloudbuild image Signed-off-by: sivchari <shibuuuu5@gmail.com> --------- Signed-off-by: sivchari <shibuuuu5@gmail.com>
1 parent 1767cd3 commit 0028772

File tree

30 files changed

+77
-74
lines changed

30 files changed

+77
-74
lines changed

‎.golangci-kal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: "2"
22
run:
3-
go: "1.23"
3+
go: "1.24"
44
allow-parallel-runners: true
55
linters:
66
default: none

‎.golangci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "2"
22
run:
33
timeout: 10m
4-
go: "1.23"
4+
go: "1.24"
55
build-tags:
66
- tools
77
- e2e
@@ -47,6 +47,9 @@ linters:
4747
- usestdlibvars # using variables/constants from the standard library
4848
- usetesting # report function to be replace by testing
4949
- whitespace # unnecessary newlines
50+
disable:
51+
# TODO: It will be dropped when the Go version migration is done.
52+
- usetesting
5053
settings:
5154
ginkgolinter:
5255
forbid-focus-container: true

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ SHELL:=/usr/bin/env bash
2323
#
2424
# Go.
2525
#
26-
GO_VERSION ?= 1.23.8
27-
GO_DIRECTIVE_VERSION ?= 1.23.0
26+
GO_VERSION ?= 1.24.3
27+
GO_DIRECTIVE_VERSION ?= 1.24.0
2828
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
2929

3030
# Ensure correct toolchain is used

‎Tiltfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ def load_provider_tilt_files():
172172

173173
tilt_helper_dockerfile_header = """
174174
# Tilt image
175-
FROM golang:1.23.8 as tilt-helper
175+
FROM golang:1.24.3 as tilt-helper
176176
# Install delve. Note this should be kept in step with the Go release minor version.
177-
RUN go install github.com/go-delve/delve/cmd/dlv@v1.23
177+
RUN go install github.com/go-delve/delve/cmd/dlv@v1.24
178178
# Support live reloading with Tilt
179179
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/restart.sh && \
180180
wget --output-document /start.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/start.sh && \
@@ -183,7 +183,7 @@ RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com
183183
"""
184184

185185
tilt_dockerfile_header = """
186-
FROM golang:1.23.8 as tilt
186+
FROM golang:1.24.3 as tilt
187187
WORKDIR /
188188
COPY --from=tilt-helper /process.txt .
189189
COPY --from=tilt-helper /start.sh .

‎bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ func (r *KubeadmConfigReconciler) handleClusterNotInitialized(ctx context.Contex
592592
util.ObjectKey(scope.Cluster))
593593
}
594594
if err != nil {
595-
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.CertificatesAvailableV1Beta1Condition, bootstrapv1.CertificatesGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, err.Error())
595+
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.CertificatesAvailableV1Beta1Condition, bootstrapv1.CertificatesGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, "%s", err.Error())
596596
conditions.Set(scope.Config, metav1.Condition{
597597
Type: bootstrapv1.KubeadmConfigCertificatesAvailableCondition,
598598
Status: metav1.ConditionUnknown,
@@ -616,7 +616,7 @@ func (r *KubeadmConfigReconciler) handleClusterNotInitialized(ctx context.Contex
616616

617617
files, err := r.resolveFiles(ctx, scope.Config)
618618
if err != nil {
619-
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, err.Error())
619+
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, "%s", err.Error())
620620
conditions.Set(scope.Config, metav1.Condition{
621621
Type: bootstrapv1.KubeadmConfigDataSecretAvailableCondition,
622622
Status: metav1.ConditionFalse,
@@ -628,7 +628,7 @@ func (r *KubeadmConfigReconciler) handleClusterNotInitialized(ctx context.Contex
628628

629629
users, err := r.resolveUsers(ctx, scope.Config)
630630
if err != nil {
631-
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, err.Error())
631+
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, "%s", err.Error())
632632
conditions.Set(scope.Config, metav1.Condition{
633633
Type: bootstrapv1.KubeadmConfigDataSecretAvailableCondition,
634634
Status: metav1.ConditionFalse,
@@ -691,7 +691,7 @@ func (r *KubeadmConfigReconciler) joinWorker(ctx context.Context, scope *Scope)
691691
util.ObjectKey(scope.Cluster),
692692
)
693693
if err != nil {
694-
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.CertificatesAvailableV1Beta1Condition, bootstrapv1.CertificatesCorruptedV1Beta1Reason, clusterv1.ConditionSeverityError, err.Error())
694+
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.CertificatesAvailableV1Beta1Condition, bootstrapv1.CertificatesCorruptedV1Beta1Reason, clusterv1.ConditionSeverityError, "%s", err.Error())
695695
conditions.Set(scope.Config, metav1.Condition{
696696
Type: bootstrapv1.KubeadmConfigCertificatesAvailableCondition,
697697
Status: metav1.ConditionUnknown,
@@ -701,7 +701,7 @@ func (r *KubeadmConfigReconciler) joinWorker(ctx context.Context, scope *Scope)
701701
return ctrl.Result{}, err
702702
}
703703
if err := certificates.EnsureAllExist(); err != nil {
704-
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.CertificatesAvailableV1Beta1Condition, bootstrapv1.CertificatesCorruptedV1Beta1Reason, clusterv1.ConditionSeverityError, err.Error())
704+
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.CertificatesAvailableV1Beta1Condition, bootstrapv1.CertificatesCorruptedV1Beta1Reason, clusterv1.ConditionSeverityError, "%s", err.Error())
705705
conditions.Set(scope.Config, metav1.Condition{
706706
Type: bootstrapv1.KubeadmConfigCertificatesAvailableCondition,
707707
Status: metav1.ConditionUnknown,
@@ -758,7 +758,7 @@ func (r *KubeadmConfigReconciler) joinWorker(ctx context.Context, scope *Scope)
758758

759759
files, err := r.resolveFiles(ctx, scope.Config)
760760
if err != nil {
761-
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, err.Error())
761+
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, "%s", err.Error())
762762
conditions.Set(scope.Config, metav1.Condition{
763763
Type: bootstrapv1.KubeadmConfigDataSecretAvailableCondition,
764764
Status: metav1.ConditionFalse,
@@ -770,7 +770,7 @@ func (r *KubeadmConfigReconciler) joinWorker(ctx context.Context, scope *Scope)
770770

771771
users, err := r.resolveUsers(ctx, scope.Config)
772772
if err != nil {
773-
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, err.Error())
773+
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, "%s", err.Error())
774774
conditions.Set(scope.Config, metav1.Condition{
775775
Type: bootstrapv1.KubeadmConfigDataSecretAvailableCondition,
776776
Status: metav1.ConditionFalse,
@@ -783,7 +783,7 @@ func (r *KubeadmConfigReconciler) joinWorker(ctx context.Context, scope *Scope)
783783
if discoveryFile := scope.Config.Spec.JoinConfiguration.Discovery.File; discoveryFile != nil && discoveryFile.KubeConfig != nil {
784784
kubeconfig, err := r.resolveDiscoveryKubeConfig(discoveryFile)
785785
if err != nil {
786-
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, err.Error())
786+
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, "%s", err.Error())
787787
conditions.Set(scope.Config, metav1.Condition{
788788
Type: bootstrapv1.KubeadmConfigDataSecretAvailableCondition,
789789
Status: metav1.ConditionFalse,
@@ -856,7 +856,7 @@ func (r *KubeadmConfigReconciler) joinControlplane(ctx context.Context, scope *S
856856
util.ObjectKey(scope.Cluster),
857857
)
858858
if err != nil {
859-
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.CertificatesAvailableV1Beta1Condition, bootstrapv1.CertificatesCorruptedV1Beta1Reason, clusterv1.ConditionSeverityError, err.Error())
859+
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.CertificatesAvailableV1Beta1Condition, bootstrapv1.CertificatesCorruptedV1Beta1Reason, clusterv1.ConditionSeverityError, "%s", err.Error())
860860
conditions.Set(scope.Config, metav1.Condition{
861861
Type: bootstrapv1.KubeadmConfigCertificatesAvailableCondition,
862862
Status: metav1.ConditionUnknown,
@@ -866,7 +866,7 @@ func (r *KubeadmConfigReconciler) joinControlplane(ctx context.Context, scope *S
866866
return ctrl.Result{}, err
867867
}
868868
if err := certificates.EnsureAllExist(); err != nil {
869-
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.CertificatesAvailableV1Beta1Condition, bootstrapv1.CertificatesCorruptedV1Beta1Reason, clusterv1.ConditionSeverityError, err.Error())
869+
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.CertificatesAvailableV1Beta1Condition, bootstrapv1.CertificatesCorruptedV1Beta1Reason, clusterv1.ConditionSeverityError, "%s", err.Error())
870870
conditions.Set(scope.Config, metav1.Condition{
871871
Type: bootstrapv1.KubeadmConfigCertificatesAvailableCondition,
872872
Status: metav1.ConditionUnknown,
@@ -911,7 +911,7 @@ func (r *KubeadmConfigReconciler) joinControlplane(ctx context.Context, scope *S
911911

912912
files, err := r.resolveFiles(ctx, scope.Config)
913913
if err != nil {
914-
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, err.Error())
914+
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, "%s", err.Error())
915915
conditions.Set(scope.Config, metav1.Condition{
916916
Type: bootstrapv1.KubeadmConfigDataSecretAvailableCondition,
917917
Status: metav1.ConditionFalse,
@@ -923,7 +923,7 @@ func (r *KubeadmConfigReconciler) joinControlplane(ctx context.Context, scope *S
923923

924924
users, err := r.resolveUsers(ctx, scope.Config)
925925
if err != nil {
926-
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, err.Error())
926+
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, "%s", err.Error())
927927
conditions.Set(scope.Config, metav1.Condition{
928928
Type: bootstrapv1.KubeadmConfigDataSecretAvailableCondition,
929929
Status: metav1.ConditionFalse,
@@ -936,7 +936,7 @@ func (r *KubeadmConfigReconciler) joinControlplane(ctx context.Context, scope *S
936936
if discoveryFile := scope.Config.Spec.JoinConfiguration.Discovery.File; discoveryFile != nil && discoveryFile.KubeConfig != nil {
937937
kubeconfig, err := r.resolveDiscoveryKubeConfig(discoveryFile)
938938
if err != nil {
939-
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, err.Error())
939+
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.DataSecretGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, "%s", err.Error())
940940
conditions.Set(scope.Config, metav1.Condition{
941941
Type: bootstrapv1.KubeadmConfigDataSecretAvailableCondition,
942942
Status: metav1.ConditionFalse,

‎cloudbuild-nightly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ options:
55
substitution_option: ALLOW_LOOSE
66
machineType: 'E2_HIGHCPU_8'
77
steps:
8-
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:4e830b673791d5595719bc6c4ca62dce3746b4e20d749e45004254bc6ef0a140' # v20250116-2a05ea7e3d
8+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:63840f133e0dfeea0af9ef391210da7fab9d2676172e2967fccab0cd6110c4e7' # v20250513-9264efb079
99
entrypoint: make
1010
env:
1111
- DOCKER_CLI_EXPERIMENTAL=enabled

‎cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ options:
55
substitution_option: ALLOW_LOOSE
66
machineType: 'E2_HIGHCPU_8'
77
steps:
8-
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:4e830b673791d5595719bc6c4ca62dce3746b4e20d749e45004254bc6ef0a140' # v20250116-2a05ea7e3d
8+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:63840f133e0dfeea0af9ef391210da7fab9d2676172e2967fccab0cd6110c4e7' # v20250513-9264efb079
99
entrypoint: make
1010
env:
1111
- DOCKER_CLI_EXPERIMENTAL=enabled

‎controlplane/kubeadm/internal/controllers/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileClusterCertificates(ctx context
548548
certificates := secret.NewCertificatesForInitialControlPlane(config.ClusterConfiguration)
549549
controllerRef := metav1.NewControllerRef(controlPlane.KCP, controlplanev1.GroupVersion.WithKind(kubeadmControlPlaneKind))
550550
if err := certificates.LookupOrGenerateCached(ctx, r.SecretCachingClient, r.Client, util.ObjectKey(controlPlane.Cluster), *controllerRef); err != nil {
551-
v1beta1conditions.MarkFalse(controlPlane.KCP, controlplanev1.CertificatesAvailableV1Beta1Condition, controlplanev1.CertificatesGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, err.Error())
551+
v1beta1conditions.MarkFalse(controlPlane.KCP, controlplanev1.CertificatesAvailableV1Beta1Condition, controlplanev1.CertificatesGenerationFailedV1Beta1Reason, clusterv1.ConditionSeverityWarning, "%s", err.Error())
552552

553553
conditions.Set(controlPlane.KCP, metav1.Condition{
554554
Type: controlplanev1.KubeadmControlPlaneCertificatesAvailableCondition,

‎controlplane/kubeadm/internal/controllers/helpers.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ func (r *KubeadmControlPlaneReconciler) cloneConfigsAndGenerateMachine(ctx conte
218218
if err != nil {
219219
// Safe to return early here since no resources have been created yet.
220220
v1beta1conditions.MarkFalse(kcp, controlplanev1.MachinesCreatedV1Beta1Condition, controlplanev1.InfrastructureTemplateCloningFailedV1Beta1Reason,
221-
clusterv1.ConditionSeverityError, err.Error())
221+
clusterv1.ConditionSeverityError, "%s", err.Error())
222222
return nil, errors.Wrap(err, "failed to clone infrastructure template")
223223
}
224224
machine.Spec.InfrastructureRef = *infraRef
@@ -227,7 +227,7 @@ func (r *KubeadmControlPlaneReconciler) cloneConfigsAndGenerateMachine(ctx conte
227227
bootstrapRef, err := r.generateKubeadmConfig(ctx, kcp, cluster, bootstrapSpec, machine.Name)
228228
if err != nil {
229229
v1beta1conditions.MarkFalse(kcp, controlplanev1.MachinesCreatedV1Beta1Condition, controlplanev1.BootstrapTemplateCloningFailedV1Beta1Reason,
230-
clusterv1.ConditionSeverityError, err.Error())
230+
clusterv1.ConditionSeverityError, "%s", err.Error())
231231
errs = append(errs, errors.Wrap(err, "failed to generate bootstrap config"))
232232
}
233233

@@ -237,7 +237,7 @@ func (r *KubeadmControlPlaneReconciler) cloneConfigsAndGenerateMachine(ctx conte
237237

238238
if err := r.createMachine(ctx, kcp, machine); err != nil {
239239
v1beta1conditions.MarkFalse(kcp, controlplanev1.MachinesCreatedV1Beta1Condition, controlplanev1.MachineGenerationFailedV1Beta1Reason,
240-
clusterv1.ConditionSeverityError, err.Error())
240+
clusterv1.ConditionSeverityError, "%s", err.Error())
241241
errs = append(errs, errors.Wrap(err, "failed to create Machine"))
242242
}
243243
}

‎controlplane/kubeadm/internal/controllers/remediation.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.C
182182
clusterv1.MachineOwnerRemediatedV1Beta1Condition,
183183
clusterv1.WaitingForRemediationV1Beta1Reason,
184184
clusterv1.ConditionSeverityWarning,
185-
message)
185+
"%s", message)
186186

187187
conditions.Set(machineToBeRemediated, metav1.Condition{
188188
Type: clusterv1.MachineOwnerRemediatedCondition,
@@ -259,7 +259,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.C
259259
if controlPlane.IsEtcdManaged() {
260260
canSafelyRemediate, err := r.canSafelyRemoveEtcdMember(ctx, controlPlane, machineToBeRemediated)
261261
if err != nil {
262-
v1beta1conditions.MarkFalse(machineToBeRemediated, clusterv1.MachineOwnerRemediatedV1Beta1Condition, clusterv1.RemediationFailedV1Beta1Reason, clusterv1.ConditionSeverityError, err.Error())
262+
v1beta1conditions.MarkFalse(machineToBeRemediated, clusterv1.MachineOwnerRemediatedV1Beta1Condition, clusterv1.RemediationFailedV1Beta1Reason, clusterv1.ConditionSeverityError, "%s", err.Error())
263263

264264
conditions.Set(machineToBeRemediated, metav1.Condition{
265265
Type: clusterv1.MachineOwnerRemediatedCondition,
@@ -314,7 +314,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.C
314314
}
315315
if err := workloadCluster.ForwardEtcdLeadership(ctx, machineToBeRemediated, etcdLeaderCandidate); err != nil {
316316
log.Error(err, "Failed to move etcd leadership to candidate machine", "candidate", klog.KObj(etcdLeaderCandidate))
317-
v1beta1conditions.MarkFalse(machineToBeRemediated, clusterv1.MachineOwnerRemediatedV1Beta1Condition, clusterv1.RemediationFailedV1Beta1Reason, clusterv1.ConditionSeverityError, err.Error())
317+
v1beta1conditions.MarkFalse(machineToBeRemediated, clusterv1.MachineOwnerRemediatedV1Beta1Condition, clusterv1.RemediationFailedV1Beta1Reason, clusterv1.ConditionSeverityError, "%s", err.Error())
318318

319319
conditions.Set(machineToBeRemediated, metav1.Condition{
320320
Type: clusterv1.MachineOwnerRemediatedCondition,
@@ -331,7 +331,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.C
331331

332332
// Delete the machine
333333
if err := r.Client.Delete(ctx, machineToBeRemediated); err != nil {
334-
v1beta1conditions.MarkFalse(machineToBeRemediated, clusterv1.MachineOwnerRemediatedV1Beta1Condition, clusterv1.RemediationFailedV1Beta1Reason, clusterv1.ConditionSeverityError, err.Error())
334+
v1beta1conditions.MarkFalse(machineToBeRemediated, clusterv1.MachineOwnerRemediatedV1Beta1Condition, clusterv1.RemediationFailedV1Beta1Reason, clusterv1.ConditionSeverityError, "%s", err.Error())
335335

336336
conditions.Set(machineToBeRemediated, metav1.Condition{
337337
Type: clusterv1.MachineOwnerRemediatedCondition,

0 commit comments

Comments
 (0)