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/:use the term 'Control Plane' in comment #95053

Merged
merged 1 commit into from Oct 9, 2020
Merged

test/e2e/framework/:use the term 'Control Plane' in comment #95053

merged 1 commit into from Oct 9, 2020

Conversation

tanjunchen
Copy link
Member

@tanjunchen tanjunchen commented Sep 25, 2020 •
edited

What type of PR is this?
/kind cleanup

What this PR does / why we need it:

Which issue(s) this PR fixes:

ref #94901

Special notes for your reviewer:

/cc @spiffxp
/cc @oomichi

test/e2e/framework/ingress/ingress_utils.go
test/e2e/framework/node/resource.go
test/e2e/framework/node/wait.go
test/e2e/framework/ssh/ssh.go

Currently these values only involve comments, so it is easy to replace.
Separate submission of these changes are conducive to review.

Does this PR introduce a user-facing change?:

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

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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. 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 Sep 25, 2020
@hwdef
Copy link
Member

hwdef commented Sep 25, 2020

/release-note-none

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Sep 25, 2020
@tanjunchen
Copy link
Member Author

/assign @oomichi
/priority backlog
/kind cleanup

@k8s-ci-robot k8s-ci-robot added priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Sep 25, 2020
@tanjunchen
Copy link
Member Author

/wg naming
/sig testing
/area test

@k8s-ci-robot k8s-ci-robot added the wg/naming Categorizes an issue or PR as relevant to WG Naming. label Sep 25, 2020
@tanjunchen
Copy link
Member Author

/test pull-kubernetes-e2e-gce-ubuntu-containerd

@justaugustus justaugustus added this to In progress in WG Naming Sep 25, 2020
oomichi
oomichi reviewed Sep 30, 2020
View reviewed changes
Copy link
Member

@oomichi oomichi left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 30, 2020
@spiffxp
Copy link
Member

spiffxp commented Oct 1, 2020

/hold
ref: #94901 (comment)

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 1, 2020
spiffxp
spiffxp suggested changes Oct 1, 2020
View reviewed changes
Copy link
Member

@spiffxp spiffxp left a comment

Choose a reason for hiding this comment

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

IMO a blind s/Master/Control Plane/ is not appropriate here

/cc @neolit123 @BenTheElder
for input on whether "control plane node" as a term makes sense

test/e2e/framework/ingress/ingress_utils.go Outdated
Comment on lines 886 to 887
// This list of nodes must not include the Control Plane, which is marked
// unschedulable, since the Control Plane doesn't run kube-proxy. Without
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// This list of nodes must not include the Control Plane, which is marked
// unschedulable, since the Control Plane doesn't run kube-proxy. Without
// This list of nodes must not include any control plane nodes, which are marked
// unschedulable, since control plane nodes don't run kube-proxy. Without

Copy link
Member Author

Choose a reason for hiding this comment

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

done

test/e2e/framework/node/resource.go Outdated
@@ -191,7 +191,7 @@ func Filter(nodeList *v1.NodeList, fn func(node v1.Node) bool) {
nodeList.Items = l
}

// TotalRegistered returns number of registered Nodes excluding Master Node.
// TotalRegistered returns number of registered Nodes excluding Control Plane Node.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// TotalRegistered returns number of registered Nodes excluding Control Plane Node.
// TotalRegistered returns number of schedulable Nodes

test/e2e/framework/node/resource.go Outdated
@@ -201,7 +201,7 @@ func TotalRegistered(c clientset.Interface) (int, error) {
return len(nodes.Items), nil
}

// TotalReady returns number of ready Nodes excluding Master Node.
// TotalReady returns number of ready Nodes excluding Control Plane Node.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// TotalReady returns number of ready Nodes excluding Control Plane Node.
// TotalReady returns number of ready schedulable Nodes

test/e2e/framework/node/wait.go Outdated
@@ -41,7 +41,7 @@ var requiredPerNodePods = []*regexp.Regexp{

// WaitForReadyNodes waits up to timeout for cluster to has desired size and
// there is no not-ready nodes in it. By cluster size we mean number of Nodes
// excluding Master Node.
// excluding Control Plane Node.
Copy link
Member

Choose a reason for hiding this comment

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

I think it's more appropriate to drop reference to master/control-plane entirely, e.g.

By cluster size we mean number of schedulable Nodes

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/node/wait.go Outdated
@@ -150,7 +150,7 @@ func WaitForNodeToBeReady(c clientset.Interface, name string, timeout time.Durat

// CheckReady waits up to timeout for cluster to has desired size and
// there is no not-ready nodes in it. By cluster size we mean number of Nodes
// excluding Master Node.
// excluding Control Plane Node.
Copy link
Member

Choose a reason for hiding this comment

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

I think it's more appropriate to drop reference to master/control-plane entirely, e.g.

By cluster size we mean number of schedulable Nodes

test/e2e/framework/ssh/ssh.go Outdated
Comment on lines 115 to 116
// NodeSSHHosts returns SSH-able host names for all schedulable nodes - this
// excludes master node. If it can't find any external IPs, it falls back to
// excludes Control Plane node. If it can't find any external IPs, it falls back to
Copy link
Member

Choose a reason for hiding this comment

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

I think it's more appropriate to drop references to the master/control-plane entirely, e.g.

NodeSSHHosts returns SSH-able host names for all schedulable nodes. If it can't find any ....

Copy link
Member Author

Choose a reason for hiding this comment

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

done. thanks for your comments.
/cc @spiffxp

WG Naming automation moved this from In progress to Review in progress Oct 1, 2020
@neolit123
Copy link
Member

@spiffxp your comments above are valid.

for input on whether "control plane node" as a term makes sense

yes, it refers to a "node that hosts control-plane components".

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 2, 2020
spiffxp
spiffxp approved these changes Oct 8, 2020
View reviewed changes
Copy link
Member

@spiffxp spiffxp left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm
/hold cancel
thanks for making the changes

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 8, 2020
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 8, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: spiffxp, 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 Oct 8, 2020
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit ee297b6 into kubernetes:master Oct 9, 2020
WG Naming automation moved this from Review in progress to Done Oct 9, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Oct 9, 2020
@tanjunchen tanjunchen deleted the replace-k8s-master branch October 9, 2020 05:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oomichi oomichi oomichi left review comments

@spiffxp spiffxp spiffxp approved these changes

@BenTheElder BenTheElder Awaiting requested review from BenTheElder

@neolit123 neolit123 Awaiting requested review from neolit123

Assignees

@spiffxp spiffxp

@oomichi oomichi

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/backlog Higher priority than priority/awaiting-more-evidence. 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. wg/naming Categorizes an issue or PR as relevant to WG Naming.
Projects
WG Naming
  
Done
Milestone
v1.20
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@tanjunchen @hwdef @spiffxp @neolit123 @k8s-ci-robot @fejta-bot @oomichi