From 2b13c74af04023d2afad114f5912507d0b8c16dd Mon Sep 17 00:00:00 2001 From: Andreas Sommer Date: Mon, 23 Oct 2023 16:03:38 +0200 Subject: [PATCH] Fix launch template reconciliation if bootstrap data secret cannot be read --- pkg/cloud/scope/machinepool.go | 2 +- pkg/cloud/services/ec2/launchtemplate.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/cloud/scope/machinepool.go b/pkg/cloud/scope/machinepool.go index 9a6f9c7368..b8636e00da 100644 --- a/pkg/cloud/scope/machinepool.go +++ b/pkg/cloud/scope/machinepool.go @@ -167,7 +167,7 @@ func (m *MachinePoolScope) getBootstrapData() ([]byte, string, error) { key := types.NamespacedName{Namespace: m.Namespace(), Name: *m.MachinePool.Spec.Template.Spec.Bootstrap.DataSecretName} if err := m.Client.Get(context.TODO(), key, secret); err != nil { - return nil, "", errors.Wrapf(err, "failed to retrieve bootstrap data secret for AWSMachine %s/%s", m.Namespace(), m.Name()) + return nil, "", errors.Wrapf(err, "failed to retrieve bootstrap data secret %s for AWSMachine %s/%s", key.Name, m.Namespace(), m.Name()) } value, ok := secret.Data["value"] diff --git a/pkg/cloud/services/ec2/launchtemplate.go b/pkg/cloud/services/ec2/launchtemplate.go index d14065f13e..8724b4bc86 100644 --- a/pkg/cloud/services/ec2/launchtemplate.go +++ b/pkg/cloud/services/ec2/launchtemplate.go @@ -59,6 +59,7 @@ func (s *Service) ReconcileLaunchTemplate( bootstrapData, err := scope.GetRawBootstrapData() if err != nil { record.Eventf(scope.GetMachinePool(), corev1.EventTypeWarning, "FailedGetBootstrapData", err.Error()) + return err } bootstrapDataHash := userdata.ComputeHash(bootstrapData)