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
f3441a5c
Commit
f3441a5c
authored
May 11, 2018
by
ravisantoshgudimetla
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update e2e to use priorityClass beta
parent
0c3edc6f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
11 deletions
+10
-11
create_priorityclass_test.go
pkg/kubectl/cmd/create/create_priorityclass_test.go
+1
-1
cluster_size_autoscaling.go
test/e2e/autoscaling/cluster_size_autoscaling.go
+3
-3
preemption.go
test/e2e/scheduling/preemption.go
+4
-5
print_test.go
test/integration/apiserver/print_test.go
+2
-2
No files found.
pkg/kubectl/cmd/create/create_priorityclass_test.go
View file @
f3441a5c
...
@@ -38,7 +38,7 @@ func TestCreatePriorityClass(t *testing.T) {
...
@@ -38,7 +38,7 @@ func TestCreatePriorityClass(t *testing.T) {
ns
:=
legacyscheme
.
Codecs
ns
:=
legacyscheme
.
Codecs
tf
.
Client
=
&
fake
.
RESTClient
{
tf
.
Client
=
&
fake
.
RESTClient
{
GroupVersion
:
schema
.
GroupVersion
{
Group
:
"scheduling.k8s.io"
,
Version
:
"v1
alph
a1"
},
GroupVersion
:
schema
.
GroupVersion
{
Group
:
"scheduling.k8s.io"
,
Version
:
"v1
bet
a1"
},
NegotiatedSerializer
:
ns
,
NegotiatedSerializer
:
ns
,
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
Client
:
fake
.
CreateHTTPClient
(
func
(
req
*
http
.
Request
)
(
*
http
.
Response
,
error
)
{
return
&
http
.
Response
{
return
&
http
.
Response
{
...
...
test/e2e/autoscaling/cluster_size_autoscaling.go
View file @
f3441a5c
...
@@ -30,7 +30,7 @@ import (
...
@@ -30,7 +30,7 @@ import (
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
policy
"k8s.io/api/policy/v1beta1"
policy
"k8s.io/api/policy/v1beta1"
"k8s.io/api/scheduling/v1alph
a1"
schedulerapi
"k8s.io/api/scheduling/v1bet
a1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/errors"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/fields"
...
@@ -2013,13 +2013,13 @@ func createPriorityClasses(f *framework.Framework) func() {
...
@@ -2013,13 +2013,13 @@ func createPriorityClasses(f *framework.Framework) func() {
highPriorityClassName
:
1000
,
highPriorityClassName
:
1000
,
}
}
for
className
,
priority
:=
range
priorityClasses
{
for
className
,
priority
:=
range
priorityClasses
{
_
,
err
:=
f
.
ClientSet
.
SchedulingV1
alpha1
()
.
PriorityClasses
()
.
Create
(
&
v1alpha1
.
PriorityClass
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
className
},
Value
:
priority
})
_
,
err
:=
f
.
ClientSet
.
SchedulingV1
beta1
()
.
PriorityClasses
()
.
Create
(
&
schedulerapi
.
PriorityClass
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
className
},
Value
:
priority
})
Expect
(
err
==
nil
||
errors
.
IsAlreadyExists
(
err
))
.
To
(
Equal
(
true
))
Expect
(
err
==
nil
||
errors
.
IsAlreadyExists
(
err
))
.
To
(
Equal
(
true
))
}
}
return
func
()
{
return
func
()
{
for
className
:=
range
priorityClasses
{
for
className
:=
range
priorityClasses
{
f
.
ClientSet
.
SchedulingV1
alph
a1
()
.
PriorityClasses
()
.
Delete
(
className
,
nil
)
f
.
ClientSet
.
SchedulingV1
bet
a1
()
.
PriorityClasses
()
.
Delete
(
className
,
nil
)
}
}
}
}
}
}
test/e2e/scheduling/preemption.go
View file @
f3441a5c
...
@@ -21,7 +21,7 @@ import (
...
@@ -21,7 +21,7 @@ import (
"time"
"time"
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
"k8s.io/api/scheduling/v1alph
a1"
schedulerapi
"k8s.io/api/scheduling/v1bet
a1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/api/resource"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
...
@@ -51,12 +51,11 @@ var _ = SIGDescribe("SchedulerPreemption [Serial] [Feature:PodPreemption]", func
...
@@ -51,12 +51,11 @@ var _ = SIGDescribe("SchedulerPreemption [Serial] [Feature:PodPreemption]", func
cs
=
f
.
ClientSet
cs
=
f
.
ClientSet
ns
=
f
.
Namespace
.
Name
ns
=
f
.
Namespace
.
Name
nodeList
=
&
v1
.
NodeList
{}
nodeList
=
&
v1
.
NodeList
{}
_
,
err
:=
f
.
ClientSet
.
SchedulingV1beta1
()
.
PriorityClasses
()
.
Create
(
&
schedulerapi
.
PriorityClass
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
highPriorityClassName
},
Value
:
highPriority
})
_
,
err
:=
f
.
ClientSet
.
SchedulingV1alpha1
()
.
PriorityClasses
()
.
Create
(
&
v1alpha1
.
PriorityClass
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
highPriorityClassName
},
Value
:
highPriority
})
Expect
(
err
==
nil
||
errors
.
IsAlreadyExists
(
err
))
.
To
(
Equal
(
true
))
Expect
(
err
==
nil
||
errors
.
IsAlreadyExists
(
err
))
.
To
(
Equal
(
true
))
_
,
err
=
f
.
ClientSet
.
SchedulingV1
alpha1
()
.
PriorityClasses
()
.
Create
(
&
v1alpha1
.
PriorityClass
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
mediumPriorityClassName
},
Value
:
mediumPriority
})
_
,
err
=
f
.
ClientSet
.
SchedulingV1
beta1
()
.
PriorityClasses
()
.
Create
(
&
schedulerapi
.
PriorityClass
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
mediumPriorityClassName
},
Value
:
mediumPriority
})
Expect
(
err
==
nil
||
errors
.
IsAlreadyExists
(
err
))
.
To
(
Equal
(
true
))
Expect
(
err
==
nil
||
errors
.
IsAlreadyExists
(
err
))
.
To
(
Equal
(
true
))
_
,
err
=
f
.
ClientSet
.
SchedulingV1
alpha1
()
.
PriorityClasses
()
.
Create
(
&
v1alpha1
.
PriorityClass
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
lowPriorityClassName
},
Value
:
lowPriority
})
_
,
err
=
f
.
ClientSet
.
SchedulingV1
beta1
()
.
PriorityClasses
()
.
Create
(
&
schedulerapi
.
PriorityClass
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
lowPriorityClassName
},
Value
:
lowPriority
})
Expect
(
err
==
nil
||
errors
.
IsAlreadyExists
(
err
))
.
To
(
Equal
(
true
))
Expect
(
err
==
nil
||
errors
.
IsAlreadyExists
(
err
))
.
To
(
Equal
(
true
))
framework
.
WaitForAllNodesHealthy
(
cs
,
time
.
Minute
)
framework
.
WaitForAllNodesHealthy
(
cs
,
time
.
Minute
)
...
...
test/integration/apiserver/print_test.go
View file @
f3441a5c
...
@@ -28,7 +28,7 @@ import (
...
@@ -28,7 +28,7 @@ import (
batchv2alpha1
"k8s.io/api/batch/v2alpha1"
batchv2alpha1
"k8s.io/api/batch/v2alpha1"
rbacv1alpha1
"k8s.io/api/rbac/v1alpha1"
rbacv1alpha1
"k8s.io/api/rbac/v1alpha1"
schedul
ingv1alpha1
"k8s.io/api/scheduling/v1alph
a1"
schedul
erapi
"k8s.io/api/scheduling/v1bet
a1"
settingsv1alpha1
"k8s.io/api/settings/v1alpha1"
settingsv1alpha1
"k8s.io/api/settings/v1alpha1"
storagev1alpha1
"k8s.io/api/storage/v1alpha1"
storagev1alpha1
"k8s.io/api/storage/v1alpha1"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/api/meta"
...
@@ -140,7 +140,7 @@ func TestServerSidePrint(t *testing.T) {
...
@@ -140,7 +140,7 @@ func TestServerSidePrint(t *testing.T) {
batchv2alpha1
.
SchemeGroupVersion
,
batchv2alpha1
.
SchemeGroupVersion
,
rbacv1alpha1
.
SchemeGroupVersion
,
rbacv1alpha1
.
SchemeGroupVersion
,
settingsv1alpha1
.
SchemeGroupVersion
,
settingsv1alpha1
.
SchemeGroupVersion
,
schedul
ingv1alpha1
.
SchemeGroupVersion
,
schedul
erapi
.
SchemeGroupVersion
,
storagev1alpha1
.
SchemeGroupVersion
)
storagev1alpha1
.
SchemeGroupVersion
)
defer
closeFn
()
defer
closeFn
()
...
...
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