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

Merge pull request #74400 from rojkov/kubeadm-refactor-etcdClient 

kubeadm: simplify creating etcdClient
pull/564/head
Kubernetes Prow Robot 2019-02-22 19:19:16 -08:00 committed by GitHub
parent b77e4e2417 926d9012a4
commit 65cdd7e74a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/kubeadm/app/cmd/upgrade/plan.go
View File

@ -98,22 +98,17 @@ func runPlan(flags *planFlags, userVersion string) error {
// external etcd vs static pod etcd // external etcd vs static pod etcd
isExternalEtcd := cfg.Etcd.External != nil isExternalEtcd := cfg.Etcd.External != nil
if isExternalEtcd { if isExternalEtcd {
client, err := etcdutil.New( etcdClient, err = etcdutil.New(
cfg.Etcd.External.Endpoints, cfg.Etcd.External.Endpoints,
cfg.Etcd.External.CAFile, cfg.Etcd.External.CAFile,
cfg.Etcd.External.CertFile, cfg.Etcd.External.CertFile,
cfg.Etcd.External.KeyFile) cfg.Etcd.External.KeyFile)
if err != nil {
return err
}
etcdClient = client
} else { } else {
// Connects to local/stacked etcd existing in the cluster // Connects to local/stacked etcd existing in the cluster
client, err := etcdutil.NewFromCluster(client, cfg.CertificatesDir) etcdClient, err = etcdutil.NewFromCluster(client, cfg.CertificatesDir)
if err != nil { }
return err if err != nil {
} return err
etcdClient = client
} }
// Compute which upgrade possibilities there are // Compute which upgrade possibilities there are