Skip to content

Conversation

@eparis
Copy link
Member

@eparis eparis commented Jun 6, 2019

Some files imported the same thing twice with 2 different names. Many files
called the same import something different. This just creates a bit of
continuity using the most common upstream practice:

corev1 "k8s.io/api/core/v1"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
corev1lister "k8s.io/client-go/listers/core/v1"
appsv1client "k8s.io/client-go/kubernetes/typed/apps/v1"

I also run the 1.12 formatter across the repo.

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 6, 2019
@eparis eparis changed the title Standardize import paths and run gofmt [wip] Standardize import paths and run gofmt Jun 6, 2019
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 6, 2019
Copy link
Member

Choose a reason for hiding this comment

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

This file is generated, I think you need to skip it or the next person running hack/update-generated-bindata.sh will revert.

Copy link
Member

Choose a reason for hiding this comment

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

(or, we update that script to run gofmt)

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm just not going to touch it.

Copy link
Member

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

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

LGTM overall.

Copy link
Member

Choose a reason for hiding this comment

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

(or, we update that script to run gofmt)

@cgwalters
Copy link
Member

/approve

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 6, 2019
@eparis eparis force-pushed the include-once branch 5 times, most recently from 1181a18 to 998fc06 Compare June 6, 2019 19:44
Copy link
Contributor

@kikisdeliveryservice kikisdeliveryservice left a comment

Choose a reason for hiding this comment

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

The gofmt should be a separate commit from the manual changes to import paths that you are making.

@runcom
Copy link
Member

runcom commented Jun 7, 2019

Thanks for this @eparis (we also need to pick #600 at some point)

/approve
as well

@eparis eparis changed the title [wip] Standardize import paths and run gofmt Standardize import paths and run gofmt Jun 7, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 7, 2019
eparis added 2 commits June 7, 2019 11:09
Some files imported the same thing twice with 2 different names. Many files
called the same import something different. This just creates a bit of
continuity using the most common upstream practice:

corev1 "k8s.io/api/core/v1"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
corev1lister "k8s.io/client-go/listers/core/v1"
appsv1client "k8s.io/client-go/kubernetes/typed/apps/v1"
There probably should be a verify test to not let it get bad again.
@openshift-ci-robot
Copy link
Contributor

@eparis: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-etcd-quorum-loss 326e03e link /test e2e-etcd-quorum-loss

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

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. I understand the commands that are listed here.

@eparis
Copy link
Member Author

eparis commented Jun 7, 2019

I split it into 2 commits. If e2e-etcd-quorum-loss known bad? If so, I think it's ready to go...

@kikisdeliveryservice
Copy link
Contributor

thanks @eparis !

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 7, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, eparis, kikisdeliveryservice, runcom

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [cgwalters,kikisdeliveryservice,runcom]

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

@openshift-merge-robot openshift-merge-robot merged commit 5f1f4b9 into openshift:master Jun 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants