Merge pull request #509 from hongchaodeng/f

SelfHostedEtcd: get etcd service IP from APIServer

Author: xiang90

pkg/asset/asset.go

@@ -75,6 +75,7 @@ type Config struct {
 	APIServiceIP           net.IP
 	DNSServiceIP           net.IP
 	EtcdServiceIP          net.IP
+	EtcdServiceName        string
 	SelfHostKubelet        bool
 	SelfHostedEtcd         bool
 	CloudProvider          string

pkg/asset/internal/templates.go

@@ -884,7 +884,7 @@ spec:
 	EtcdSvcTemplate = []byte(`apiVersion: v1
 kind: Service
 metadata:
-  name: etcd-service
+  name: {{ .EtcdServiceName }}
   namespace: kube-system
 spec:
   selector:

pkg/asset/k8s.go

@@ -12,6 +12,9 @@ import (
 )
 
 const (
+	// The name of the k8s service that selects self-hosted etcd pods
+	EtcdServiceName = "etcd-service"
+
 	secretNamespace     = "kube-system"
 	secretAPIServerName = "kube-apiserver"
 	secretCMName        = "kube-controller-manager"
@@ -50,6 +53,7 @@ func newDynamicAssets(conf Config) Assets {
 		assets = append(assets, mustCreateAssetFromTemplate(AssetPathKubelet, internal.KubeletTemplate, conf))
 	}
 	if conf.SelfHostedEtcd {
+		conf.EtcdServiceName = EtcdServiceName
 		assets = append(assets,
 			mustCreateAssetFromTemplate(AssetPathEtcdOperator, internal.EtcdOperatorTemplate, conf),
 			mustCreateAssetFromTemplate(AssetPathEtcdSvc, internal.EtcdSvcTemplate, conf),

pkg/bootkube/bootkube.go

@@ -87,12 +87,7 @@ func (b *bootkube) Run() error {
 
 	if selfHostedEtcd {
 		UserOutput("Migrating to self-hosted etcd cluster...\n")
-		var etcdServiceIP string
-		etcdServiceIP, err = detectEtcdIP(b.assetDir)
-		if err != nil {
-			return err
-		}
-		if err = etcdutil.Migrate(kubeConfig, etcdServiceIP); err != nil {
+		if err = etcdutil.Migrate(kubeConfig); err != nil {
 			return err
 		}
 	}

pkg/bootkube/parse.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/kubernetes-incubator/bootkube/pkg/asset"
+
 	"github.com/coreos/etcd-operator/pkg/spec"
 	"github.com/coreos/etcd/clientv3"
 	"github.com/golang/glog"
@@ -29,7 +31,7 @@ var (
 	waitBootEtcdRemovedTime    = 300 * time.Second
 )
 
-func Migrate(kubeConfig clientcmd.ClientConfig, etcdServiceIP string) error {
+func Migrate(kubeConfig clientcmd.ClientConfig) error {
 	config, err := kubeConfig.ClientConfig()
 	if err != nil {
 		return fmt.Errorf("failed to create kube client config: %v", err)
@@ -50,7 +52,11 @@ func Migrate(kubeConfig clientcmd.ClientConfig, etcdServiceIP string) error {
 	if err != nil {
 		return err
 	}
-	glog.Infof("boot-etcd pod IP is: %s", ip)
+	etcdServiceIP, err := getServiceIP(kubecli, api.NamespaceSystem, asset.EtcdServiceName)
+	if err != nil {
+		return err
+	}
+	glog.Infof("boot-etcd pod IP is: %s, etcd-service IP is %s", ip, etcdServiceIP)
 
 	if err := createMigratedEtcdCluster(restClient, ip); err != nil {
 		return fmt.Errorf("failed to create etcd cluster for migration: %v", err)
@@ -178,6 +184,14 @@ func waitEtcdClusterRunning(restclient restclient.Interface) error {
 	return err
 }
 
+func getServiceIP(kubecli kubernetes.Interface, ns, svcName string) (string, error) {
+	svc, err := kubecli.CoreV1().Services(ns).Get(svcName, v1.GetOptions{})
+	if err != nil {
+		return "", err
+	}
+	return svc.Spec.ClusterIP, nil
+}
+
 func waitBootEtcdRemoved(etcdServiceIP string) error {
 	err := wait.Poll(10*time.Second, waitBootEtcdRemovedTime, func() (bool, error) {
 		cfg := clientv3.Config{