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
ce19aad2
Unverified
Commit
ce19aad2
authored
Jan 15, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Jan 15, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #70527 from qingsenLi/git181101
remove repetitive word in annotation
parents
591ef236
3ac9b27b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
run.go
pkg/kubectl/cmd/run/run.go
+1
-1
helpers_test.go
pkg/kubelet/dockershim/libdocker/helpers_test.go
+1
-1
cache_based_manager.go
pkg/kubelet/util/manager/cache_based_manager.go
+1
-1
attacher.go
pkg/volume/cinder/attacher.go
+1
-1
No files found.
pkg/kubectl/cmd/run/run.go
View file @
ce19aad2
...
...
@@ -654,7 +654,7 @@ func (o *RunOptions) createGeneratedObject(f cmdutil.Factory, cmd *cobra.Command
if
err
!=
nil
{
return
nil
,
err
}
// run has compiled knowledge of the thing is
is
creating
// run has compiled knowledge of the thing is creating
gvks
,
_
,
err
:=
scheme
.
Scheme
.
ObjectKinds
(
obj
)
if
err
!=
nil
{
return
nil
,
err
...
...
pkg/kubelet/dockershim/libdocker/helpers_test.go
View file @
ce19aad2
...
...
@@ -110,7 +110,7 @@ func TestMatchImageTagOrSHA(t *testing.T) {
Output
:
true
,
},
{
// RepoDigest match is
is
required
// RepoDigest match is required
Inspected
:
dockertypes
.
ImageInspect
{
ID
:
""
,
RepoDigests
:
[]
string
{
"docker.io/centos/ruby-23-centos7@sha256:000084acbbfb0347272112d2eb95574625c0c60b4e2fdadb139de5859cf754bf"
},
...
...
pkg/kubelet/util/manager/cache_based_manager.go
View file @
ce19aad2
...
...
@@ -259,7 +259,7 @@ func (c *cacheBasedManager) UnregisterPod(pod *v1.Pod) {
// necessary for registered pods.
// It implements the following logic:
// - whenever a pod is created or updated, the cached versions of all objects
// is
is
referencing are invalidated
// is referencing are invalidated
// - every GetObject() call tries to fetch the value from local cache; if it is
// not there, invalidated or too old, we fetch it from apiserver and refresh the
// value in cache; otherwise it is just fetched from cache
...
...
pkg/volume/cinder/attacher.go
View file @
ce19aad2
...
...
@@ -212,7 +212,7 @@ func (attacher *cinderDiskAttacher) VolumesAreAttached(specs []*volume.Spec, nod
}
func
(
attacher
*
cinderDiskAttacher
)
WaitForAttach
(
spec
*
volume
.
Spec
,
devicePath
string
,
_
*
v1
.
Pod
,
timeout
time
.
Duration
)
(
string
,
error
)
{
// NOTE: devicePath is
is
path as reported by Cinder, which may be incorrect and should not be used. See Issue #33128
// NOTE: devicePath is path as reported by Cinder, which may be incorrect and should not be used. See Issue #33128
volumeID
,
_
,
_
,
err
:=
getVolumeInfo
(
spec
)
if
err
!=
nil
{
return
""
,
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