add patches for join/init/upgrade to the right place

[pacoxu]

The patches adding is inside if-else.

	if options.discoveryMode != TokenDiscovery && !(n == c.BootstrapControlPlane()) {

Move it out to fix the ci-kubernetes-e2e-kubeadm-kinder-patches-latest failure

Failure: https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/ci-kubernetes-e2e-kubeadm-kinder-patches-latest/1425293204315443200

See #2046 (comment)

[pacoxu]

The test failed for

time="10:24:39" level=debug msg="using kubeadm config version v1beta3"
time="10:24:39" level=debug msg="Preparing kubeadm config v1beta3"
time="10:24:39" level=debug msg="Preparing dockerPatch for kubeadm config v1beta3"
time="10:24:39" level=debug msg="Preparing automaticCopyCertsPatches for kubeadm config v1beta3"
time="10:24:39" level=debug msg="Preparing patches directory for kubeadm config v1beta3"
time="10:24:39" level=debug msg="generated config:\napiVersion: kubeadm.k8s.io/v1beta3\ncontrolPlane:\n certificateKey: "0123456789012345678901234567890123456789012345678901234567890123"\n localAPIEndpoint:\n advertiseAddress: 172.17.0.5\n bindPort: 6443\ndiscovery:\n bootstrapToken:\n apiServerEndpoint: 172.17.0.7:6443\n token: abcdef.0123456789abcdef\n unsafeSkipCAVerification: true\nkind: JoinConfiguration\nmetadata:\n name: config\nnodeRegistration:\n criSocket: /var/run/dockershim.sock\n kubeletExtraArgs:\n node-ip: 172.17.0.5\npatches:\n directory: /kinder/patches\n"
time="10:24:39" level=debug msg="Running: [docker cp /tmp/kinder-pull-control-plane-2-139598552 kinder-pull-control-plane-2:/kind/kubeadm.conf]"

kinder-pull-control-plane-2:$ kubeadm join --config=/kind/kubeadm.conf --ignore-preflight-errors=Swap,SystemVerification,FileContent--proc-sys-net-bridge-bridge-nf-call-iptables --v=6
time="10:24:39" level=debug msg="Running: [docker exec kinder-pull-control-plane-2 kubeadm join --config=/kind/kubeadm.conf --ignore-preflight-errors=Swap,SystemVerification,FileContent--proc-sys-net-bridge-bridge-nf-call-iptables --v=6]"
I0812 10:24:39.719713 897 join.go:413] [preflight] found NodeName empty; using OS hostname as NodeName
I0812 10:24:39.719767 897 joinconfiguration.go:76] loading configuration from "/kind/kubeadm.conf"
W0812 10:24:39.720788 897 strict.go:55] error unmarshaling configuration schema.GroupVersionKind{Group:"kubeadm.k8s.io", Version:"v1beta3", Kind:"JoinConfiguration"}: error unmarshaling JSON: while decoding JSON: json: unknown field "metadata"

[pacoxu]

time="11:47:56" level=debug msg="Running: [docker exec kinder-pull-control-plane-2 mkdir -p /kinder/patches]"
2021/08/12 11:47:56 open : no such file or directory

[pacoxu]

/cc neolit123

[neolit123]

Looks like github did to submit my last two comments.

[neolit123]

/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: neolit123, pacoxu

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:

• kinder/OWNERS [neolit123]

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