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

conversion-gen: make staging dirs independent of living in vendor/ #52790

Merged
merged 1 commit into from
Sep 20, 2017
Merged

conversion-gen: make staging dirs independent of living in vendor/ #52790

merged 1 commit into from
Sep 20, 2017

Conversation

sttts
Copy link
Contributor

@sttts sttts commented Sep 20, 2017 •
edited

The +k8s:conversion-gen tags included the package directory inside of kube's vendor dir. This
makes them invalid when we publish staging repos.

Without this PR our sample-apiserver example code-generation is broken once published.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 20, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 20, 2017
@sttts sttts added kind/bug Categorizes issue or PR as related to a bug. release-note-none Denotes a PR that doesn't merit a release note. and removed cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 20, 2017
sttts
sttts commented Sep 20, 2017
View reviewed changes
staging/src/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go
// in the output directory.
// TODO: build a more fundamental concept in gengo for dealing with modifications
// to vendored packages.
if strings.HasPrefix(pkg.SourcePath, arguments.OutputBase) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this code is what we use elsewhere, e.g. in deepcopy-gen. The TODO is still valid, but at least this PR unifies different ugly hacks into one.

@sttts sttts force-pushed the sttts-conversion-gen-vendor-independent branch from ff58fa5 to f545112 Compare September 20, 2017 12:55
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 20, 2017
@deads2k
Copy link
Contributor

deads2k commented Sep 20, 2017

/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 20, 2017
@sttts sttts mentioned this pull request Sep 20, 2017
Merged
@sttts
Copy link
Contributor Author

sttts commented Sep 20, 2017

@DirectXMan12 can you approve the metrics change?

@DirectXMan12
Copy link
Contributor

DirectXMan12 commented Sep 20, 2017 •
edited

/approve

@sttts
Copy link
Contributor Author

sttts commented Sep 20, 2017

@mikedanese @ixdy can you approve the build/root/Makefile.generated_files change? It makes sure that staging dir paths map to the correct relative path for the dependency logic in Makefile.generated_files.

@sttts
Copy link
Contributor Author

sttts commented Sep 20, 2017

/retest

@smarterclayton
Copy link
Contributor

/lgtm
/approve no-issue

This is moving in the right direction.

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 20, 2017
@sttts
Copy link
Contributor Author

sttts commented Sep 20, 2017

/retest

@sttts sttts added this to the v1.8 milestone Sep 20, 2017
@ixdy
Copy link
Member

ixdy commented Sep 20, 2017

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: DirectXMan12, deads2k, ixdy, smarterclayton, sttts

Associated issue requirement bypassed by: smarterclayton

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

Needs approval from an approver in each of these OWNERS Files:

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

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 52477, 52790, 52798). If you want to cherry-pick this change to another branch, please follow the instructions here..

@k8s-github-robot k8s-github-robot merged commit 74ff323 into kubernetes:master Sep 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@smarterclayton smarterclayton

@deads2k deads2k

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.8
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@sttts @deads2k @DirectXMan12 @smarterclayton @ixdy @k8s-github-robot @k8s-ci-robot