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
ba9e93cb
Unverified
Commit
ba9e93cb
authored
Aug 31, 2017
by
Shyam Jeedigunta
Committed by
Maciej Szulik
Sep 03, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct CronJob group version at remaining places
parent
6962427b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
garbage_collector.go
test/e2e/apimachinery/garbage_collector.go
+2
-2
kubectl.go
test/e2e/kubectl/kubectl.go
+1
-1
No files found.
test/e2e/apimachinery/garbage_collector.go
View file @
ba9e93cb
...
...
@@ -218,7 +218,7 @@ func verifyRemainingCronJobsJobsPods(f *framework.Framework, clientSet clientset
cjNum
,
jobNum
,
podNum
int
)
(
bool
,
error
)
{
var
ret
=
true
cronJobs
,
err
:=
f
.
ClientSet
.
BatchV
2alph
a1
()
.
CronJobs
(
f
.
Namespace
.
Name
)
.
List
(
metav1
.
ListOptions
{})
cronJobs
,
err
:=
f
.
ClientSet
.
BatchV
1bet
a1
()
.
CronJobs
(
f
.
Namespace
.
Name
)
.
List
(
metav1
.
ListOptions
{})
if
err
!=
nil
{
return
false
,
fmt
.
Errorf
(
"Failed to list cronjobs: %v"
,
err
)
}
...
...
@@ -957,7 +957,7 @@ var _ = SIGDescribe("Garbage collector", func() {
}
By
(
"Delete the cronjob"
)
if
err
:=
f
.
ClientSet
.
BatchV
2alph
a1
()
.
CronJobs
(
f
.
Namespace
.
Name
)
.
Delete
(
cronJob
.
Name
,
getBackgroundOptions
());
err
!=
nil
{
if
err
:=
f
.
ClientSet
.
BatchV
1bet
a1
()
.
CronJobs
(
f
.
Namespace
.
Name
)
.
Delete
(
cronJob
.
Name
,
getBackgroundOptions
());
err
!=
nil
{
framework
.
Failf
(
"Failed to delete the CronJob: %v"
,
err
)
}
By
(
"Verify if cronjob does not leave jobs nor pods behind"
)
...
...
test/e2e/kubectl/kubectl.go
View file @
ba9e93cb
...
...
@@ -244,7 +244,7 @@ var _ = SIGDescribe("Kubectl alpha client", func() {
framework
.
RunKubectlOrDie
(
"run"
,
cjName
,
"--restart=OnFailure"
,
"--generator=cronjob/v2alpha1"
,
"--schedule="
+
schedule
,
"--image="
+
busyboxImage
,
nsFlag
)
By
(
"verifying the CronJob "
+
cjName
+
" was created"
)
sj
,
err
:=
c
.
BatchV
2alph
a1
()
.
CronJobs
(
ns
)
.
Get
(
cjName
,
metav1
.
GetOptions
{})
sj
,
err
:=
c
.
BatchV
1bet
a1
()
.
CronJobs
(
ns
)
.
Get
(
cjName
,
metav1
.
GetOptions
{})
if
err
!=
nil
{
framework
.
Failf
(
"Failed getting CronJob %s: %v"
,
cjName
,
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