Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit d809ac3

Browse files
authored
Merge pull request #96 from ykakarap/additionaluserdatafiles_cloudinit
use AdditionalUserDataFiles in bootstrap data generation
2 parents 8d536b6 + dee83ef commit d809ac3

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

controllers/kubeadmconfig_controller.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,9 @@ func (r *KubeadmConfigReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
196196
certificates, _ := r.getCertificates()
197197

198198
cloudInitData, err := cloudinit.NewInitControlPlane(&cloudinit.ControlPlaneInput{
199+
BaseUserData: cloudinit.BaseUserData{
200+
AdditionalFiles: config.Spec.AdditionalUserDataFiles,
201+
},
199202
InitConfiguration: string(initdata),
200203
ClusterConfiguration: string(clusterdata),
201204
Certificates: certificates,
@@ -257,6 +260,9 @@ func (r *KubeadmConfigReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
257260
joinData, err := cloudinit.NewJoinControlPlane(&cloudinit.ControlPlaneJoinInput{
258261
JoinConfiguration: string(joinBytes),
259262
Certificates: certificates,
263+
BaseUserData: cloudinit.BaseUserData{
264+
AdditionalFiles: config.Spec.AdditionalUserDataFiles,
265+
},
260266
})
261267
if err != nil {
262268
log.Error(err, "failed to create a control plane join configuration")
@@ -273,6 +279,9 @@ func (r *KubeadmConfigReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
273279
}
274280

275281
joinData, err := cloudinit.NewNode(&cloudinit.NodeInput{
282+
BaseUserData: cloudinit.BaseUserData{
283+
AdditionalFiles: config.Spec.AdditionalUserDataFiles,
284+
},
276285
JoinConfiguration: string(joinBytes),
277286
})
278287
if err != nil {

0 commit comments

Comments
 (0)