merge from upstream k8s configs for coreos
flannel plumbing