Skip to content

Commit d05a51f

Browse files
committed
Handle ignition ref nil safe
1 parent a0e74ff commit d05a51f

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

internal/controller/serverbootconfiguration_pxe_controller.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@ func (r *ServerBootConfigurationPXEReconciler) reconcile(ctx context.Context, lo
113113
}
114114
log.V(1).Info("Extracted OS image layer details")
115115

116-
ignitionRefName := config.Spec.IgnitionSecretRef.Name
116+
ignitionRef := config.Spec.IgnitionSecretRef
117117

118118
if r.EnforceServerNameasHostname {
119119
modifiedIgnitionName, err := r.mutateAndApplyServerNameInIgnition(ctx, config)
120120
if err != nil {
121121
return ctrl.Result{}, fmt.Errorf("failed to mutate server name to hostname in ignition: %w", err)
122122
}
123-
ignitionRefName = modifiedIgnitionName
123+
ignitionRef = &corev1.LocalObjectReference{Name: modifiedIgnitionName}
124124
}
125125

126126
ipxeConfig := &v1alpha1.IPXEBootConfig{
@@ -141,9 +141,7 @@ func (r *ServerBootConfigurationPXEReconciler) reconcile(ctx context.Context, lo
141141
},
142142
}
143143
if config.Spec.IgnitionSecretRef != nil {
144-
ipxeConfig.Spec.IgnitionSecretRef = &corev1.LocalObjectReference{
145-
Name: ignitionRefName,
146-
}
144+
ipxeConfig.Spec.IgnitionSecretRef = ignitionRef
147145
}
148146

149147
if err := controllerutil.SetControllerReference(config, ipxeConfig, r.Scheme); err != nil {

0 commit comments

Comments
 (0)