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
493d2b69
Commit
493d2b69
authored
Oct 12, 2015
by
Chao Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
grep sed Experimental()
parent
c4ee22b5
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
69 additions
and
69 deletions
+69
-69
client.go
pkg/client/unversioned/client.go
+2
-2
conditions.go
pkg/client/unversioned/conditions.go
+1
-1
daemon_sets_test.go
pkg/client/unversioned/daemon_sets_test.go
+7
-7
horizontalpodautoscaler_test.go
pkg/client/unversioned/horizontalpodautoscaler_test.go
+6
-6
ingress_test.go
pkg/client/unversioned/ingress_test.go
+7
-7
jobs_test.go
pkg/client/unversioned/jobs_test.go
+7
-7
testclient.go
pkg/client/unversioned/testclient/testclient.go
+1
-1
controller.go
pkg/controller/daemon/controller.go
+3
-3
deployment_controller.go
pkg/controller/deployment/deployment_controller.go
+2
-2
controller.go
pkg/controller/job/controller.go
+3
-3
namespace_controller.go
pkg/controller/namespace/namespace_controller.go
+5
-5
horizontal.go
pkg/controller/podautoscaler/horizontal.go
+4
-4
apiversions.go
pkg/kubectl/cmd/apiversions.go
+1
-1
describe.go
pkg/kubectl/describe.go
+4
-4
scale.go
pkg/kubectl/scale.go
+3
-3
scale_test.go
pkg/kubectl/scale_test.go
+1
-1
stop.go
pkg/kubectl/stop.go
+5
-5
horizontal_pod_autoscaling.go
test/e2e/horizontal_pod_autoscaling.go
+2
-2
job.go
test/e2e/job.go
+5
-5
No files found.
pkg/client/unversioned/client.go
View file @
493d2b69
...
...
@@ -51,7 +51,7 @@ type Interface interface {
PersistentVolumeClaimsNamespacer
ComponentStatusesInterface
SwaggerSchemaInterface
Ex
perimental
()
ExtensionsInterface
Ex
tensions
()
ExtensionsInterface
}
func
(
c
*
Client
)
ReplicationControllers
(
namespace
string
)
ReplicationControllerInterface
{
...
...
@@ -243,6 +243,6 @@ func IsTimeout(err error) bool {
return
false
}
func
(
c
*
Client
)
Ex
perimental
()
ExtensionsInterface
{
func
(
c
*
Client
)
Ex
tensions
()
ExtensionsInterface
{
return
c
.
ExtensionsClient
}
pkg/client/unversioned/conditions.go
View file @
493d2b69
...
...
@@ -48,7 +48,7 @@ func ControllerHasDesiredReplicas(c Interface, controller *api.ReplicationContro
func
JobHasDesiredParallelism
(
c
Interface
,
job
*
extensions
.
Job
)
wait
.
ConditionFunc
{
return
func
()
(
bool
,
error
)
{
job
,
err
:=
c
.
Ex
perimental
()
.
Jobs
(
job
.
Namespace
)
.
Get
(
job
.
Name
)
job
,
err
:=
c
.
Ex
tensions
()
.
Jobs
(
job
.
Namespace
)
.
Get
(
job
.
Name
)
if
err
!=
nil
{
return
false
,
err
}
...
...
pkg/client/unversioned/daemon_sets_test.go
View file @
493d2b69
...
...
@@ -55,7 +55,7 @@ func TestListDaemonSets(t *testing.T) {
},
},
}
receivedDSs
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
DaemonSets
(
ns
)
.
List
(
labels
.
Everything
())
receivedDSs
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
DaemonSets
(
ns
)
.
List
(
labels
.
Everything
())
c
.
Validate
(
t
,
receivedDSs
,
err
)
}
...
...
@@ -80,14 +80,14 @@ func TestGetDaemonSet(t *testing.T) {
},
},
}
receivedDaemonSet
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
DaemonSets
(
ns
)
.
Get
(
"foo"
)
receivedDaemonSet
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
DaemonSets
(
ns
)
.
Get
(
"foo"
)
c
.
Validate
(
t
,
receivedDaemonSet
,
err
)
}
func
TestGetDaemonSetWithNoName
(
t
*
testing
.
T
)
{
ns
:=
api
.
NamespaceDefault
c
:=
&
testClient
{
Error
:
true
}
receivedPod
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
DaemonSets
(
ns
)
.
Get
(
""
)
receivedPod
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
DaemonSets
(
ns
)
.
Get
(
""
)
if
(
err
!=
nil
)
&&
(
err
.
Error
()
!=
nameRequiredError
)
{
t
.
Errorf
(
"Expected error: %v, but got %v"
,
nameRequiredError
,
err
)
}
...
...
@@ -118,7 +118,7 @@ func TestUpdateDaemonSet(t *testing.T) {
},
},
}
receivedDaemonSet
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
DaemonSets
(
ns
)
.
Update
(
requestDaemonSet
)
receivedDaemonSet
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
DaemonSets
(
ns
)
.
Update
(
requestDaemonSet
)
c
.
Validate
(
t
,
receivedDaemonSet
,
err
)
}
...
...
@@ -146,7 +146,7 @@ func TestUpdateDaemonSetUpdateStatus(t *testing.T) {
},
},
}
receivedDaemonSet
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
DaemonSets
(
ns
)
.
UpdateStatus
(
requestDaemonSet
)
receivedDaemonSet
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
DaemonSets
(
ns
)
.
UpdateStatus
(
requestDaemonSet
)
c
.
Validate
(
t
,
receivedDaemonSet
,
err
)
}
...
...
@@ -156,7 +156,7 @@ func TestDeleteDaemon(t *testing.T) {
Request
:
testRequest
{
Method
:
"DELETE"
,
Path
:
testapi
.
Extensions
.
ResourcePath
(
getDSResourceName
(),
ns
,
"foo"
),
Query
:
buildQueryValues
(
nil
)},
Response
:
Response
{
StatusCode
:
200
},
}
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
DaemonSets
(
ns
)
.
Delete
(
"foo"
)
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
DaemonSets
(
ns
)
.
Delete
(
"foo"
)
c
.
Validate
(
t
,
nil
,
err
)
}
...
...
@@ -183,6 +183,6 @@ func TestCreateDaemonSet(t *testing.T) {
},
},
}
receivedDaemonSet
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
DaemonSets
(
ns
)
.
Create
(
requestDaemonSet
)
receivedDaemonSet
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
DaemonSets
(
ns
)
.
Create
(
requestDaemonSet
)
c
.
Validate
(
t
,
receivedDaemonSet
,
err
)
}
pkg/client/unversioned/horizontalpodautoscaler_test.go
View file @
493d2b69
...
...
@@ -49,7 +49,7 @@ func TestHorizontalPodAutoscalerCreate(t *testing.T) {
Response
:
Response
{
StatusCode
:
200
,
Body
:
&
horizontalPodAutoscaler
},
}
response
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
HorizontalPodAutoscalers
(
ns
)
.
Create
(
&
horizontalPodAutoscaler
)
response
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
HorizontalPodAutoscalers
(
ns
)
.
Create
(
&
horizontalPodAutoscaler
)
if
err
!=
nil
{
t
.
Fatalf
(
"unexpected error: %v"
,
err
)
}
...
...
@@ -74,7 +74,7 @@ func TestHorizontalPodAutoscalerGet(t *testing.T) {
Response
:
Response
{
StatusCode
:
200
,
Body
:
horizontalPodAutoscaler
},
}
response
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
HorizontalPodAutoscalers
(
ns
)
.
Get
(
"abc"
)
response
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
HorizontalPodAutoscalers
(
ns
)
.
Get
(
"abc"
)
c
.
Validate
(
t
,
response
,
err
)
}
...
...
@@ -99,7 +99,7 @@ func TestHorizontalPodAutoscalerList(t *testing.T) {
},
Response
:
Response
{
StatusCode
:
200
,
Body
:
horizontalPodAutoscalerList
},
}
response
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
HorizontalPodAutoscalers
(
ns
)
.
List
(
labels
.
Everything
(),
fields
.
Everything
())
response
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
HorizontalPodAutoscalers
(
ns
)
.
List
(
labels
.
Everything
(),
fields
.
Everything
())
c
.
Validate
(
t
,
response
,
err
)
}
...
...
@@ -116,7 +116,7 @@ func TestHorizontalPodAutoscalerUpdate(t *testing.T) {
Request
:
testRequest
{
Method
:
"PUT"
,
Path
:
testapi
.
Extensions
.
ResourcePath
(
getHorizontalPodAutoscalersResoureName
(),
ns
,
"abc"
),
Query
:
buildQueryValues
(
nil
)},
Response
:
Response
{
StatusCode
:
200
,
Body
:
horizontalPodAutoscaler
},
}
response
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
HorizontalPodAutoscalers
(
ns
)
.
Update
(
horizontalPodAutoscaler
)
response
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
HorizontalPodAutoscalers
(
ns
)
.
Update
(
horizontalPodAutoscaler
)
c
.
Validate
(
t
,
response
,
err
)
}
...
...
@@ -143,7 +143,7 @@ func TestHorizontalPodAutoscalerDelete(t *testing.T) {
Request
:
testRequest
{
Method
:
"DELETE"
,
Path
:
testapi
.
Extensions
.
ResourcePath
(
getHorizontalPodAutoscalersResoureName
(),
ns
,
"foo"
),
Query
:
buildQueryValues
(
nil
)},
Response
:
Response
{
StatusCode
:
200
},
}
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
HorizontalPodAutoscalers
(
ns
)
.
Delete
(
"foo"
,
nil
)
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
HorizontalPodAutoscalers
(
ns
)
.
Delete
(
"foo"
,
nil
)
c
.
Validate
(
t
,
nil
,
err
)
}
...
...
@@ -155,6 +155,6 @@ func TestHorizontalPodAutoscalerWatch(t *testing.T) {
Query
:
url
.
Values
{
"resourceVersion"
:
[]
string
{}}},
Response
:
Response
{
StatusCode
:
200
},
}
_
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
HorizontalPodAutoscalers
(
api
.
NamespaceAll
)
.
Watch
(
labels
.
Everything
(),
fields
.
Everything
(),
""
)
_
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
HorizontalPodAutoscalers
(
api
.
NamespaceAll
)
.
Watch
(
labels
.
Everything
(),
fields
.
Everything
(),
""
)
c
.
Validate
(
t
,
nil
,
err
)
}
pkg/client/unversioned/ingress_test.go
View file @
493d2b69
...
...
@@ -56,7 +56,7 @@ func TestListIngress(t *testing.T) {
},
},
}
receivedIngressList
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
Ingress
(
ns
)
.
List
(
labels
.
Everything
(),
fields
.
Everything
())
receivedIngressList
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
Ingress
(
ns
)
.
List
(
labels
.
Everything
(),
fields
.
Everything
())
c
.
Validate
(
t
,
receivedIngressList
,
err
)
}
...
...
@@ -84,14 +84,14 @@ func TestGetIngress(t *testing.T) {
},
},
}
receivedIngress
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
Ingress
(
ns
)
.
Get
(
"foo"
)
receivedIngress
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
Ingress
(
ns
)
.
Get
(
"foo"
)
c
.
Validate
(
t
,
receivedIngress
,
err
)
}
func
TestGetIngressWithNoName
(
t
*
testing
.
T
)
{
ns
:=
api
.
NamespaceDefault
c
:=
&
testClient
{
Error
:
true
}
receivedIngress
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
Ingress
(
ns
)
.
Get
(
""
)
receivedIngress
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
Ingress
(
ns
)
.
Get
(
""
)
if
(
err
!=
nil
)
&&
(
err
.
Error
()
!=
nameRequiredError
)
{
t
.
Errorf
(
"Expected error: %v, but got %v"
,
nameRequiredError
,
err
)
}
...
...
@@ -130,7 +130,7 @@ func TestUpdateIngress(t *testing.T) {
},
},
}
receivedIngress
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
Ingress
(
ns
)
.
Update
(
requestIngress
)
receivedIngress
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
Ingress
(
ns
)
.
Update
(
requestIngress
)
c
.
Validate
(
t
,
receivedIngress
,
err
)
}
...
...
@@ -176,7 +176,7 @@ func TestUpdateIngressStatus(t *testing.T) {
},
},
}
receivedIngress
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
Ingress
(
ns
)
.
UpdateStatus
(
requestIngress
)
receivedIngress
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
Ingress
(
ns
)
.
UpdateStatus
(
requestIngress
)
c
.
Validate
(
t
,
receivedIngress
,
err
)
}
...
...
@@ -190,7 +190,7 @@ func TestDeleteIngress(t *testing.T) {
},
Response
:
Response
{
StatusCode
:
200
},
}
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
Ingress
(
ns
)
.
Delete
(
"foo"
,
nil
)
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
Ingress
(
ns
)
.
Delete
(
"foo"
,
nil
)
c
.
Validate
(
t
,
nil
,
err
)
}
...
...
@@ -225,6 +225,6 @@ func TestCreateIngress(t *testing.T) {
},
},
}
receivedIngress
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
Ingress
(
ns
)
.
Create
(
requestIngress
)
receivedIngress
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
Ingress
(
ns
)
.
Create
(
requestIngress
)
c
.
Validate
(
t
,
receivedIngress
,
err
)
}
pkg/client/unversioned/jobs_test.go
View file @
493d2b69
...
...
@@ -56,7 +56,7 @@ func TestListJobs(t *testing.T) {
},
},
}
receivedJobList
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
Jobs
(
ns
)
.
List
(
labels
.
Everything
(),
fields
.
Everything
())
receivedJobList
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
Jobs
(
ns
)
.
List
(
labels
.
Everything
(),
fields
.
Everything
())
c
.
Validate
(
t
,
receivedJobList
,
err
)
}
...
...
@@ -84,14 +84,14 @@ func TestGetJob(t *testing.T) {
},
},
}
receivedJob
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
Jobs
(
ns
)
.
Get
(
"foo"
)
receivedJob
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
Jobs
(
ns
)
.
Get
(
"foo"
)
c
.
Validate
(
t
,
receivedJob
,
err
)
}
func
TestGetJobWithNoName
(
t
*
testing
.
T
)
{
ns
:=
api
.
NamespaceDefault
c
:=
&
testClient
{
Error
:
true
}
receivedJob
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
Jobs
(
ns
)
.
Get
(
""
)
receivedJob
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
Jobs
(
ns
)
.
Get
(
""
)
if
(
err
!=
nil
)
&&
(
err
.
Error
()
!=
nameRequiredError
)
{
t
.
Errorf
(
"Expected error: %v, but got %v"
,
nameRequiredError
,
err
)
}
...
...
@@ -130,7 +130,7 @@ func TestUpdateJob(t *testing.T) {
},
},
}
receivedJob
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
Jobs
(
ns
)
.
Update
(
requestJob
)
receivedJob
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
Jobs
(
ns
)
.
Update
(
requestJob
)
c
.
Validate
(
t
,
receivedJob
,
err
)
}
...
...
@@ -168,7 +168,7 @@ func TestUpdateJobStatus(t *testing.T) {
},
},
}
receivedJob
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
Jobs
(
ns
)
.
UpdateStatus
(
requestJob
)
receivedJob
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
Jobs
(
ns
)
.
UpdateStatus
(
requestJob
)
c
.
Validate
(
t
,
receivedJob
,
err
)
}
...
...
@@ -182,7 +182,7 @@ func TestDeleteJob(t *testing.T) {
},
Response
:
Response
{
StatusCode
:
200
},
}
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
Jobs
(
ns
)
.
Delete
(
"foo"
,
nil
)
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
Jobs
(
ns
)
.
Delete
(
"foo"
,
nil
)
c
.
Validate
(
t
,
nil
,
err
)
}
...
...
@@ -217,6 +217,6 @@ func TestCreateJob(t *testing.T) {
},
},
}
receivedJob
,
err
:=
c
.
Setup
(
t
)
.
Ex
perimental
()
.
Jobs
(
ns
)
.
Create
(
requestJob
)
receivedJob
,
err
:=
c
.
Setup
(
t
)
.
Ex
tensions
()
.
Jobs
(
ns
)
.
Create
(
requestJob
)
c
.
Validate
(
t
,
receivedJob
,
err
)
}
pkg/client/unversioned/testclient/testclient.go
View file @
493d2b69
...
...
@@ -268,7 +268,7 @@ func (c *Fake) Namespaces() client.NamespaceInterface {
return
&
FakeNamespaces
{
Fake
:
c
}
}
func
(
c
*
Fake
)
Ex
perimental
()
client
.
ExtensionsInterface
{
func
(
c
*
Fake
)
Ex
tensions
()
client
.
ExtensionsInterface
{
return
&
FakeExperimental
{
c
}
}
...
...
pkg/controller/daemon/controller.go
View file @
493d2b69
...
...
@@ -97,10 +97,10 @@ func NewDaemonSetsController(kubeClient client.Interface, resyncPeriod controlle
dsc
.
dsStore
.
Store
,
dsc
.
dsController
=
framework
.
NewInformer
(
&
cache
.
ListWatch
{
ListFunc
:
func
()
(
runtime
.
Object
,
error
)
{
return
dsc
.
kubeClient
.
Ex
perimental
()
.
DaemonSets
(
api
.
NamespaceAll
)
.
List
(
labels
.
Everything
())
return
dsc
.
kubeClient
.
Ex
tensions
()
.
DaemonSets
(
api
.
NamespaceAll
)
.
List
(
labels
.
Everything
())
},
WatchFunc
:
func
(
rv
string
)
(
watch
.
Interface
,
error
)
{
return
dsc
.
kubeClient
.
Ex
perimental
()
.
DaemonSets
(
api
.
NamespaceAll
)
.
Watch
(
labels
.
Everything
(),
fields
.
Everything
(),
rv
)
return
dsc
.
kubeClient
.
Ex
tensions
()
.
DaemonSets
(
api
.
NamespaceAll
)
.
Watch
(
labels
.
Everything
(),
fields
.
Everything
(),
rv
)
},
},
&
extensions
.
DaemonSet
{},
...
...
@@ -460,7 +460,7 @@ func (dsc *DaemonSetsController) updateDaemonSetStatus(ds *extensions.DaemonSet)
}
}
err
=
storeDaemonSetStatus
(
dsc
.
kubeClient
.
Ex
perimental
()
.
DaemonSets
(
ds
.
Namespace
),
ds
,
desiredNumberScheduled
,
currentNumberScheduled
,
numberMisscheduled
)
err
=
storeDaemonSetStatus
(
dsc
.
kubeClient
.
Ex
tensions
()
.
DaemonSets
(
ds
.
Namespace
),
ds
,
desiredNumberScheduled
,
currentNumberScheduled
,
numberMisscheduled
)
if
err
!=
nil
{
glog
.
Errorf
(
"Error storing status for daemon set %+v: %v"
,
ds
,
err
)
}
...
...
pkg/controller/deployment/deployment_controller.go
View file @
493d2b69
...
...
@@ -45,7 +45,7 @@ func New(client client.Interface) *DeploymentController {
return
&
DeploymentController
{
client
:
client
,
expClient
:
client
.
Ex
perimental
(),
expClient
:
client
.
Ex
tensions
(),
eventRecorder
:
eventBroadcaster
.
NewRecorder
(
api
.
EventSource
{
Component
:
"deployment-controller"
}),
}
}
...
...
@@ -275,5 +275,5 @@ func (d *DeploymentController) scaleRC(rc *api.ReplicationController, newScale i
func
(
d
*
DeploymentController
)
updateDeployment
(
deployment
*
extensions
.
Deployment
)
(
*
extensions
.
Deployment
,
error
)
{
// TODO: Using client for now, update to use store when it is ready.
return
d
.
client
.
Ex
perimental
()
.
Deployments
(
deployment
.
ObjectMeta
.
Namespace
)
.
Update
(
deployment
)
return
d
.
client
.
Ex
tensions
()
.
Deployments
(
deployment
.
ObjectMeta
.
Namespace
)
.
Update
(
deployment
)
}
pkg/controller/job/controller.go
View file @
493d2b69
...
...
@@ -86,10 +86,10 @@ func NewJobController(kubeClient client.Interface, resyncPeriod controller.Resyn
jm
.
jobStore
.
Store
,
jm
.
jobController
=
framework
.
NewInformer
(
&
cache
.
ListWatch
{
ListFunc
:
func
()
(
runtime
.
Object
,
error
)
{
return
jm
.
kubeClient
.
Ex
perimental
()
.
Jobs
(
api
.
NamespaceAll
)
.
List
(
labels
.
Everything
(),
fields
.
Everything
())
return
jm
.
kubeClient
.
Ex
tensions
()
.
Jobs
(
api
.
NamespaceAll
)
.
List
(
labels
.
Everything
(),
fields
.
Everything
())
},
WatchFunc
:
func
(
rv
string
)
(
watch
.
Interface
,
error
)
{
return
jm
.
kubeClient
.
Ex
perimental
()
.
Jobs
(
api
.
NamespaceAll
)
.
Watch
(
labels
.
Everything
(),
fields
.
Everything
(),
rv
)
return
jm
.
kubeClient
.
Ex
tensions
()
.
Jobs
(
api
.
NamespaceAll
)
.
Watch
(
labels
.
Everything
(),
fields
.
Everything
(),
rv
)
},
},
&
extensions
.
Job
{},
...
...
@@ -431,7 +431,7 @@ func (jm *JobController) manageJob(activePods []*api.Pod, succeeded int, job *ex
}
func
(
jm
*
JobController
)
updateJobStatus
(
job
*
extensions
.
Job
)
error
{
_
,
err
:=
jm
.
kubeClient
.
Ex
perimental
()
.
Jobs
(
job
.
Namespace
)
.
UpdateStatus
(
job
)
_
,
err
:=
jm
.
kubeClient
.
Ex
tensions
()
.
Jobs
(
job
.
Namespace
)
.
UpdateStatus
(
job
)
return
err
}
...
...
pkg/controller/namespace/namespace_controller.go
View file @
493d2b69
...
...
@@ -194,23 +194,23 @@ func deleteAllContent(kubeClient client.Interface, experimentalMode bool, namesp
}
// If experimental mode, delete all experimental resources for the namespace.
if
experimentalMode
{
err
=
deleteHorizontalPodAutoscalers
(
kubeClient
.
Ex
perimental
(),
namespace
)
err
=
deleteHorizontalPodAutoscalers
(
kubeClient
.
Ex
tensions
(),
namespace
)
if
err
!=
nil
{
return
estimate
,
err
}
err
=
deleteDaemonSets
(
kubeClient
.
Ex
perimental
(),
namespace
)
err
=
deleteDaemonSets
(
kubeClient
.
Ex
tensions
(),
namespace
)
if
err
!=
nil
{
return
estimate
,
err
}
err
=
deleteJobs
(
kubeClient
.
Ex
perimental
(),
namespace
)
err
=
deleteJobs
(
kubeClient
.
Ex
tensions
(),
namespace
)
if
err
!=
nil
{
return
estimate
,
err
}
err
=
deleteDeployments
(
kubeClient
.
Ex
perimental
(),
namespace
)
err
=
deleteDeployments
(
kubeClient
.
Ex
tensions
(),
namespace
)
if
err
!=
nil
{
return
estimate
,
err
}
err
=
deleteIngress
(
kubeClient
.
Ex
perimental
(),
namespace
)
err
=
deleteIngress
(
kubeClient
.
Ex
tensions
(),
namespace
)
if
err
!=
nil
{
return
estimate
,
err
}
...
...
pkg/controller/podautoscaler/horizontal.go
View file @
493d2b69
...
...
@@ -71,7 +71,7 @@ func (a *HorizontalController) Run(syncPeriod time.Duration) {
func
(
a
*
HorizontalController
)
reconcileAutoscaler
(
hpa
extensions
.
HorizontalPodAutoscaler
)
error
{
reference
:=
fmt
.
Sprintf
(
"%s/%s/%s"
,
hpa
.
Spec
.
ScaleRef
.
Kind
,
hpa
.
Spec
.
ScaleRef
.
Namespace
,
hpa
.
Spec
.
ScaleRef
.
Name
)
scale
,
err
:=
a
.
client
.
Ex
perimental
()
.
Scales
(
hpa
.
Spec
.
ScaleRef
.
Namespace
)
.
Get
(
hpa
.
Spec
.
ScaleRef
.
Kind
,
hpa
.
Spec
.
ScaleRef
.
Name
)
scale
,
err
:=
a
.
client
.
Ex
tensions
()
.
Scales
(
hpa
.
Spec
.
ScaleRef
.
Namespace
)
.
Get
(
hpa
.
Spec
.
ScaleRef
.
Kind
,
hpa
.
Spec
.
ScaleRef
.
Name
)
if
err
!=
nil
{
a
.
eventRecorder
.
Event
(
&
hpa
,
"FailedGetScale"
,
err
.
Error
())
return
fmt
.
Errorf
(
"failed to query scale subresource for %s: %v"
,
reference
,
err
)
...
...
@@ -125,7 +125,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodA
if
rescale
{
scale
.
Spec
.
Replicas
=
desiredReplicas
_
,
err
=
a
.
client
.
Ex
perimental
()
.
Scales
(
hpa
.
Namespace
)
.
Update
(
hpa
.
Spec
.
ScaleRef
.
Kind
,
scale
)
_
,
err
=
a
.
client
.
Ex
tensions
()
.
Scales
(
hpa
.
Namespace
)
.
Update
(
hpa
.
Spec
.
ScaleRef
.
Kind
,
scale
)
if
err
!=
nil
{
a
.
eventRecorder
.
Eventf
(
&
hpa
,
"FailedRescale"
,
"New size: %d; error: %v"
,
desiredReplicas
,
err
.
Error
())
return
fmt
.
Errorf
(
"failed to rescale %s: %v"
,
reference
,
err
)
...
...
@@ -147,7 +147,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodA
hpa
.
Status
.
LastScaleTimestamp
=
&
now
}
_
,
err
=
a
.
client
.
Ex
perimental
()
.
HorizontalPodAutoscalers
(
hpa
.
Namespace
)
.
UpdateStatus
(
&
hpa
)
_
,
err
=
a
.
client
.
Ex
tensions
()
.
HorizontalPodAutoscalers
(
hpa
.
Namespace
)
.
UpdateStatus
(
&
hpa
)
if
err
!=
nil
{
a
.
eventRecorder
.
Event
(
&
hpa
,
"FailedUpdateStatus"
,
err
.
Error
())
return
fmt
.
Errorf
(
"failed to update status for %s: %v"
,
hpa
.
Name
,
err
)
...
...
@@ -157,7 +157,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodA
func
(
a
*
HorizontalController
)
reconcileAutoscalers
()
error
{
ns
:=
api
.
NamespaceAll
list
,
err
:=
a
.
client
.
Ex
perimental
()
.
HorizontalPodAutoscalers
(
ns
)
.
List
(
labels
.
Everything
(),
fields
.
Everything
())
list
,
err
:=
a
.
client
.
Ex
tensions
()
.
HorizontalPodAutoscalers
(
ns
)
.
List
(
labels
.
Everything
(),
fields
.
Everything
())
if
err
!=
nil
{
return
fmt
.
Errorf
(
"error listing nodes: %v"
,
err
)
}
...
...
pkg/kubectl/cmd/apiversions.go
View file @
493d2b69
...
...
@@ -58,7 +58,7 @@ func RunApiVersions(f *cmdutil.Factory, w io.Writer) error {
}
var
expAPIVersions
*
unversioned
.
APIVersions
expAPIVersions
,
err
=
client
.
Ex
perimental
()
.
ServerAPIVersions
()
expAPIVersions
,
err
=
client
.
Ex
tensions
()
.
ServerAPIVersions
()
fmt
.
Fprintf
(
w
,
"Available Server Api Versions: %#v
\n
"
,
*
apiVersions
)
if
err
==
nil
{
...
...
pkg/kubectl/describe.go
View file @
493d2b69
...
...
@@ -870,7 +870,7 @@ type JobDescriber struct {
}
func
(
d
*
JobDescriber
)
Describe
(
namespace
,
name
string
)
(
string
,
error
)
{
job
,
err
:=
d
.
client
.
Ex
perimental
()
.
Jobs
(
namespace
)
.
Get
(
name
)
job
,
err
:=
d
.
client
.
Ex
tensions
()
.
Jobs
(
namespace
)
.
Get
(
name
)
if
err
!=
nil
{
return
""
,
err
}
...
...
@@ -910,7 +910,7 @@ type DaemonSetDescriber struct {
}
func
(
d
*
DaemonSetDescriber
)
Describe
(
namespace
,
name
string
)
(
string
,
error
)
{
dc
:=
d
.
Ex
perimental
()
.
DaemonSets
(
namespace
)
dc
:=
d
.
Ex
tensions
()
.
DaemonSets
(
namespace
)
pc
:=
d
.
Pods
(
namespace
)
daemon
,
err
:=
dc
.
Get
(
name
)
...
...
@@ -1241,7 +1241,7 @@ type HorizontalPodAutoscalerDescriber struct {
}
func
(
d
*
HorizontalPodAutoscalerDescriber
)
Describe
(
namespace
,
name
string
)
(
string
,
error
)
{
hpa
,
err
:=
d
.
client
.
Ex
perimental
()
.
HorizontalPodAutoscalers
(
namespace
)
.
Get
(
name
)
hpa
,
err
:=
d
.
client
.
Ex
tensions
()
.
HorizontalPodAutoscalers
(
namespace
)
.
Get
(
name
)
if
err
!=
nil
{
return
""
,
err
}
...
...
@@ -1407,7 +1407,7 @@ type DeploymentDescriber struct {
}
func
(
dd
*
DeploymentDescriber
)
Describe
(
namespace
,
name
string
)
(
string
,
error
)
{
d
,
err
:=
dd
.
Ex
perimental
()
.
Deployments
(
namespace
)
.
Get
(
name
)
d
,
err
:=
dd
.
Ex
tensions
()
.
Deployments
(
namespace
)
.
Get
(
name
)
if
err
!=
nil
{
return
""
,
err
}
...
...
pkg/kubectl/scale.go
View file @
493d2b69
...
...
@@ -202,7 +202,7 @@ func (scaler *ReplicationControllerScaler) Scale(namespace, name string, newSize
// ScaleSimple is responsible for updating job's parallelism.
func
(
scaler
*
JobScaler
)
ScaleSimple
(
namespace
,
name
string
,
preconditions
*
ScalePrecondition
,
newSize
uint
)
error
{
job
,
err
:=
scaler
.
c
.
Ex
perimental
()
.
Jobs
(
namespace
)
.
Get
(
name
)
job
,
err
:=
scaler
.
c
.
Ex
tensions
()
.
Jobs
(
namespace
)
.
Get
(
name
)
if
err
!=
nil
{
return
ControllerScaleError
{
ControllerScaleGetFailure
,
"Unknown"
,
err
}
}
...
...
@@ -213,7 +213,7 @@ func (scaler *JobScaler) ScaleSimple(namespace, name string, preconditions *Scal
}
parallelism
:=
int
(
newSize
)
job
.
Spec
.
Parallelism
=
&
parallelism
if
_
,
err
:=
scaler
.
c
.
Ex
perimental
()
.
Jobs
(
namespace
)
.
Update
(
job
);
err
!=
nil
{
if
_
,
err
:=
scaler
.
c
.
Ex
tensions
()
.
Jobs
(
namespace
)
.
Update
(
job
);
err
!=
nil
{
if
errors
.
IsInvalid
(
err
)
{
return
ControllerScaleError
{
ControllerScaleUpdateInvalidFailure
,
job
.
ResourceVersion
,
err
}
}
...
...
@@ -239,7 +239,7 @@ func (scaler *JobScaler) Scale(namespace, name string, newSize uint, preconditio
return
err
}
if
waitForReplicas
!=
nil
{
job
,
err
:=
scaler
.
c
.
Ex
perimental
()
.
Jobs
(
namespace
)
.
Get
(
name
)
job
,
err
:=
scaler
.
c
.
Ex
tensions
()
.
Jobs
(
namespace
)
.
Get
(
name
)
if
err
!=
nil
{
return
err
}
...
...
pkg/kubectl/scale_test.go
View file @
493d2b69
...
...
@@ -83,7 +83,7 @@ type ErrorExtensionsClient struct {
invalid
bool
}
func
(
c
*
ErrorExtensionsClient
)
Ex
perimental
()
client
.
ExtensionsInterface
{
func
(
c
*
ErrorExtensionsClient
)
Ex
tensions
()
client
.
ExtensionsInterface
{
return
&
ErrorJobClient
{
testclient
.
FakeExperimental
{
&
c
.
Fake
},
c
.
invalid
}
}
...
...
pkg/kubectl/stop.go
View file @
493d2b69
...
...
@@ -182,7 +182,7 @@ func (reaper *ReplicationControllerReaper) Stop(namespace, name string, timeout
}
func
(
reaper
*
DaemonSetReaper
)
Stop
(
namespace
,
name
string
,
timeout
time
.
Duration
,
gracePeriod
*
api
.
DeleteOptions
)
(
string
,
error
)
{
ds
,
err
:=
reaper
.
Ex
perimental
()
.
DaemonSets
(
namespace
)
.
Get
(
name
)
ds
,
err
:=
reaper
.
Ex
tensions
()
.
DaemonSets
(
namespace
)
.
Get
(
name
)
if
err
!=
nil
{
return
""
,
err
}
...
...
@@ -197,13 +197,13 @@ func (reaper *DaemonSetReaper) Stop(namespace, name string, timeout time.Duratio
// force update to avoid version conflict
ds
.
ResourceVersion
=
""
if
ds
,
err
=
reaper
.
Ex
perimental
()
.
DaemonSets
(
namespace
)
.
Update
(
ds
);
err
!=
nil
{
if
ds
,
err
=
reaper
.
Ex
tensions
()
.
DaemonSets
(
namespace
)
.
Update
(
ds
);
err
!=
nil
{
return
""
,
err
}
// Wait for the daemon set controller to kill all the daemon pods.
if
err
:=
wait
.
Poll
(
reaper
.
pollInterval
,
reaper
.
timeout
,
func
()
(
bool
,
error
)
{
updatedDS
,
err
:=
reaper
.
Ex
perimental
()
.
DaemonSets
(
namespace
)
.
Get
(
name
)
updatedDS
,
err
:=
reaper
.
Ex
tensions
()
.
DaemonSets
(
namespace
)
.
Get
(
name
)
if
err
!=
nil
{
return
false
,
nil
}
...
...
@@ -212,14 +212,14 @@ func (reaper *DaemonSetReaper) Stop(namespace, name string, timeout time.Duratio
return
""
,
err
}
if
err
:=
reaper
.
Ex
perimental
()
.
DaemonSets
(
namespace
)
.
Delete
(
name
);
err
!=
nil
{
if
err
:=
reaper
.
Ex
tensions
()
.
DaemonSets
(
namespace
)
.
Delete
(
name
);
err
!=
nil
{
return
""
,
err
}
return
fmt
.
Sprintf
(
"%s stopped"
,
name
),
nil
}
func
(
reaper
*
JobReaper
)
Stop
(
namespace
,
name
string
,
timeout
time
.
Duration
,
gracePeriod
*
api
.
DeleteOptions
)
(
string
,
error
)
{
jobs
:=
reaper
.
Ex
perimental
()
.
Jobs
(
namespace
)
jobs
:=
reaper
.
Ex
tensions
()
.
Jobs
(
namespace
)
scaler
,
err
:=
ScalerFor
(
"Job"
,
*
reaper
)
if
err
!=
nil
{
return
""
,
err
...
...
test/e2e/horizontal_pod_autoscaling.go
View file @
493d2b69
...
...
@@ -169,7 +169,7 @@ func createCPUHorizontalPodAutoscaler(rc *ResourceConsumer, cpu string) {
Target
:
extensions
.
ResourceConsumption
{
Resource
:
api
.
ResourceCPU
,
Quantity
:
resource
.
MustParse
(
cpu
)},
},
}
_
,
errHPA
:=
rc
.
framework
.
Client
.
Ex
perimental
()
.
HorizontalPodAutoscalers
(
rc
.
framework
.
Namespace
.
Name
)
.
Create
(
hpa
)
_
,
errHPA
:=
rc
.
framework
.
Client
.
Ex
tensions
()
.
HorizontalPodAutoscalers
(
rc
.
framework
.
Namespace
.
Name
)
.
Create
(
hpa
)
expectNoError
(
errHPA
)
}
...
...
@@ -192,6 +192,6 @@ func createMemoryHorizontalPodAutoscaler(rc *ResourceConsumer, memory string) {
Target
:
extensions
.
ResourceConsumption
{
Resource
:
api
.
ResourceMemory
,
Quantity
:
resource
.
MustParse
(
memory
+
"M"
)},
},
}
_
,
errHPA
:=
rc
.
framework
.
Client
.
Ex
perimental
()
.
HorizontalPodAutoscalers
(
rc
.
framework
.
Namespace
.
Name
)
.
Create
(
hpa
)
_
,
errHPA
:=
rc
.
framework
.
Client
.
Ex
tensions
()
.
HorizontalPodAutoscalers
(
rc
.
framework
.
Namespace
.
Name
)
.
Create
(
hpa
)
expectNoError
(
errHPA
)
}
test/e2e/job.go
View file @
493d2b69
...
...
@@ -97,7 +97,7 @@ var _ = Describe("Job", func() {
By
(
"Ensuring job shows many failures"
)
err
=
wait
.
Poll
(
poll
,
jobTimeout
,
func
()
(
bool
,
error
)
{
curr
,
err
:=
f
.
Client
.
Ex
perimental
()
.
Jobs
(
f
.
Namespace
.
Name
)
.
Get
(
job
.
Name
)
curr
,
err
:=
f
.
Client
.
Ex
tensions
()
.
Jobs
(
f
.
Namespace
.
Name
)
.
Get
(
job
.
Name
)
if
err
!=
nil
{
return
false
,
err
}
...
...
@@ -176,7 +176,7 @@ var _ = Describe("Job", func() {
Expect
(
err
)
.
NotTo
(
HaveOccurred
())
By
(
"Ensuring job was deleted"
)
_
,
err
=
f
.
Client
.
Ex
perimental
()
.
Jobs
(
f
.
Namespace
.
Name
)
.
Get
(
job
.
Name
)
_
,
err
=
f
.
Client
.
Ex
tensions
()
.
Jobs
(
f
.
Namespace
.
Name
)
.
Get
(
job
.
Name
)
Expect
(
err
)
.
To
(
HaveOccurred
())
Expect
(
errors
.
IsNotFound
(
err
))
.
To
(
BeTrue
())
})
...
...
@@ -224,11 +224,11 @@ func newTestJob(behavior, name string, rPol api.RestartPolicy, parallelism, comp
}
func
createJob
(
c
*
client
.
Client
,
ns
string
,
job
*
extensions
.
Job
)
(
*
extensions
.
Job
,
error
)
{
return
c
.
Ex
perimental
()
.
Jobs
(
ns
)
.
Create
(
job
)
return
c
.
Ex
tensions
()
.
Jobs
(
ns
)
.
Create
(
job
)
}
func
deleteJob
(
c
*
client
.
Client
,
ns
,
name
string
)
error
{
return
c
.
Ex
perimental
()
.
Jobs
(
ns
)
.
Delete
(
name
,
api
.
NewDeleteOptions
(
0
))
return
c
.
Ex
tensions
()
.
Jobs
(
ns
)
.
Delete
(
name
,
api
.
NewDeleteOptions
(
0
))
}
// Wait for all pods to become Running. Only use when pods will run for a long time, or it will be racy.
...
...
@@ -252,7 +252,7 @@ func waitForAllPodsRunning(c *client.Client, ns, jobName string, parallelism int
// Wait for job to reach completions.
func
waitForJobFinish
(
c
*
client
.
Client
,
ns
,
jobName
string
,
completions
int
)
error
{
return
wait
.
Poll
(
poll
,
jobTimeout
,
func
()
(
bool
,
error
)
{
curr
,
err
:=
c
.
Ex
perimental
()
.
Jobs
(
ns
)
.
Get
(
jobName
)
curr
,
err
:=
c
.
Ex
tensions
()
.
Jobs
(
ns
)
.
Get
(
jobName
)
if
err
!=
nil
{
return
false
,
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