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:move OpenWebSocketForURL to subpackage(new) websocket #89405

Merged
merged 1 commit into from
Mar 25, 2020
Merged

test/e2e/framework:move OpenWebSocketForURL to subpackage(new) websocket #89405

merged 1 commit into from
Mar 25, 2020
+115 −59

Conversation

tanjunchen
Copy link
Member

What type of PR is this?

/kind cleanup
/priority backlog

What this PR does / why we need it:

Here are some reasons to support this PR.

  1. It is better to represent its intention for OpenWebSocketForURL with new subpackage websocket. subpackage websocket as its name implies.
  2. It is easy to add and maintain code related to websocket in e2e.
  3. ref Break up and Refactor test/e2e/framework/util.go #77095

Which issue(s) this PR fixes:

ref:#77095

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/L Denotes a PR that changes 100-499 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 24, 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/cli Categorizes an issue or PR as relevant to SIG CLI. 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 24, 2020
@tanjunchen
Copy link
Member Author

/kind cleanup
/priority backlog
/assign @oomichi

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 24, 2020
gavinfish
gavinfish reviewed Mar 24, 2020
View reviewed changes
test/e2e/common/pods.go Outdated
@@ -44,6 +44,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
websocketutil "k8s.io/kubernetes/test/e2e/framework/websocket"
Copy link
Contributor

Choose a reason for hiding this comment

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

Follow the naming pattern like e2ewebsocket

Copy link
Member

Choose a reason for hiding this comment

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

+1
It is nice to add it into ./hack/.import-aliases also.

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 i will update it

Copy link
Contributor

Choose a reason for hiding this comment

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

There are 2 alias name pattern in e2e. e2efoo or e2efooutil. Which is better?

test/e2e/framework/websocket/websocket_util.go Outdated
@@ -0,0 +1,80 @@
/*
Copyright 2018 The Kubernetes Authors.
Copy link
Contributor

Choose a reason for hiding this comment

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

Update year to 2020

test/e2e/kubectl/portforward.go Outdated
@@ -39,6 +39,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
websocketutil "k8s.io/kubernetes/test/e2e/framework/websocket"
Copy link
Contributor

Choose a reason for hiding this comment

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

Same as above

oomichi
oomichi reviewed Mar 24, 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.

Most part seems good for me.
just one comment.

test/e2e/common/pods.go Outdated
@@ -44,6 +44,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
websocketutil "k8s.io/kubernetes/test/e2e/framework/websocket"
Copy link
Member

Choose a reason for hiding this comment

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

+1
It is nice to add it into ./hack/.import-aliases also.

@tanjunchen
Copy link
Member Author

/assign @alejandrox1

@tanjunchen
Copy link
Member Author

/test pull-kubernetes-e2e-gce

oomichi
oomichi reviewed Mar 24, 2020
View reviewed changes
test/e2e/common/pods.go Outdated
@@ -44,6 +44,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2ewebsocketutil "k8s.io/kubernetes/test/e2e/framework/websocket"
Copy link
Member

Choose a reason for hiding this comment

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

It is better to set the alias name as e2ewebsocket for consistent name as the above.

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.

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

@gavinfish
Copy link
Contributor

/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 24, 2020
oomichi
oomichi reviewed Mar 24, 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.

Thanks for updating.

/retest
/lgtm
/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 24, 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 aa4f8e9 into kubernetes:master Mar 25, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Mar 25, 2020
@tanjunchen tanjunchen deleted the move-websocket-subpackage-websocket branch March 25, 2020 03:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@k-toyoda-pi k-toyoda-pi k-toyoda-pi left review comments

@gavinfish gavinfish gavinfish left review comments

@oomichi oomichi oomichi left review comments

@feiskyer feiskyer Awaiting requested review from feiskyer

@shiywang shiywang Awaiting requested review from shiywang

Assignees

@oomichi oomichi

@gavinfish gavinfish

@alejandrox1 alejandrox1

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/cli Categorizes an issue or PR as relevant to SIG CLI. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.19
Development

Successfully merging this pull request may close these issues.
7 participants
@tanjunchen @gavinfish @k8s-ci-robot @fejta-bot @oomichi @k-toyoda-pi @alejandrox1