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
ff353231
Commit
ff353231
authored
Mar 24, 2017
by
Kubernetes Submit Queue
Committed by
GitHub
Mar 24, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #42102 from timchenxiaoyu/kubltworderror
Automatic merge from submit-queue kubelet word mistake
parents
dbf152ac
34bf0bf1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
kubernetes_worker.py
...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+1
-1
persistent_volumes-disruptive.go
test/e2e/persistent_volumes-disruptive.go
+1
-1
No files found.
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View file @
ff353231
...
...
@@ -137,7 +137,7 @@ def charm_status(kube_dns):
def
update_kubelet_status
():
''' There are different states that the kubelt can be in, where we are
''' There are different states that the kubel
e
t can be in, where we are
waiting for dns, waiting for cluster turnup, or ready to serve
applications.'''
if
(
_systemctl_is_active
(
'kubelet'
)):
...
...
test/e2e/persistent_volumes-disruptive.go
View file @
ff353231
...
...
@@ -214,7 +214,7 @@ func tearDownTestCase(c clientset.Interface, f *framework.Framework, ns string,
}
// kubeletCommand performs `start`, `restart`, or `stop` on the kubelet running on the node of the target pod.
// Allowed kubeltOps are `kStart`, `kStop`, and `kRestart`
// Allowed kubel
e
tOps are `kStart`, `kStop`, and `kRestart`
func
kubeletCommand
(
kOp
kubeletOpt
,
c
clientset
.
Interface
,
pod
*
v1
.
Pod
)
{
nodeIP
,
err
:=
framework
.
GetHostExternalAddress
(
c
,
pod
)
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
...
...
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