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

Move funcs of node_util to cloud/gcp. #84412

Merged
merged 1 commit into from Nov 5, 2019
Merged

Move funcs of node_util to cloud/gcp. #84412

merged 1 commit into from Nov 5, 2019

Conversation

jfbai
Copy link
Contributor

@jfbai jfbai commented Oct 27, 2019 •
edited

What type of PR is this?
/kind cleanup

What this PR does / why we need it:

ref: #84380

Move functions in node_util.go to module cloud/gcp.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?:

None

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

None

/assigin @oomichi

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. 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. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 27, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @jfbai. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@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/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. 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 Oct 27, 2019
@hwdef
Copy link
Member

hwdef commented Oct 28, 2019

/ok-to-test
LGTM

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 28, 2019
@oomichi oomichi mentioned this pull request Oct 28, 2019
Closed
21 tasks
oomichi
oomichi reviewed Oct 28, 2019
View reviewed changes
test/e2e/framework/util.go Outdated
@@ -74,6 +74,7 @@ import (
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/master/ports"
taintutils "k8s.io/kubernetes/pkg/util/taints"
e2ecloudgcp "k8s.io/kubernetes/test/e2e/cloud/gcp"
Copy link
Member

Choose a reason for hiding this comment

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

Please don't import outside of e2e framework in k/k from e2e framework.
That is an invalid dependency.

@timothysc
Copy link
Member

/assign @andrewsykim

andrewsykim
andrewsykim reviewed Oct 28, 2019
View reviewed changes
test/e2e/cloud/gcp/cluster_upgrade.go Outdated
return nil
}

func masterUpgradeKubernetesAnywhere(v string) error {
Copy link
Member

Choose a reason for hiding this comment

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

This doesn't seem GCP specific?

@jfbai
Copy link
Contributor Author

jfbai commented Oct 31, 2019 •
edited

@oomichi Hi, there is a function named masterUpgradeGKE which seem specific to GCP, but it is called in both framework/util.go and gcp/cluster_upgrade.go indirectly. It seems a bit hard to moving gcp specific code to gcp package.

@jfbai jfbai force-pushed the move-funcs-of-nodeutil-to-cloud-gcp branch from bc4b163 to 9fc7ae8 Compare November 3, 2019 02:48
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Nov 3, 2019
@jfbai
Copy link
Contributor Author

jfbai commented Nov 3, 2019

@oomichi I moved only DeleteNodeOnCloudProvider into cloud/nodes.go and remove one unused function now, since one of those upgrade* functions have multiple references, so I make them all stay in node_utils until the reference in util.go is removed.

@jfbai jfbai force-pushed the move-funcs-of-nodeutil-to-cloud-gcp branch from 9fc7ae8 to 36b0e9c Compare November 3, 2019 03:16
@jfbai jfbai force-pushed the move-funcs-of-nodeutil-to-cloud-gcp branch from 36b0e9c to e9345ae Compare November 3, 2019 03:45
oomichi
oomichi reviewed Nov 5, 2019
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 doing this

/lgtm
/approve

test/e2e/framework/nodes_util.go
@@ -281,43 +281,6 @@ func nodePoolsGKE() ([]string, error) {
return strings.Fields(stdout), nil
}

// MigTemplate (GCE-only) returns the name of the MIG template that the
// nodes of the cluster use.
func MigTemplate() (string, error) {
Copy link
Member

Choose a reason for hiding this comment

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

confirmed this function can be removed since not used at all from https://cs.k8s.io/?q=MigTemplate&i=nope&files=&repos=

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 5, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Nov 5, 2019
@k8s-ci-robot k8s-ci-robot merged commit efe5edf into kubernetes:master Nov 5, 2019
@k8s-ci-robot k8s-ci-robot added this to the v1.17 milestone Nov 5, 2019
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

@andrewsykim andrewsykim andrewsykim left review comments

@cheftako cheftako Awaiting requested review from cheftako

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

Assignees

@oomichi oomichi

@andrewsykim andrewsykim

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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.17
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@jfbai @k8s-ci-robot @hwdef @timothysc @oomichi @andrewsykim