Fix the kube-flannel.yaml in order to work #518
Conversation
|
@luxas I was trying to avoid the situation where external projects rely on this "sample" config file. I don't believe that the flannel project is the right place for the canonical version of this file. See my comments #483 (comment) and #483 (comment) |
| @@ -18,7 +18,7 @@ data: | |||
| } | |||
| net-conf.json: | | |||
| { | |||
| "Network": "10.244.0.0/16", | |||
| "Network": "10.2.0.0/16", | |||
| image: busybox | ||
| command: [ "/bin/sh", "-c", "set -e -x; TMP=/etc/cni/net.d/.tmp-flannel-cfg; cp /etc/kube-flannel/cni-conf.json ${TMP}; mv ${TMP} /etc/cni/net.d/10-flannel.conf; while :; do sleep 3600; done" ] | ||
| image: quay.io/coreos/flannel-git:v0.6.1-28-g5dde68d-amd64 | ||
| command: [ "/bin/sh", "-c", "set -e -x; cp -f /etc/kube-flannel/cni-conf.json /etc/cni/net.d/10-flannel.conf; while true; do sleep 3600; done" ] |
luxas
force-pushed
the
update-daemonset
branch
from
1eb9a35 to
06b4770
Compare
|
Okay, the only thing I want here is that this manifest will be multiarch, so I can easily can run kubectl apply on it. Please merge this as soon as possible. I removed the strange parts from this PR now If you want to create a separate project for kubeadm integration, feel free to. At least, please merge and I'll add this to http://kubernetes.io/docs/admin/addons/, it will be good for users. |
|
ping @tomdee |
|
@luxas I still don't really understand this change. Do you need the version pinning stuff or just the extra label? |
|
a) We need somewhere to point users to regarding flannel and kubeadm See kubernetes/kubernetes#30356 for reference Thanks, and please let this though! |
@tomdee This makes it possible to run this flannel daemonset on other architectures as well, thanks!
Just
curl -sSL <url> | sed "s/amd64/arm/" | kubectl apply -f -and you're done!Can you merge this please so we can use it with kubeadm please?