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

Remove mentions of etcd in kubelet.

Browse Source
This commit is contained in:
Eric Tune 2015-03-11 16:40:20 -07:00
parent ac7bf05079
commit ae9bc28f8b
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,7 +187,8 @@ func (s *KubeletServer) Run(_ []string) error {
func (s *KubeletServer) setupRunOnce() { func (s *KubeletServer) setupRunOnce() {
if s.RunOnce { if s.RunOnce {
// Don't use remote (etcd or apiserver) sources // Don't use apiserver source, on the presumption that this flag is used
// for bootstrapping some system pods.
if len(s.APIServerList) > 0 { if len(s.APIServerList) > 0 {
glog.Fatalf("invalid option: --runonce and --api_servers are mutually exclusive") glog.Fatalf("invalid option: --runonce and --api_servers are mutually exclusive")
} }
@ -227,7 +228,7 @@ func (s *KubeletServer) createAPIServerClient() (*client.Client, error) {
return c, nil return c, nil
} }
// SimpleRunKubelet is a simple way to start a Kubelet talking to dockerEndpoint, using an etcdClient. // SimpleRunKubelet is a simple way to start a Kubelet talking to dockerEndpoint, using an API Client.
// Under the hood it calls RunKubelet (below) // Under the hood it calls RunKubelet (below)
func SimpleRunKubelet(client *client.Client, func SimpleRunKubelet(client *client.Client,
dockerClient dockertools.DockerInterface, dockerClient dockertools.DockerInterface,

2
pkg/kubelet/kubelet.go
View File

@ -1534,7 +1534,7 @@ func (kl *Kubelet) handleUpdate(u PodUpdate) {
} }
// syncLoop is the main loop for processing changes. It watches for changes from // syncLoop is the main loop for processing changes. It watches for changes from
// four channels (file, etcd, server, and http) and creates a union of them. For // three channels (file, apiserver, and http) and creates a union of them. For
// any new change seen, will run a sync against desired state and running state. If // any new change seen, will run a sync against desired state and running state. If
// no changes are seen to the configuration, will synchronize the last known desired // no changes are seen to the configuration, will synchronize the last known desired
// state every sync_frequency seconds. Never returns. // state every sync_frequency seconds. Never returns.

20
pkg/kubelet/kubelet_test.go
View File

@ -1390,7 +1390,7 @@ func TestRunInContainerNoSuchPod(t *testing.T) {
kubelet.runner = &fakeCommandRunner kubelet.runner = &fakeCommandRunner
podName := "podFoo" podName := "podFoo"
podNamespace := "etcd" podNamespace := "nsFoo"
containerName := "containerFoo" containerName := "containerFoo"
output, err := kubelet.RunInContainer( output, err := kubelet.RunInContainer(
GetPodFullName(&api.BoundPod{ObjectMeta: api.ObjectMeta{Name: podName, Namespace: podNamespace}}), GetPodFullName(&api.BoundPod{ObjectMeta: api.ObjectMeta{Name: podName, Namespace: podNamespace}}),
@ -1412,7 +1412,7 @@ func TestRunInContainer(t *testing.T) {
containerID := "abc1234" containerID := "abc1234"
podName := "podFoo" podName := "podFoo"
podNamespace := "etcd" podNamespace := "nsFoo"
containerName := "containerFoo" containerName := "containerFoo"
fakeDocker.ContainerList = []docker.APIContainers{ fakeDocker.ContainerList = []docker.APIContainers{
@ -1452,7 +1452,7 @@ func TestRunHandlerExec(t *testing.T) {
containerID := "abc1234" containerID := "abc1234"
podName := "podFoo" podName := "podFoo"
podNamespace := "etcd" podNamespace := "nsFoo"
containerName := "containerFoo" containerName := "containerFoo"
fakeDocker.ContainerList = []docker.APIContainers{ fakeDocker.ContainerList = []docker.APIContainers{
@ -1499,7 +1499,7 @@ func TestRunHandlerHttp(t *testing.T) {
kubelet.httpClient = &fakeHttp kubelet.httpClient = &fakeHttp
podName := "podFoo" podName := "podFoo"
podNamespace := "etcd" podNamespace := "nsFoo"
containerName := "containerFoo" containerName := "containerFoo"
container := api.Container{ container := api.Container{
@ -2694,7 +2694,7 @@ func TestExecInContainerNoSuchPod(t *testing.T) {
kubelet.runner = &fakeCommandRunner kubelet.runner = &fakeCommandRunner
podName := "podFoo" podName := "podFoo"
podNamespace := "etcd" podNamespace := "nsFoo"
containerName := "containerFoo" containerName := "containerFoo"
err := kubelet.ExecInContainer( err := kubelet.ExecInContainer(
GetPodFullName(&api.BoundPod{ObjectMeta: api.ObjectMeta{Name: podName, Namespace: podNamespace}}), GetPodFullName(&api.BoundPod{ObjectMeta: api.ObjectMeta{Name: podName, Namespace: podNamespace}}),
@ -2720,7 +2720,7 @@ func TestExecInContainerNoSuchContainer(t *testing.T) {
kubelet.runner = &fakeCommandRunner kubelet.runner = &fakeCommandRunner
podName := "podFoo" podName := "podFoo"
podNamespace := "etcd" podNamespace := "nsFoo"
containerID := "containerFoo" containerID := "containerFoo"
fakeDocker.ContainerList = []docker.APIContainers{ fakeDocker.ContainerList = []docker.APIContainers{
@ -2772,7 +2772,7 @@ func TestExecInContainer(t *testing.T) {
kubelet.runner = &fakeCommandRunner kubelet.runner = &fakeCommandRunner
podName := "podFoo" podName := "podFoo"
podNamespace := "etcd" podNamespace := "nsFoo"
containerID := "containerFoo" containerID := "containerFoo"
command := []string{"ls"} command := []string{"ls"}
stdin := &bytes.Buffer{} stdin := &bytes.Buffer{}
@ -2831,7 +2831,7 @@ func TestPortForwardNoSuchPod(t *testing.T) {
kubelet.runner = &fakeCommandRunner kubelet.runner = &fakeCommandRunner
podName := "podFoo" podName := "podFoo"
podNamespace := "etcd" podNamespace := "nsFoo"
var port uint16 = 5000 var port uint16 = 5000
err := kubelet.PortForward( err := kubelet.PortForward(
@ -2854,7 +2854,7 @@ func TestPortForwardNoSuchContainer(t *testing.T) {
kubelet.runner = &fakeCommandRunner kubelet.runner = &fakeCommandRunner
podName := "podFoo" podName := "podFoo"
podNamespace := "etcd" podNamespace := "nsFoo"
var port uint16 = 5000 var port uint16 = 5000
fakeDocker.ContainerList = []docker.APIContainers{ fakeDocker.ContainerList = []docker.APIContainers{
@ -2888,7 +2888,7 @@ func TestPortForward(t *testing.T) {
kubelet.runner = &fakeCommandRunner kubelet.runner = &fakeCommandRunner
podName := "podFoo" podName := "podFoo"
podNamespace := "etcd" podNamespace := "nsFoo"
containerID := "containerFoo" containerID := "containerFoo"
var port uint16 = 5000 var port uint16 = 5000
stream := &fakeReadWriteCloser{} stream := &fakeReadWriteCloser{}