github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #70527 from qingsenLi/git181101

Browse Source 
remove repetitive word in annotation
This commit is contained in:
Kubernetes Prow Robot 2019-01-15 20:19:09 -08:00 committed by GitHub
commit ce19aad22b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/run/run.go
View File

@ -654,7 +654,7 @@ func (o *RunOptions) createGeneratedObject(f cmdutil.Factory, cmd *cobra.Command
if err != nil { if err != nil {
return nil, err 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) gvks, _, err := scheme.Scheme.ObjectKinds(obj)
if err != nil { if err != nil {
return nil, err return nil, err

2
pkg/kubelet/dockershim/libdocker/helpers_test.go
View File

@ -110,7 +110,7 @@ func TestMatchImageTagOrSHA(t *testing.T) {
Output: true, Output: true,
}, },
{ {
// RepoDigest match is is required // RepoDigest match is required
Inspected: dockertypes.ImageInspect{ Inspected: dockertypes.ImageInspect{
ID: "", ID: "",
RepoDigests: []string{"docker.io/centos/ruby-23-centos7@sha256:000084acbbfb0347272112d2eb95574625c0c60b4e2fdadb139de5859cf754bf"}, RepoDigests: []string{"docker.io/centos/ruby-23-centos7@sha256:000084acbbfb0347272112d2eb95574625c0c60b4e2fdadb139de5859cf754bf"},

2
pkg/kubelet/util/manager/cache_based_manager.go
View File

@ -259,7 +259,7 @@ func (c *cacheBasedManager) UnregisterPod(pod *v1.Pod) {
// necessary for registered pods. // necessary for registered pods.
// It implements the following logic: // It implements the following logic:
// - whenever a pod is created or updated, the cached versions of all objects // - 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 // - 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 // not there, invalidated or too old, we fetch it from apiserver and refresh the
// value in cache; otherwise it is just fetched from cache // value in cache; otherwise it is just fetched from cache

2
pkg/volume/cinder/attacher.go
View File

@ -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) { 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) volumeID, _, _, err := getVolumeInfo(spec)
if err != nil { if err != nil {
return "", err return "", err