Skip to content

Commit e7d72f7

Browse files
authored
Merge pull request #4855 from chymy/fix-nullpoint
🐛 Fix potential nil pointer issue
2 parents 686aef6 + b7c01e5 commit e7d72f7

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

controlplane/kubeadm/internal/filters.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,15 @@ func cleanupConfigFields(kcpConfig *bootstrapv1.KubeadmConfigSpec, machineConfig
213213

214214
// If KCP JoinConfiguration.ControlPlane is not present, set machine join configuration to nil (nothing can trigger rollout here).
215215
// NOTE: this is required because CABPK applies an empty joinConfiguration.ControlPlane in case no one is provided.
216-
if kcpConfig.JoinConfiguration != nil && kcpConfig.JoinConfiguration.ControlPlane == nil {
216+
if kcpConfig.JoinConfiguration != nil && kcpConfig.JoinConfiguration.ControlPlane == nil &&
217+
machineConfig.Spec.JoinConfiguration != nil {
217218
machineConfig.Spec.JoinConfiguration.ControlPlane = nil
218219
}
219220

220221
// If KCP's join NodeRegistration is empty, set machine's node registration to empty as no changes should trigger rollout.
221222
emptyNodeRegistration := bootstrapv1.NodeRegistrationOptions{}
222-
if kcpConfig.JoinConfiguration != nil && reflect.DeepEqual(kcpConfig.JoinConfiguration.NodeRegistration, emptyNodeRegistration) {
223+
if kcpConfig.JoinConfiguration != nil && reflect.DeepEqual(kcpConfig.JoinConfiguration.NodeRegistration, emptyNodeRegistration) &&
224+
machineConfig.Spec.JoinConfiguration != nil {
223225
machineConfig.Spec.JoinConfiguration.NodeRegistration = emptyNodeRegistration
224226
}
225227

0 commit comments

Comments
 (0)