🌱 Align cluster-template.yaml and cluster-template-machinepool.yaml, use external cloud controller and CSI

[AndiDog]

What type of PR is this?

/kind support

What this PR does / why we need it:

Ensure the two templates mostly only differ in AWSMachineDeployment vs. AWSMachinePool (easier to review via diff -U0 templates/{cluster-template.yaml,cluster-template-machinepool.yaml}).

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):

n/a

Checklist:

• squashed commits
• includes documentation
• includes emojis
• adds unit tests
• adds or updates e2e tests

Release note:

Templates: align `cluster-template.yaml` and `cluster-template-machinepool.yaml`, use external cloud controller and CSI

[fiunchinho]

/lgtm

[richardcase]

/cherrypick release-2.6

[k8s-infra-cherrypick-robot]

@richardcase: once the present PR merges, I will cherry-pick it on top of release-2.6 in a new PR and assign it to you.

In response to this:

/cherrypick release-2.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[richardcase]

/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: richardcase

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 [richardcase]

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

[k8s-infra-cherrypick-robot]

@richardcase: #5136 failed to apply on top of branch "release-2.6":

Applying: Align `cluster-template.yaml` and `cluster-template-machinepool.yaml`, use external cloud controller and CSI
Using index info to reconstruct a base tree...
M	templates/cluster-template-external-cloud-provider.yaml
M	templates/cluster-template-flatcar.yaml
M	templates/cluster-template.yaml
Falling back to patching base and 3-way merge...
Auto-merging templates/cluster-template.yaml
Auto-merging templates/cluster-template-flatcar.yaml
CONFLICT (content): Merge conflict in templates/cluster-template-flatcar.yaml
CONFLICT (modify/delete): templates/cluster-template-external-cloud-provider.yaml deleted in Align `cluster-template.yaml` and `cluster-template-machinepool.yaml`, use external cloud controller and CSI and modified in HEAD. Version HEAD of templates/cluster-template-external-cloud-provider.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Align `cluster-template.yaml` and `cluster-template-machinepool.yaml`, use external cloud controller and CSI
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-2.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.