Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
308bb84c
Commit
308bb84c
authored
Mar 12, 2015
by
Timothy St. Clair
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor cleanup for etcd cleaning from kubelet
parent
a8f01391
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
kubelet.go
pkg/kubelet/kubelet.go
+1
-1
types.go
pkg/kubelet/types.go
+0
-2
No files found.
pkg/kubelet/kubelet.go
View file @
308bb84c
...
@@ -850,7 +850,7 @@ func (kl *Kubelet) makeEnvironmentVariables(ns string, container *api.Container)
...
@@ -850,7 +850,7 @@ func (kl *Kubelet) makeEnvironmentVariables(ns string, container *api.Container)
}
}
for
_
,
value
:=
range
container
.
Env
{
for
_
,
value
:=
range
container
.
Env
{
//
The code is in transition from using etcd+BoundPods to
apiserver+Pods.
//
Accesses
apiserver+Pods.
// So, the master may set service env vars, or kubelet may. In case both are doing
// So, the master may set service env vars, or kubelet may. In case both are doing
// it, we delete the key from the kubelet-generated ones so we don't have duplicate
// it, we delete the key from the kubelet-generated ones so we don't have duplicate
// env vars.
// env vars.
...
...
pkg/kubelet/types.go
View file @
308bb84c
...
@@ -40,8 +40,6 @@ const (
...
@@ -40,8 +40,6 @@ const (
// These constants identify the sources of pods
// These constants identify the sources of pods
// Updates from a file
// Updates from a file
FileSource
=
"file"
FileSource
=
"file"
// Updates from etcd
EtcdSource
=
"etcd"
// Not supported by current kubelets.
// Updates from querying a web page
// Updates from querying a web page
HTTPSource
=
"http"
HTTPSource
=
"http"
// Updates received to the kubelet server
// Updates received to the kubelet server
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment