refactor builder for etcd/confd
refactor builder for etcd/confd