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
b9481c18
Commit
b9481c18
authored
Sep 05, 2016
by
Kubernetes Submit Queue
Committed by
GitHub
Sep 05, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #31227 from pigmej/typos_englishify_pkg_kubelet
Automatic merge from submit-queue Fix various typos in pkg/kubelet Just fixed some typos + "englishify" pkg/kubelet.
parents
ae3b956c
9e51eea6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
config_test.go
pkg/kubelet/config/config_test.go
+1
-1
helpers.go
pkg/kubelet/dockershim/helpers.go
+1
-1
image_manager_test.go
pkg/kubelet/images/image_manager_test.go
+1
-1
kuberuntime_container.go
pkg/kubelet/kuberuntime/kuberuntime_container.go
+1
-1
remote_image.go
pkg/kubelet/remote/remote_image.go
+1
-1
reconciler.go
pkg/kubelet/volumemanager/reconciler/reconciler.go
+3
-3
No files found.
pkg/kubelet/config/config_test.go
View file @
b9481c18
...
...
@@ -296,7 +296,7 @@ func TestNewPodAddedSetReconciled(t *testing.T) {
// before touching to avoid data race.
newTestPods
:=
func
(
touchStatus
,
touchSpec
bool
)
([]
*
api
.
Pod
,
*
api
.
Pod
)
{
pods
:=
[]
*
api
.
Pod
{
CreateValidPod
(
"changable-pod-0"
,
"new"
),
CreateValidPod
(
"chang
e
able-pod-0"
,
"new"
),
CreateValidPod
(
"constant-pod-1"
,
"new"
),
CreateValidPod
(
"constant-pod-2"
,
"new"
),
}
...
...
pkg/kubelet/dockershim/helpers.go
View file @
b9481c18
...
...
@@ -197,7 +197,7 @@ func parseSandboxName(name string) (string, string, string, uint32, error) {
}
// buildContainerName creates a name which can be reversed to identify container name.
// This function returns stable name, unique name and a
n
unique id.
// This function returns stable name, unique name and a unique id.
func
buildContainerName
(
sandboxConfig
*
runtimeApi
.
PodSandboxConfig
,
containerConfig
*
runtimeApi
.
ContainerConfig
)
string
{
containerName
:=
fmt
.
Sprintf
(
"%s.%d"
,
containerConfig
.
Metadata
.
GetName
(),
containerConfig
.
Metadata
.
GetAttempt
())
return
buildKubeGenericName
(
sandboxConfig
,
containerName
)
...
...
pkg/kubelet/images/image_manager_test.go
View file @
b9481c18
...
...
@@ -56,7 +56,7 @@ func TestParallelPuller(t *testing.T) {
pullerErr
:
nil
,
expectedErr
:
[]
error
{
nil
}},
{
// image present, dont pull
{
// image present, don
'
t pull
containerImage
:
"present_image"
,
policy
:
api
.
PullIfNotPresent
,
calledFunctions
:
[]
string
{
"IsImagePresent"
},
...
...
pkg/kubelet/kuberuntime/kuberuntime_container.go
View file @
b9481c18
...
...
@@ -66,7 +66,7 @@ func (m *kubeGenericRuntimeManager) generateContainerConfig(container *api.Conta
Linux
:
m
.
generateLinuxContainerConfig
(
container
),
}
// set privile
d
ged and readonlyRootfs
// set privileged and readonlyRootfs
if
container
.
SecurityContext
!=
nil
{
securityContext
:=
container
.
SecurityContext
if
securityContext
.
Privileged
!=
nil
{
...
...
pkg/kubelet/remote/remote_image.go
View file @
b9481c18
...
...
@@ -78,7 +78,7 @@ func (r *RemoteImageService) ImageStatus(image *runtimeApi.ImageSpec) (*runtimeA
return
resp
.
Image
,
nil
}
// PullImage pulls a image with authentication config.
// PullImage pulls a
n
image with authentication config.
func
(
r
*
RemoteImageService
)
PullImage
(
image
*
runtimeApi
.
ImageSpec
,
auth
*
runtimeApi
.
AuthConfig
)
error
{
ctx
,
cancel
:=
getContextWithTimeout
(
r
.
timeout
)
defer
cancel
()
...
...
pkg/kubelet/volumemanager/reconciler/reconciler.go
View file @
b9481c18
...
...
@@ -387,7 +387,7 @@ type podVolume struct {
}
// reconstructFromDisk scans the volume directories under the given pod directory. If the volume is not
// in either actual or desired state of world, or pending operation, this function will reconstuct
// in either actual or desired state of world, or pending operation, this function will reconst
r
uct
// the volume spec and put it in both the actual and desired state of worlds. If no running
// container is mounting the volume, the volume will be removed by desired state of world's populator and
// cleaned up by the reconciler.
...
...
@@ -407,7 +407,7 @@ func (rc *reconciler) reconstructStates(podsDir string) {
// Check if there is an pending operation for the given pod and volume.
// Need to check pending operation before checking the actual and desired
// states to avoid race condition during checking. For ex
ma
ple, the following
// states to avoid race condition during checking. For ex
am
ple, the following
// might happen if pending operation is checked after checking actual and desired states.
// 1. Checking the pod and it does not exist in either actual or desired state.
// 2. An operation for the given pod finishes and the actual state is updated.
...
...
@@ -425,7 +425,7 @@ func (rc *reconciler) reconstructStates(podsDir string) {
"Could not find pod information in desired or actual states or pending operation, update it in both states: %+v"
,
volumeToMount
)
if
err
=
rc
.
updateStates
(
volumeToMount
);
err
!=
nil
{
glog
.
Errorf
(
"Error occured during reconstruct volume from disk: %v"
,
err
)
glog
.
Errorf
(
"Error occur
r
ed during reconstruct volume from disk: %v"
,
err
)
}
}
}
...
...
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