Reconcile top most level objects

fabriziopandini commented 5 years ago

What this PR does / why we need it: A user now has several places to define some settings. One the cluster/machine object and one on the kubeadm config object.

Which issue(s) this PR fixes: Fixes # https://github.com/kubernetes-sigs/cluster-api-bootstrap-provider-kubeadm/issues/78

Special notes for your reviewer: This PR handle conflicts in the same ways CABPK is already handling similar situations for bootstrap tokens, certificates, controlplaneEnpoint:

If a value is defined in the KubeadmConfig, such value is respected, otherwise, values from topmost level objects are used and the override is tracked in logs.

Release note:

NONE

/assign @detiber @chuckha

k8s-ci-robot commented 5 years ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/kubernetes-sigs/cluster-api-bootstrap-provider-kubeadm/blob/master/OWNERS)~~ [fabriziopandini] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment

vincepri commented 5 years ago

/lgtm

kubernetes-retired / cluster-api-bootstrap-provider-kubeadm

Reconcile top most level objects #141