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
0f4fa4ed
Commit
0f4fa4ed
authored
Sep 08, 2015
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13704 from feihujiang/removeTheRedundantDefiniiteArticle
Auto commit by PR queue bot
parents
0a7921e9
d4a3e30e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
strategy.go
pkg/registry/pod/strategy.go
+2
-2
No files found.
pkg/registry/pod/strategy.go
View file @
0f4fa4ed
...
@@ -220,7 +220,7 @@ func ResourceLocation(getter ResourceGetter, ctx api.Context, id string) (*url.U
...
@@ -220,7 +220,7 @@ func ResourceLocation(getter ResourceGetter, ctx api.Context, id string) (*url.U
return
loc
,
nil
,
nil
return
loc
,
nil
,
nil
}
}
// LogLocation returns
a
the log URL for a pod container. If opts.Container is blank
// LogLocation returns the log URL for a pod container. If opts.Container is blank
// and only one container is present in the pod, that container is used.
// and only one container is present in the pod, that container is used.
func
LogLocation
(
getter
ResourceGetter
,
connInfo
client
.
ConnectionInfoGetter
,
ctx
api
.
Context
,
name
string
,
opts
*
api
.
PodLogOptions
)
(
*
url
.
URL
,
http
.
RoundTripper
,
error
)
{
func
LogLocation
(
getter
ResourceGetter
,
connInfo
client
.
ConnectionInfoGetter
,
ctx
api
.
Context
,
name
string
,
opts
*
api
.
PodLogOptions
)
(
*
url
.
URL
,
http
.
RoundTripper
,
error
)
{
pod
,
err
:=
getPod
(
getter
,
ctx
,
name
)
pod
,
err
:=
getPod
(
getter
,
ctx
,
name
)
...
@@ -347,7 +347,7 @@ func streamLocation(getter ResourceGetter, connInfo client.ConnectionInfoGetter,
...
@@ -347,7 +347,7 @@ func streamLocation(getter ResourceGetter, connInfo client.ConnectionInfoGetter,
return
loc
,
nodeTransport
,
nil
return
loc
,
nodeTransport
,
nil
}
}
// PortForwardLocation returns
a
the port-forward URL for a pod.
// PortForwardLocation returns the port-forward URL for a pod.
func
PortForwardLocation
(
getter
ResourceGetter
,
connInfo
client
.
ConnectionInfoGetter
,
ctx
api
.
Context
,
name
string
)
(
*
url
.
URL
,
http
.
RoundTripper
,
error
)
{
func
PortForwardLocation
(
getter
ResourceGetter
,
connInfo
client
.
ConnectionInfoGetter
,
ctx
api
.
Context
,
name
string
)
(
*
url
.
URL
,
http
.
RoundTripper
,
error
)
{
pod
,
err
:=
getPod
(
getter
,
ctx
,
name
)
pod
,
err
:=
getPod
(
getter
,
ctx
,
name
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
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