rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-17 15:40:07 +00:00
Code Issues Releases Wiki Activity

Make getProcessConfig public

Browse Source
This commit is contained in:
Darren Shepherd
2018-02-26 16:27:54 -07:00
parent 2a72d7057a
commit 8387af26f2
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/etcd.go
View File

@@ -23,7 +23,7 @@ const (
func RunEtcdPlane(ctx context.Context, etcdHosts []*hosts.Host, etcdProcessHostMap map[*hosts.Host]v3.Process, localConnDialerFactory hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry) error { func RunEtcdPlane(ctx context.Context, etcdHosts []*hosts.Host, etcdProcessHostMap map[*hosts.Host]v3.Process, localConnDialerFactory hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry) error {
log.Infof(ctx, "[%s] Building up Etcd Plane..", ETCDRole) log.Infof(ctx, "[%s] Building up Etcd Plane..", ETCDRole)
for _, host := range etcdHosts { for _, host := range etcdHosts {
imageCfg, hostCfg, _ := getProcessConfig(etcdProcessHostMap[host]) imageCfg, hostCfg, _ := GetProcessConfig(etcdProcessHostMap[host])
err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, EtcdContainerName, host.Address, ETCDRole, prsMap) err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, EtcdContainerName, host.Address, ETCDRole, prsMap)
if err != nil { if err != nil {
return err return err
@@ -127,7 +127,7 @@ func RemoveEtcdMember(ctx context.Context, etcdHost *hosts.Host, etcdHosts []*ho
func ReloadEtcdCluster(ctx context.Context, readyEtcdHosts []*hosts.Host, localConnDialerFactory hosts.DialerFactory, cert, key []byte, prsMap map[string]v3.PrivateRegistry, etcdProcessHostMap map[*hosts.Host]v3.Process) error { func ReloadEtcdCluster(ctx context.Context, readyEtcdHosts []*hosts.Host, localConnDialerFactory hosts.DialerFactory, cert, key []byte, prsMap map[string]v3.PrivateRegistry, etcdProcessHostMap map[*hosts.Host]v3.Process) error {
for host, process := range etcdProcessHostMap { for host, process := range etcdProcessHostMap {
imageCfg, hostCfg, _ := getProcessConfig(process) imageCfg, hostCfg, _ := GetProcessConfig(process)
if err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, EtcdContainerName, host.Address, ETCDRole, prsMap); err != nil { if err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, EtcdContainerName, host.Address, ETCDRole, prsMap); err != nil {
return err return err
} }
@@ -135,7 +135,7 @@ func ReloadEtcdCluster(ctx context.Context, readyEtcdHosts []*hosts.Host, localC
time.Sleep(10 * time.Second) time.Sleep(10 * time.Second)
var healthy bool var healthy bool
for _, host := range readyEtcdHosts { for _, host := range readyEtcdHosts {
_, _, healthCheckURL := getProcessConfig(etcdProcessHostMap[host]) _, _, healthCheckURL := GetProcessConfig(etcdProcessHostMap[host])
if healthy = isEtcdHealthy(ctx, localConnDialerFactory, host, cert, key, healthCheckURL); healthy { if healthy = isEtcdHealthy(ctx, localConnDialerFactory, host, cert, key, healthCheckURL); healthy {
break break
} }

2
services/kubeapi.go
View File

@@ -10,7 +10,7 @@ import (
func runKubeAPI(ctx context.Context, host *hosts.Host, df hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, kubeAPIProcess v3.Process) error { func runKubeAPI(ctx context.Context, host *hosts.Host, df hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, kubeAPIProcess v3.Process) error {
imageCfg, hostCfg, healthCheckURL := getProcessConfig(kubeAPIProcess) imageCfg, hostCfg, healthCheckURL := GetProcessConfig(kubeAPIProcess)
if err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, KubeAPIContainerName, host.Address, ControlRole, prsMap); err != nil { if err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, KubeAPIContainerName, host.Address, ControlRole, prsMap); err != nil {
return err return err
} }

2
services/kubecontroller.go
View File

@@ -9,7 +9,7 @@ import (
) )
func runKubeController(ctx context.Context, host *hosts.Host, df hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, controllerProcess v3.Process) error { func runKubeController(ctx context.Context, host *hosts.Host, df hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, controllerProcess v3.Process) error {
imageCfg, hostCfg, healthCheckURL := getProcessConfig(controllerProcess) imageCfg, hostCfg, healthCheckURL := GetProcessConfig(controllerProcess)
if err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, KubeControllerContainerName, host.Address, ControlRole, prsMap); err != nil { if err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, KubeControllerContainerName, host.Address, ControlRole, prsMap); err != nil {
return err return err
} }

2
services/kubelet.go
View File

@@ -9,7 +9,7 @@ import (
) )
func runKubelet(ctx context.Context, host *hosts.Host, df hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, kubeletProcess v3.Process) error { func runKubelet(ctx context.Context, host *hosts.Host, df hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, kubeletProcess v3.Process) error {
imageCfg, hostCfg, healthCheckURL := getProcessConfig(kubeletProcess) imageCfg, hostCfg, healthCheckURL := GetProcessConfig(kubeletProcess)
if err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, KubeletContainerName, host.Address, WorkerRole, prsMap); err != nil { if err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, KubeletContainerName, host.Address, WorkerRole, prsMap); err != nil {
return err return err
} }

2
services/kubeproxy.go
View File

@@ -9,7 +9,7 @@ import (
) )
func runKubeproxy(ctx context.Context, host *hosts.Host, df hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, kubeProxyProcess v3.Process) error { func runKubeproxy(ctx context.Context, host *hosts.Host, df hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, kubeProxyProcess v3.Process) error {
imageCfg, hostCfg, healthCheckURL := getProcessConfig(kubeProxyProcess) imageCfg, hostCfg, healthCheckURL := GetProcessConfig(kubeProxyProcess)
if err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, KubeproxyContainerName, host.Address, WorkerRole, prsMap); err != nil { if err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, KubeproxyContainerName, host.Address, WorkerRole, prsMap); err != nil {
return err return err
} }

2
services/proxy.go
View File

@@ -14,7 +14,7 @@ const (
) )
func runNginxProxy(ctx context.Context, host *hosts.Host, prsMap map[string]v3.PrivateRegistry, proxyProcess v3.Process) error { func runNginxProxy(ctx context.Context, host *hosts.Host, prsMap map[string]v3.PrivateRegistry, proxyProcess v3.Process) error {
imageCfg, hostCfg, _ := getProcessConfig(proxyProcess) imageCfg, hostCfg, _ := GetProcessConfig(proxyProcess)
return docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, NginxProxyContainerName, host.Address, WorkerRole, prsMap) return docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, NginxProxyContainerName, host.Address, WorkerRole, prsMap)
} }

2
services/scheduler.go
View File

@@ -9,7 +9,7 @@ import (
) )
func runScheduler(ctx context.Context, host *hosts.Host, df hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, schedulerProcess v3.Process) error { func runScheduler(ctx context.Context, host *hosts.Host, df hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, schedulerProcess v3.Process) error {
imageCfg, hostCfg, healthCheckURL := getProcessConfig(schedulerProcess) imageCfg, hostCfg, healthCheckURL := GetProcessConfig(schedulerProcess)
if err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, SchedulerContainerName, host.Address, ControlRole, prsMap); err != nil { if err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, SchedulerContainerName, host.Address, ControlRole, prsMap); err != nil {
return err return err
} }

4
services/services.go
View File

@@ -45,7 +45,7 @@ func runSidekick(ctx context.Context, host *hosts.Host, prsMap map[string]v3.Pri
return nil return nil
} }
imageCfg, hostCfg, _ := getProcessConfig(sidecarProcess) imageCfg, hostCfg, _ := GetProcessConfig(sidecarProcess)
sidecarImage := sidecarProcess.Image sidecarImage := sidecarProcess.Image
if err := docker.UseLocalOrPull(ctx, host.DClient, host.Address, sidecarImage, SidekickServiceName, prsMap); err != nil { if err := docker.UseLocalOrPull(ctx, host.DClient, host.Address, sidecarImage, SidekickServiceName, prsMap); err != nil {
return err return err
@@ -60,7 +60,7 @@ func removeSidekick(ctx context.Context, host *hosts.Host) error {
return docker.DoRemoveContainer(ctx, host.DClient, SidekickContainerName, host.Address) return docker.DoRemoveContainer(ctx, host.DClient, SidekickContainerName, host.Address)
} }
func getProcessConfig(process v3.Process) (*container.Config, *container.HostConfig, string) { func GetProcessConfig(process v3.Process) (*container.Config, *container.HostConfig, string) {
imageCfg := &container.Config{ imageCfg := &container.Config{
Entrypoint: process.Command, Entrypoint: process.Command,
Cmd: process.Args, Cmd: process.Args,