Fix panics when joining worker nodes without an initConfiguration (#54)

canonical · Nov 30, 2022 · 7b08d3e · 7b08d3e
1 parent 2e865a6
commit 7b08d3e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/controllers/microk8sconfig_controller.go b/controllers/microk8sconfig_controller.go
@@ -480,14 +480,15 @@ func (r *MicroK8sConfigReconciler) handleJoiningWorkerNode(ctx context.Context,
 		KubernetesVersion: *machine.Spec.Version,
 		ClusterAgentPort:  portOfNodeToConnectTo,
 		JoinNodeIP:        ipOfNodeToConnectTo,
-		ExtraWriteFiles:   cloudinit.WriteFilesFromAPI(microk8sConfig.Spec.InitConfiguration.ExtraWriteFiles),
-		ExtraKubeletArgs:  microk8sConfig.Spec.InitConfiguration.ExtraKubeletArgs,
 	}
 
 	if c := microk8sConfig.Spec.InitConfiguration; c != nil {
 		workerInput.ContainerdHTTPSProxy = c.HTTPSProxy
 		workerInput.ContainerdHTTPProxy = c.HTTPProxy
 		workerInput.ContainerdNoProxy = c.NoProxy
+
+		workerInput.ExtraKubeletArgs = c.ExtraKubeletArgs
+		workerInput.ExtraWriteFiles = cloudinit.WriteFilesFromAPI(c.ExtraWriteFiles)
 	}
 	bootstrapInitData, err := cloudinit.NewJoinWorker(workerInput)
 	if err != nil {