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
16a4060e
Commit
16a4060e
authored
Sep 13, 2018
by
Sean Sullivan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused internal version of Pod resource
parent
17fe91cc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
9 deletions
+1
-9
BUILD
pkg/kubectl/polymorphichelpers/BUILD
+0
-1
attachablepodforobject.go
pkg/kubectl/polymorphichelpers/attachablepodforobject.go
+1
-8
No files found.
pkg/kubectl/polymorphichelpers/BUILD
View file @
16a4060e
...
@@ -26,7 +26,6 @@ go_library(
...
@@ -26,7 +26,6 @@ go_library(
"//pkg/apis/apps:go_default_library",
"//pkg/apis/apps:go_default_library",
"//pkg/apis/batch:go_default_library",
"//pkg/apis/batch:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/apis/core/v1:go_default_library",
"//pkg/apis/extensions:go_default_library",
"//pkg/apis/extensions:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/kubectl:go_default_library",
"//pkg/kubectl:go_default_library",
...
...
pkg/kubectl/polymorphichelpers/attachablepodforobject.go
View file @
16a4060e
...
@@ -21,23 +21,16 @@ import (
...
@@ -21,23 +21,16 @@ import (
"sort"
"sort"
"time"
"time"
"k8s.io/api/core/v1"
corev1
"k8s.io/api/core/v1"
corev1
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/genericclioptions"
corev1client
"k8s.io/client-go/kubernetes/typed/core/v1"
corev1client
"k8s.io/client-go/kubernetes/typed/core/v1"
api
"k8s.io/kubernetes/pkg/apis/core"
apiv1
"k8s.io/kubernetes/pkg/apis/core/v1"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller"
)
)
// attachablePodForObject returns the pod to which to attach given an object.
// attachablePodForObject returns the pod to which to attach given an object.
func
attachablePodForObject
(
restClientGetter
genericclioptions
.
RESTClientGetter
,
object
runtime
.
Object
,
timeout
time
.
Duration
)
(
*
corev1
.
Pod
,
error
)
{
func
attachablePodForObject
(
restClientGetter
genericclioptions
.
RESTClientGetter
,
object
runtime
.
Object
,
timeout
time
.
Duration
)
(
*
corev1
.
Pod
,
error
)
{
switch
t
:=
object
.
(
type
)
{
switch
t
:=
object
.
(
type
)
{
case
*
api
.
Pod
:
externalPod
:=
&
corev1
.
Pod
{}
err
:=
apiv1
.
Convert_core_Pod_To_v1_Pod
(
t
,
externalPod
,
nil
)
return
externalPod
,
err
case
*
corev1
.
Pod
:
case
*
corev1
.
Pod
:
return
t
,
nil
return
t
,
nil
}
}
...
@@ -55,7 +48,7 @@ func attachablePodForObject(restClientGetter genericclioptions.RESTClientGetter,
...
@@ -55,7 +48,7 @@ func attachablePodForObject(restClientGetter genericclioptions.RESTClientGetter,
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"cannot attach to %T: %v"
,
object
,
err
)
return
nil
,
fmt
.
Errorf
(
"cannot attach to %T: %v"
,
object
,
err
)
}
}
sortBy
:=
func
(
pods
[]
*
v1
.
Pod
)
sort
.
Interface
{
return
sort
.
Reverse
(
controller
.
ActivePods
(
pods
))
}
sortBy
:=
func
(
pods
[]
*
core
v1
.
Pod
)
sort
.
Interface
{
return
sort
.
Reverse
(
controller
.
ActivePods
(
pods
))
}
pod
,
_
,
err
:=
GetFirstPod
(
clientset
,
namespace
,
selector
.
String
(),
timeout
,
sortBy
)
pod
,
_
,
err
:=
GetFirstPod
(
clientset
,
namespace
,
selector
.
String
(),
timeout
,
sortBy
)
return
pod
,
err
return
pod
,
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