Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test/e2e/framework: remove direct dependency to k8s.io/kubernetes/pkg/controller #89506

Merged
merged 1 commit into from Mar 31, 2020
Merged

test/e2e/framework: remove direct dependency to k8s.io/kubernetes/pkg/controller #89506

merged 1 commit into from Mar 31, 2020

Conversation

tanjunchen
Copy link
Member

What type of PR is this?
/kind cleanup

What this PR does / why we need it:

Which issue(s) this PR fixes:

ref:#74352
Special notes for your reviewer:

Does this PR introduce a user-facing change?:

None

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

None

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 26, 2020
@tanjunchen
Copy link
Member Author

/priority important-longterm
/kind cleanup

/cc @neolit123 @oomichi
Thank you very much.

@k8s-ci-robot k8s-ci-robot added priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Mar 26, 2020
@k8s-ci-robot k8s-ci-robot added area/e2e-test-framework Issues or PRs related to refactoring the kubernetes e2e test framework area/test sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 26, 2020
tanjunchen
tanjunchen commented Mar 26, 2020
View reviewed changes
test/e2e/framework/resource/resources.go Outdated
@@ -175,6 +175,26 @@ func waitForPodsInactive(ps *testutils.PodStore, interval, timeout time.Duration
return err
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

k8s.io/kubernetes/pkg/controller source code.

// FilterActivePods returns pods that have not terminated.
func FilterActivePods(pods []*v1.Pod) []*v1.Pod {
	var result []*v1.Pod
	for _, p := range pods {
		if IsPodActive(p) {
			result = append(result, p)
		} else {
			klog.V(4).Infof("Ignoring inactive pod %v/%v in state %v, deletion time %v",
				p.Namespace, p.Name, p.Status.Phase, p.DeletionTimestamp)
		}
	}
	return result
}

func IsPodActive(p *v1.Pod) bool {
	return v1.PodSucceeded != p.Status.Phase &&
		v1.PodFailed != p.Status.Phase &&
		p.DeletionTimestamp == nil
}

@alejandrox1
Copy link
Contributor

🤔 CI...
/retest

alejandrox1
alejandrox1 suggested changes Mar 26, 2020
View reviewed changes
Copy link
Contributor

@alejandrox1 alejandrox1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @tanjunchen

test/e2e/framework/resource/resources.go Outdated
Comment on lines 180 to 184
isPodActive := func(p *v1.Pod) bool {
return v1.PodSucceeded != p.Status.Phase &&
v1.PodFailed != p.Status.Phase &&
p.DeletionTimestamp == nil
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's leave this one as a separate function.
It is handy and it is used in some other e2e tests.
So we can get this framework onto staging and add another utility function to the e2epod pkg.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure

test/e2e/framework/resource/resources.go Outdated
@@ -175,6 +175,26 @@ func waitForPodsInactive(ps *testutils.PodStore, interval, timeout time.Duration
return err
}

// filterActivePods returns pods that have not terminated.
func filterActivePods(pods []*v1.Pod) []*v1.Pod {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function seems to only be used (in k/k/test) here.
Though given the name and the fact that it uses IsPodActive() (which would definitely fit in into the e2epod pkg), I wonder whether we should keep it here, e2eresource, or move it over to e2epod.
I vote for e2epod just based on the sort of logic.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 for e2epod 😄

@tanjunchen
Copy link
Member Author

/retest

@tanjunchen
Copy link
Member Author

/test pull-kubernetes-e2e-gce-100-performance

@tanjunchen
Copy link
Member Author

/cc @alejandrox1
updated

@oomichi
Copy link
Member

oomichi commented Mar 27, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 27, 2020
SataQiu
SataQiu reviewed Mar 29, 2020
View reviewed changes
Copy link
Member

@SataQiu SataQiu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work!
/lgtm

@oomichi
Copy link
Member

oomichi commented Mar 30, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: oomichi, tanjunchen

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 30, 2020
@k8s-ci-robot k8s-ci-robot merged commit 52c2ff6 into kubernetes:master Mar 31, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Mar 31, 2020
@tanjunchen tanjunchen deleted the remove-dependency-002 branch April 16, 2020 03:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SataQiu SataQiu SataQiu left review comments

@neolit123 neolit123 Awaiting requested review from neolit123

@oomichi oomichi Awaiting requested review from oomichi

@BenTheElder BenTheElder Awaiting requested review from BenTheElder

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

@alejandrox1 alejandrox1 Awaiting requested review from alejandrox1

Assignees

@oomichi oomichi

@SataQiu SataQiu

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/e2e-test-framework Issues or PRs related to refactoring the kubernetes e2e test framework area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. release-note-none Denotes a PR that doesn't merit a release note. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.19
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@tanjunchen @alejandrox1 @oomichi @k8s-ci-robot @SataQiu