1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-12 21:24:00 +00:00

Always set ETCD_UNSUPPORTED_ARCH

This commit is contained in:
loganhz
2019-03-08 14:02:44 -07:00
committed by Darren Shepherd
parent 3fd4c2eb91
commit efab83d804

View File

@@ -702,7 +702,7 @@ func (c *Cluster) BuildSidecarProcess() v3.Process {
func (c *Cluster) BuildEtcdProcess(host *hosts.Host, etcdHosts []*hosts.Host, prefixPath string) v3.Process {
nodeName := pki.GetEtcdCrtName(host.InternalAddress)
initCluster := ""
architecture := ""
architecture := "amd64"
if len(etcdHosts) == 0 {
initCluster = services.GetEtcdInitialCluster(c.EtcdHosts)
if len(c.EtcdHosts) > 0 {
@@ -775,10 +775,7 @@ func (c *Cluster) BuildEtcdProcess(host *hosts.Host, etcdHosts []*hosts.Host, pr
Env = append(Env, fmt.Sprintf("ETCDCTL_CACERT=%s", pki.GetCertPath(pki.CACertName)))
Env = append(Env, fmt.Sprintf("ETCDCTL_CERT=%s", pki.GetCertPath(nodeName)))
Env = append(Env, fmt.Sprintf("ETCDCTL_KEY=%s", pki.GetKeyPath(nodeName)))
if architecture == "aarch64" || architecture == "arm64" {
Env = append(Env, "ETCD_UNSUPPORTED_ARCH=arm64")
}
Env = append(Env, fmt.Sprintf("ETCD_UNSUPPORTED_ARCH=%s", architecture))
Env = append(Env, c.Services.Etcd.ExtraEnv...)