github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix etcd connect for join --control-plane

pull/58/head
fabriziopandini 2018-11-22 17:17:27 +01:00
parent b6a0718858
commit 8a53031b4e
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
cmd/kubeadm/app/util/etcd/etcd.go
View File

@ -126,38 +126,41 @@ func NewFromCluster(client clientset.Interface, certificatesDir string) (*Client
// The first case should be dropped in v1.14 when support for v1.12 clusters can be removed from the codebase. // The first case should be dropped in v1.14 when support for v1.12 clusters can be removed from the codebase.
// Detect which type of etcd we are dealing with // Detect which type of etcd we are dealing with
// Please note that this test can be executed only on master nodes during upgrades;
// For nodes where we are joining a new control plane node instead we should tolerate that the etcd manifest does not
// exists and try to connect to etcd using API server advertise address; as described above this will lead to a know isse
// for cluster created with v1.12, but a documented workaround will be provided
oldManifest := false oldManifest := false
klog.V(1).Infoln("checking etcd manifest") klog.V(1).Infoln("checking etcd manifest")
etcdManifestFile := constants.GetStaticPodFilepath(constants.Etcd, constants.GetStaticPodDirectory()) etcdManifestFile := constants.GetStaticPodFilepath(constants.Etcd, constants.GetStaticPodDirectory())
etcdPod, err := staticpod.ReadStaticPodFromDisk(etcdManifestFile) etcdPod, err := staticpod.ReadStaticPodFromDisk(etcdManifestFile)
if err != nil { if err == nil {
return nil, errors.Wrap(err, "error reading etcd manifest file") etcdContainer := etcdPod.Spec.Containers[0]
} for _, arg := range etcdContainer.Command {
etcdContainer := etcdPod.Spec.Containers[0] if arg == "--listen-client-urls=https://127.0.0.1:2379" {
for _, arg := range etcdContainer.Command { klog.V(1).Infoln("etcd manifest created by kubeadm v1.12")
if arg == "--listen-client-urls=https://127.0.0.1:2379" { oldManifest = true
klog.V(1).Infoln("etcd manifest created by kubeadm v1.12") }
oldManifest = true
}
}
// if etcd is listening on localhost only
if oldManifest == true {
// etcd cluster has a single member "by design"
endpoints := []string{fmt.Sprintf("localhost:%d", constants.EtcdListenClientPort)}
etcdClient, err := New(
endpoints,
filepath.Join(certificatesDir, constants.EtcdCACertName),
filepath.Join(certificatesDir, constants.EtcdHealthcheckClientCertName),
filepath.Join(certificatesDir, constants.EtcdHealthcheckClientKeyName),
)
if err != nil {
return nil, errors.Wrapf(err, "error creating etcd client for %v endpoint", endpoints)
} }
return etcdClient, nil // if etcd is listening on localhost only
if oldManifest == true {
// etcd cluster has a single member "by design"
endpoints := []string{fmt.Sprintf("localhost:%d", constants.EtcdListenClientPort)}
etcdClient, err := New(
endpoints,
filepath.Join(certificatesDir, constants.EtcdCACertName),
filepath.Join(certificatesDir, constants.EtcdHealthcheckClientCertName),
filepath.Join(certificatesDir, constants.EtcdHealthcheckClientKeyName),
)
if err != nil {
return nil, errors.Wrapf(err, "error creating etcd client for %v endpoint", endpoints)
}
return etcdClient, nil
}
} }
// etcd is listening on localhost and API server advertise address, and // etcd is listening on localhost and API server advertise address, and