From 8387af26f2be34b38d6eac80f7449897cf2128ed Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 26 Feb 2018 16:27:54 -0700 Subject: [PATCH] Make getProcessConfig public --- services/etcd.go | 6 +++--- services/kubeapi.go | 2 +- services/kubecontroller.go | 2 +- services/kubelet.go | 2 +- services/kubeproxy.go | 2 +- services/proxy.go | 2 +- services/scheduler.go | 2 +- services/services.go | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/services/etcd.go b/services/etcd.go index 45d6db5d..53376e3d 100644 --- a/services/etcd.go +++ b/services/etcd.go @@ -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 { log.Infof(ctx, "[%s] Building up Etcd Plane..", ETCDRole) 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) if err != nil { 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 { 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 { return err } @@ -135,7 +135,7 @@ func ReloadEtcdCluster(ctx context.Context, readyEtcdHosts []*hosts.Host, localC time.Sleep(10 * time.Second) var healthy bool for _, host := range readyEtcdHosts { - _, _, healthCheckURL := getProcessConfig(etcdProcessHostMap[host]) + _, _, healthCheckURL := GetProcessConfig(etcdProcessHostMap[host]) if healthy = isEtcdHealthy(ctx, localConnDialerFactory, host, cert, key, healthCheckURL); healthy { break } diff --git a/services/kubeapi.go b/services/kubeapi.go index 04451000..497fa7f1 100644 --- a/services/kubeapi.go +++ b/services/kubeapi.go @@ -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 { - 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 { return err } diff --git a/services/kubecontroller.go b/services/kubecontroller.go index 15e61934..395a43f4 100644 --- a/services/kubecontroller.go +++ b/services/kubecontroller.go @@ -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 { - 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 { return err } diff --git a/services/kubelet.go b/services/kubelet.go index c1e13bc2..4036264f 100644 --- a/services/kubelet.go +++ b/services/kubelet.go @@ -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 { - 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 { return err } diff --git a/services/kubeproxy.go b/services/kubeproxy.go index e2392b14..cfd27e0d 100644 --- a/services/kubeproxy.go +++ b/services/kubeproxy.go @@ -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 { - 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 { return err } diff --git a/services/proxy.go b/services/proxy.go index 2842622b..863f3a04 100644 --- a/services/proxy.go +++ b/services/proxy.go @@ -14,7 +14,7 @@ const ( ) 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) } diff --git a/services/scheduler.go b/services/scheduler.go index 9c6e7b1d..f6eada2a 100644 --- a/services/scheduler.go +++ b/services/scheduler.go @@ -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 { - 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 { return err } diff --git a/services/services.go b/services/services.go index a93fce58..71c610bd 100644 --- a/services/services.go +++ b/services/services.go @@ -45,7 +45,7 @@ func runSidekick(ctx context.Context, host *hosts.Host, prsMap map[string]v3.Pri return nil } - imageCfg, hostCfg, _ := getProcessConfig(sidecarProcess) + imageCfg, hostCfg, _ := GetProcessConfig(sidecarProcess) sidecarImage := sidecarProcess.Image if err := docker.UseLocalOrPull(ctx, host.DClient, host.Address, sidecarImage, SidekickServiceName, prsMap); err != nil { return err @@ -60,7 +60,7 @@ func removeSidekick(ctx context.Context, host *hosts.Host) error { 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{ Entrypoint: process.Command, Cmd: process.Args,