github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 09:52:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99400 from wojtek-t/ttl_after_finished_test

Browse Source 
Move TTLAfterFinished test to appropriate SIG
This commit is contained in:
Kubernetes Prow Robot 2021-02-24 08:53:02 -08:00 committed by GitHub
commit 8f15f7cf5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/apps/BUILD
View File

@ -14,6 +14,7 @@ go_library(
"rc.go", "rc.go",
"replica_set.go", "replica_set.go",
"statefulset.go", "statefulset.go",
"ttl_after_finished.go",
"types.go", "types.go",
"wait.go", "wait.go",
], ],
@ -32,6 +33,7 @@ go_library(
"//pkg/controller/replicaset:go_default_library", "//pkg/controller/replicaset:go_default_library",
"//pkg/controller/replication:go_default_library", "//pkg/controller/replication:go_default_library",
"//pkg/scheduler/apis/config:go_default_library", "//pkg/scheduler/apis/config:go_default_library",
"//pkg/util/slice:go_default_library",
"//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library",
"//staging/src/k8s.io/api/autoscaling/v1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
"//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library",

14
test/e2e/node/ttlafterfinished.go → test/e2e/apps/ttl_after_finished.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package node package apps
import ( import (
"context" "context"
@ -40,7 +40,7 @@ const (
JobTimeout = 15 * time.Minute JobTimeout = 15 * time.Minute
) )
var _ = framework.KubeDescribe("[Feature:TTLAfterFinished][NodeAlphaFeature:TTLAfterFinished]", func() { var _ = SIGDescribe("[Feature:TTLAfterFinished]", func() {
f := framework.NewDefaultFramework("ttlafterfinished") f := framework.NewDefaultFramework("ttlafterfinished")
ginkgo.It("job should be deleted once it finishes after TTL seconds", func() { ginkgo.It("job should be deleted once it finishes after TTL seconds", func() {
@ -93,9 +93,9 @@ func testFinishedJob(f *framework.Framework) {
framework.Logf("Check Job's deletionTimestamp and compare with the time when the Job finished") framework.Logf("Check Job's deletionTimestamp and compare with the time when the Job finished")
job, err = e2ejob.GetJob(c, ns, job.Name) job, err = e2ejob.GetJob(c, ns, job.Name)
framework.ExpectNoError(err) framework.ExpectNoError(err)
finishTime := FinishTime(job) jobFinishTime := finishTime(job)
finishTimeUTC := finishTime.UTC() finishTimeUTC := jobFinishTime.UTC()
framework.ExpectNotEqual(finishTime.IsZero(), true) framework.ExpectNotEqual(jobFinishTime.IsZero(), true)
deleteAtUTC := job.ObjectMeta.DeletionTimestamp.UTC() deleteAtUTC := job.ObjectMeta.DeletionTimestamp.UTC()
framework.ExpectNotEqual(deleteAtUTC, nil) framework.ExpectNotEqual(deleteAtUTC, nil)
@ -104,8 +104,8 @@ func testFinishedJob(f *framework.Framework) {
framework.ExpectEqual(deleteAtUTC.Before(expireAtUTC), false) framework.ExpectEqual(deleteAtUTC.Before(expireAtUTC), false)
} }
// FinishTime returns finish time of the specified job. // finishTime returns finish time of the specified job.
func FinishTime(finishedJob *batchv1.Job) metav1.Time { func finishTime(finishedJob *batchv1.Job) metav1.Time {
var finishTime metav1.Time var finishTime metav1.Time
for _, c := range finishedJob.Status.Conditions { for _, c := range finishedJob.Status.Conditions {
if (c.Type == batchv1.JobComplete || c.Type == batchv1.JobFailed) && c.Status == v1.ConditionTrue { if (c.Type == batchv1.JobComplete || c.Type == batchv1.JobFailed) && c.Status == v1.ConditionTrue {

4
test/e2e/node/BUILD
View File

@ -19,7 +19,6 @@ go_library(
"security_context.go", "security_context.go",
"ssh.go", "ssh.go",
"taints.go", "taints.go",
"ttlafterfinished.go",
], ],
importpath = "k8s.io/kubernetes/test/e2e/node", importpath = "k8s.io/kubernetes/test/e2e/node",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
@ -27,8 +26,6 @@ go_library(
"//pkg/cluster/ports:go_default_library", "//pkg/cluster/ports:go_default_library",
"//pkg/kubelet/events:go_default_library", "//pkg/kubelet/events:go_default_library",
"//pkg/kubelet/runtimeclass/testing:go_default_library", "//pkg/kubelet/runtimeclass/testing:go_default_library",
"//pkg/util/slice:go_default_library",
"//staging/src/k8s.io/api/batch/v1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/api/node/v1:go_default_library", "//staging/src/k8s.io/api/node/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
@ -45,7 +42,6 @@ go_library(
"//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
"//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library",
"//test/e2e/framework:go_default_library", "//test/e2e/framework:go_default_library",
"//test/e2e/framework/job:go_default_library",
"//test/e2e/framework/kubectl:go_default_library", "//test/e2e/framework/kubectl:go_default_library",
"//test/e2e/framework/kubelet:go_default_library", "//test/e2e/framework/kubelet:go_default_library",
"//test/e2e/framework/node:go_default_library", "//test/e2e/framework/node:go_default_library",