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

gazelle: use default proto generation except for testgrid/config #6191

Merged
merged 4 commits into from
Jan 9, 2018
Merged

gazelle: use default proto generation except for testgrid/config #6191

merged 4 commits into from
Jan 9, 2018

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Jan 9, 2018

We should also fix testgrid/config at some point, but that's slightly more involved, as I noted in https://kubernetes.slack.com/archives/C09QZ4DQB/p1513824406000116.

/assign @BenTheElder @fejta

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Jan 9, 2018
BenTheElder
BenTheElder approved these changes Jan 9, 2018
View reviewed changes
Copy link
Member

@BenTheElder BenTheElder left a comment

Choose a reason for hiding this comment

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

/lgtm
/hold

@BenTheElder
Copy link
Member

/area bazel

@ixdy
Copy link
Member Author

ixdy commented Jan 9, 2018

This collides with #6149 and I'm not sure how to address that.

/shrug

@k8s-ci-robot k8s-ci-robot added ¯\_(ツ)_/¯ ¯\\\_(ツ)_/¯ size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 9, 2018
@ixdy
Copy link
Member Author

ixdy commented Jan 9, 2018

Actually, running hack/prune-libraries.sh --fix mostly did the right thing, and ended up in a net reduction of lines in vendor/. It seems confused about vendor/github.com/prometheus/client_model/go though.

@ixdy
Copy link
Member Author

ixdy commented Jan 9, 2018

hack/prune-dependencies.sh keeps choking on vendor/github.com/prometheus/client_model/BUILD. I think maybe it's trying to delete it twice?

@ixdy
Copy link
Member Author

ixdy commented Jan 9, 2018

I think I figured it out - we needed one more call to hack/update-bazel.sh after pruning to get things into a steady state.

@fejta
Copy link
Contributor

fejta commented Jan 9, 2018

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, fejta, ixdy

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

Needs approval from an approver in each of these OWNERS Files:
  • OWNERS [BenTheElder,fejta,ixdy]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@ixdy
Copy link
Member Author

ixdy commented Jan 9, 2018

/hold cancel

@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 Jan 9, 2018
@k8s-ci-robot k8s-ci-robot merged commit cab53df into kubernetes:master Jan 9, 2018
0xmichalis
0xmichalis reviewed Jan 9, 2018
View reviewed changes
vendor/BUILD Outdated
@@ -43,7 +43,6 @@ filegroup(
"//vendor/github.com/matttproud/golang_protobuf_extensions/pbutil:all-srcs",
"//vendor/github.com/peterbourgon/diskv:all-srcs",
"//vendor/github.com/prometheus/client_golang/prometheus:all-srcs",
"//vendor/github.com/prometheus/client_model:all-srcs",
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this also update the dep files?

Copy link
Contributor

Choose a reason for hiding this comment

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

test-infra/Gopkg.lock

Line 187 in cab53df

name = "github.com/prometheus/client_model"

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah, it should have.

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, this library seems to be used transitively by github.com/prometheus/client_golang.

Copy link
Contributor

Choose a reason for hiding this comment

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

OK, this seems to be added back in this very same PR. Sorry for the noise.

@0xmichalis 0xmichalis mentioned this pull request Jan 9, 2018
Merged
@ixdy ixdy deleted the gazelle-proto-mode branch May 15, 2018 23:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xmichalis 0xmichalis 0xmichalis left review comments

@BenTheElder BenTheElder BenTheElder approved these changes

@krzyzacy krzyzacy Awaiting requested review from krzyzacy

@michelle192837 michelle192837 Awaiting requested review from michelle192837

Assignees

@BenTheElder BenTheElder

@fejta fejta

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/bazel cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. ¯\_(ツ)_/¯ ¯\\\_(ツ)_/¯
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ixdy @BenTheElder @fejta @k8s-ci-robot @0xmichalis