Fix kubernetes master roles defaults

[dannyk81]

As I was trying to deploy Kubespray, I noticed that kubernetes/master defaults directory had a main sub-directory where main.yml and kube-proxy.yml were stored, so Ansible would not pick them up and I got a bunch of variable undefined errors.

Did two things:

1. move roles/kubernetes/master/defaults/main/main.yml to roles/kubernetes/master/defaults/main.yml
2. merged roles/kubernetes/master/defaults/main/kube-proxy.yml into roles/kubernetes/master/defaults/main.yml

(2) above was needed, since this separate defaults file is never loaded, also causing variable undefined errors.

I'm using Ansible 2.6.0.

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dannyk81
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: woopstar

If they are not already assigned, you can assign the PR to them by writing /assign @woopstar in a comment when ready.

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

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[dannyk81]

/assign @woopstar

[chadswen]

This is actually supported (and encouraged for large defaults files) since ansible 2.6. PR

Perhaps there's an issue with the feature in 2.6.0? Can you try a more recent patch version of 2.6.x?

[dannyk81]

@chadswen sure, let me upgrade to 2.6.12 and try without this.

[dannyk81]

@chadswen indeed, with 2.6.12 this works as-is.

Perhaps worth updating the requirements to state that >2.6.12 is needed (perhaps eariler... not sure), for sure this is broken with 2.6.0