Fixup kubelet and controlPlaneKubelet config building

[justinsb]

We need to differentiate between the version of the control plane
and the version of the nodes.

[hakman]

/retest

[hakman]

/test all

[hakman]

/retest

[justinsb]

/retest

Both on cilium, so could be real, but worth a retest

[hakman]

/retest

Both on cilium, so could be real, but worth a retest

eni always fails on those 2 tests

[hakman]

/override pull-kops-e2e-cni-cilium-eni

[k8s-ci-robot]

@hakman: Overrode contexts on behalf of hakman: pull-kops-e2e-cni-cilium-eni

In response to this:

/override pull-kops-e2e-cni-cilium-eni

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.

[hakman]

/override pull-kops-e2e-cni-cilium-etcd

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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

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

[k8s-ci-robot]

@hakman: Overrode contexts on behalf of hakman: pull-kops-e2e-cni-cilium-etcd

In response to this:

/override pull-kops-e2e-cni-cilium-etcd

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.