github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31540 from mtaufen/DockerOrDieRename

Browse Source 
Automatic merge from submit-queue

Rename ConnectToDockerOrDie to CreateDockerClientOrDie

This function does not actually attempt to connect to the docker daemon, it just creates a client object that can be used to do so later. The old name was confusing, as it implied that a failure to touch the docker daemon could cause program termination (rather than just a failure to create the client).
This commit is contained in:
Kubernetes Submit Queue 2016-09-07 15:27:41 -07:00 committed by GitHub
commit 0bd0d5571a
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubelet/app/server.go
View File

@ -126,7 +126,7 @@ func UnsecuredKubeletDeps(s *options.KubeletServer) (*kubelet.KubeletDeps, error
var dockerClient dockertools.DockerInterface var dockerClient dockertools.DockerInterface
if s.ContainerRuntime == "docker" { if s.ContainerRuntime == "docker" {
dockerClient = dockertools.ConnectToDockerOrDie(s.DockerEndpoint, s.RuntimeRequestTimeout.Duration) dockerClient = dockertools.CreateDockerClientOrDie(s.DockerEndpoint, s.RuntimeRequestTimeout.Duration)
} else { } else {
dockerClient = nil dockerClient = nil
} }

6
contrib/mesos/pkg/executor/executor_test.go
View File

@ -184,7 +184,7 @@ func TestExecutorLaunchAndKillTask(t *testing.T) {
mockDriver = &MockExecutorDriver{} mockDriver = &MockExecutorDriver{}
registry = newFakeRegistry() registry = newFakeRegistry()
executor = New(Config{ executor = New(Config{
Docker: dockertools.ConnectToDockerOrDie("fake://", 0), Docker: dockertools.CreateDockerClientOrDie("fake://", 0),
NodeInfos: make(chan NodeInfo, 1), NodeInfos: make(chan NodeInfo, 1),
Registry: registry, Registry: registry,
}) })
@ -388,7 +388,7 @@ func TestExecutorFrameworkMessage(t *testing.T) {
kubeletFinished = make(chan struct{}) kubeletFinished = make(chan struct{})
registry = newFakeRegistry() registry = newFakeRegistry()
executor = New(Config{ executor = New(Config{
Docker: dockertools.ConnectToDockerOrDie("fake://", 0), Docker: dockertools.CreateDockerClientOrDie("fake://", 0),
NodeInfos: make(chan NodeInfo, 1), NodeInfos: make(chan NodeInfo, 1),
ShutdownAlert: func() { ShutdownAlert: func() {
close(kubeletFinished) close(kubeletFinished)
@ -585,7 +585,7 @@ func TestExecutorShutdown(t *testing.T) {
kubeletFinished = make(chan struct{}) kubeletFinished = make(chan struct{})
exitCalled = int32(0) exitCalled = int32(0)
executor = New(Config{ executor = New(Config{
Docker: dockertools.ConnectToDockerOrDie("fake://", 0), Docker: dockertools.CreateDockerClientOrDie("fake://", 0),
NodeInfos: make(chan NodeInfo, 1), NodeInfos: make(chan NodeInfo, 1),
ShutdownAlert: func() { ShutdownAlert: func() {
close(kubeletFinished) close(kubeletFinished)

2
contrib/mesos/pkg/executor/mock_test.go
View File

@ -75,7 +75,7 @@ func (m *MockExecutorDriver) SendFrameworkMessage(msg string) (mesosproto.Status
func NewTestKubernetesExecutor() *Executor { func NewTestKubernetesExecutor() *Executor {
return New(Config{ return New(Config{
Docker: dockertools.ConnectToDockerOrDie("fake://", 0), Docker: dockertools.CreateDockerClientOrDie("fake://", 0),
Registry: newFakeRegistry(), Registry: newFakeRegistry(),
}) })
} }

2
contrib/mesos/pkg/executor/service/service.go
View File

@ -108,7 +108,7 @@ func (s *KubeletExecutorServer) runExecutor(
exec := executor.New(executor.Config{ exec := executor.New(executor.Config{
Registry: registry, Registry: registry,
APIClient: apiclient, APIClient: apiclient,
Docker: dockertools.ConnectToDockerOrDie(s.DockerEndpoint, 0), Docker: dockertools.CreateDockerClientOrDie(s.DockerEndpoint, 0),
SuicideTimeout: s.SuicideTimeout, SuicideTimeout: s.SuicideTimeout,
KubeletFinished: kubeletFinished, KubeletFinished: kubeletFinished,
ExitFunc: os.Exit, ExitFunc: os.Exit,

14
pkg/kubelet/dockertools/docker.go
View File

@ -362,13 +362,13 @@ func getDockerClient(dockerEndpoint string) (*dockerapi.Client, error) {
return dockerapi.NewEnvClient() return dockerapi.NewEnvClient()
} }
// ConnectToDockerOrDie creates docker client connecting to docker daemon. // CreateDockerClientOrDie creates a docker client for connecting to the docker daemon.
// If the endpoint passed in is "fake://", a fake docker client // It does not actually try to connect to the docker daemon!
// will be returned. The program exits if error occurs. The requestTimeout // requestTimeout is the timeout for docker requests.
// is the timeout for docker requests. If timeout is exceeded, the request // If requestTimeout=0, a default value is used instead.
// will be cancelled and throw out an error. If requestTimeout is 0, a default // Pass dockerEndpoint="fake://" to create a fake docker client.
// value will be applied. // Errors during client creation will cause program termination.
func ConnectToDockerOrDie(dockerEndpoint string, requestTimeout time.Duration) DockerInterface { func CreateDockerClientOrDie(dockerEndpoint string, requestTimeout time.Duration) DockerInterface {
if dockerEndpoint == "fake://" { if dockerEndpoint == "fake://" {
return NewFakeDockerClient() return NewFakeDockerClient()
} }

2
test/e2e_node/image.go
View File

@ -40,7 +40,7 @@ func NewConformanceImage(containerRuntime string, image string) (ci ConformanceI
//TODO: do not expose kubelet implementation details after we refactor the runtime API. //TODO: do not expose kubelet implementation details after we refactor the runtime API.
func dockerRuntime() kubecontainer.Runtime { func dockerRuntime() kubecontainer.Runtime {
dockerClient := dockertools.ConnectToDockerOrDie("", 0) dockerClient := dockertools.CreateDockerClientOrDie("", 0)
pm := kubepod.NewBasicPodManager(nil) pm := kubepod.NewBasicPodManager(nil)
dm := dockertools.NewDockerManager( dm := dockertools.NewDockerManager(
dockerClient, dockerClient,