rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-06-26 23:40:06 +00:00
Code Issues Releases Wiki Activity

Change entrypoint to fix multiple mount problem

Browse Source
This commit is contained in:
moelsayed 2018-08-02 02:33:46 +02:00
parent a1a9ba531b
commit 010a7977ff
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/plan.go
View File

@ -102,7 +102,7 @@ func (c *Cluster) BuildKubeAPIProcess(prefixPath string) v3.Process {
} }
Command := []string{ Command := []string{
"/opt/rke/entrypoint.sh", "/opt/rke-tools/entrypoint.sh",
"kube-apiserver", "kube-apiserver",
} }
@ -210,7 +210,7 @@ func (c *Cluster) BuildKubeAPIProcess(prefixPath string) v3.Process {
func (c *Cluster) BuildKubeControllerProcess(prefixPath string) v3.Process { func (c *Cluster) BuildKubeControllerProcess(prefixPath string) v3.Process {
Command := []string{ Command := []string{
"/opt/rke/entrypoint.sh", "/opt/rke-tools/entrypoint.sh",
"kube-controller-manager", "kube-controller-manager",
} }
@ -297,7 +297,7 @@ func (c *Cluster) BuildKubeControllerProcess(prefixPath string) v3.Process {
func (c *Cluster) BuildKubeletProcess(host *hosts.Host, prefixPath string) v3.Process { func (c *Cluster) BuildKubeletProcess(host *hosts.Host, prefixPath string) v3.Process {
Command := []string{ Command := []string{
"/opt/rke/entrypoint.sh", "/opt/rke-tools/entrypoint.sh",
"kubelet", "kubelet",
} }
@ -415,7 +415,7 @@ func (c *Cluster) BuildKubeletProcess(host *hosts.Host, prefixPath string) v3.Pr
func (c *Cluster) BuildKubeProxyProcess(host *hosts.Host, prefixPath string) v3.Process { func (c *Cluster) BuildKubeProxyProcess(host *hosts.Host, prefixPath string) v3.Process {
Command := []string{ Command := []string{
"/opt/rke/entrypoint.sh", "/opt/rke-tools/entrypoint.sh",
"kube-proxy", "kube-proxy",
} }
@ -508,7 +508,7 @@ func (c *Cluster) BuildProxyProcess() v3.Process {
func (c *Cluster) BuildSchedulerProcess(prefixPath string) v3.Process { func (c *Cluster) BuildSchedulerProcess(prefixPath string) v3.Process {
Command := []string{ Command := []string{
"/opt/rke/entrypoint.sh", "/opt/rke-tools/entrypoint.sh",
"kube-scheduler", "kube-scheduler",
} }

2
services/etcd.go
View File

@ -226,7 +226,7 @@ func RunEtcdSnapshotSave(ctx context.Context, etcdHost *hosts.Host, prsMap map[s
log.Infof(ctx, "[etcd] Saving snapshot [%s] on host [%s]", name, etcdHost.Address) log.Infof(ctx, "[etcd] Saving snapshot [%s] on host [%s]", name, etcdHost.Address)
imageCfg := &container.Config{ imageCfg := &container.Config{
Cmd: []string{ Cmd: []string{
"/opt/rke/rke-etcd-backup", "/opt/rke-tools/rke-etcd-backup",
"rolling-backup", "rolling-backup",
"--cacert", pki.GetCertPath(pki.CACertName), "--cacert", pki.GetCertPath(pki.CACertName),
"--cert", pki.GetCertPath(pki.KubeNodeCertName), "--cert", pki.GetCertPath(pki.KubeNodeCertName),

2
templates/weave.go
View File

@ -82,7 +82,7 @@ items:
mountPath: /run/xtables.lock mountPath: /run/xtables.lock
- name: weave-loopback - name: weave-loopback
command: command:
- /opt/rke/weave-loopback-cni.sh - /opt/rke-tools/weave-loopback-cni.sh
image: {{.WeaveLoopbackImage}} image: {{.WeaveLoopbackImage}}
securityContext: securityContext:
privileged: true privileged: true