15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-26 01:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update etcd to v3.4.13 

Signed-off-by: Forest-L <lilin@yunify.com>
This commit is contained in:
Forest-L 2020-10-12 12:57:56 +08:00
parent a92da38bc9
commit 1a47715137
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/v1alpha1/default.go
View File

@ -33,7 +33,7 @@ const (
DefaultKubeImageRepo = "kubesphere"
DefaultClusterName = "cluster.local"
DefaultArch = "amd64"
DefaultEtcdVersion = "v3.3.12"
DefaultEtcdVersion = "v3.4.13"
DefaultEtcdPort = "2379"
DefaultKubeVersion = "v1.17.9"
DefaultCalicoVersion = "v3.15.1"

2
pkg/cluster/etcd/etcd.go
View File

@ -164,7 +164,7 @@ func generateEtcdService(mgr *manager.Manager, _ *kubekeyapiv1alpha1.HostCfg) er
return errors.Wrap(errors.WithStack(err3), "Failed to generate etcd bin")
}
getEtcdCtlCmd := fmt.Sprintf("docker run --rm -v /usr/local/bin:/systembindir %s /bin/cp /usr/local/bin/etcdctl /systembindir/etcdctl", preinstall.GetImage(mgr, "etcd").ImageName())
getEtcdCtlCmd := fmt.Sprintf("docker run --rm -v /usr/local/bin:/systembindir %s /bin/cp -f /usr/local/bin/etcdctl /systembindir/etcdctl", preinstall.GetImage(mgr, "etcd").ImageName())
_, err4 := mgr.Runner.ExecuteCmd(fmt.Sprintf("sudo -E /bin/sh -c \"%s\"", getEtcdCtlCmd), 2, false)
if err4 != nil {
return errors.Wrap(errors.WithStack(err4), "Failed to get etcdctl")

1
pkg/cluster/etcd/tmpl/etcd.go
View File

@ -63,6 +63,7 @@ ETCD_INITIAL_CLUSTER_TOKEN=k8s_etcd
ETCD_LISTEN_PEER_URLS=https://{{ .Ip }}:2380
ETCD_NAME={{ .Name }}
ETCD_PROXY=off
ETCD_ENABLE_V2=true
ETCD_INITIAL_CLUSTER={{ .peerAddresses }}
ETCD_AUTO_COMPACTION_RETENTION=8
ETCD_SNAPSHOT_COUNT=10000