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.

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

Re-add pkg/generated/bindata.go #65985

Merged

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Jul 9, 2018

What this PR does / why we need it: I removed pkg/generated/bindata.go in #62432 as it had drifted out-of-date and was automatically generated by make and bazel.

This broke some downstream users who import k8s.io/kubernetes.

It's unclear whether the project intends for k8s.io/kubernetes to be vendorable, as there are other generated files which are not saved in the repo, including pkg/generated/openapi/zz_generated.openapi.go and test/e2e/generated/bindata.go, but pkg/generated/bindata.go seems to be a core dependency for current uses.

The new verify check added in #65882 will ensure that this file stays up-to-date.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
This partially addresses #65968. We also need to cherry-pick this to release-1.11.

Release note:

Re-adds `pkg/generated/bindata.go` to the repository to allow some parts of k8s.io/kubernetes to be go-vendorable.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 9, 2018
@ixdy
Copy link
Member Author

ixdy commented Jul 9, 2018

/assign @thockin
cc @mattfarina @tamalsaha @BenTheElder

@BenTheElder
Copy link
Member

/retest

@thockin
Copy link
Member

thockin commented Jul 9, 2018

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 9, 2018
@dims
Copy link
Member

dims commented Jul 9, 2018

/lgtm

yes please!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, ixdy, thockin

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

@dims
Copy link
Member

dims commented Jul 10, 2018

@ixdy, Let's backport please!

@ixdy
Copy link
Member Author

ixdy commented Jul 10, 2018

#66009 for cherrypick.

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 65993, 65986, 65351, 65996, 65985). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 8b71cb7 into kubernetes:master Jul 10, 2018
k8s-github-robot pushed a commit that referenced this pull request Jul 11, 2018
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Don't delete pkg/generated/bindata.go in make clean

**What this PR does / why we need it**: follow-up to #65985: `pkg/generated/bindata.go` has been re-added to the repo, so `make clean` shouldn't delete it, as doing so makes the tree dirty.

This is mostly problematic for jobs which run `make clean` followed by `make quick-release` or `make release` (like our CI build job), since those won't regenerate `pkg/generated/bindata.go`, as they run builds inside the build container.

**Release note**:

```release-note
NONE
```
k8s-github-robot pushed a commit that referenced this pull request Jul 13, 2018
…65986-#65985-upstream-release-1.11

Automatic merge from submit-queue.

Automated cherry pick of #65882: Add script to verify generated files #65986: verify-generated-files: ensure git tree is clean #65985: Don't gitignore pkg/generated/bindata.go

Cherry pick of #65882 #65986 #65985 #66076 on release-1.11.

#65882: Add script to verify generated files
#65986: verify-generated-files: ensure git tree is clean
#65985: Re-add pkg/generated/bindata.go
#66076: Don't delete pkg/generated/bindata.go in make clean

```release-note
Re-adds `pkg/generated/bindata.go` to the repository to allow some parts of k8s.io/kubernetes to be go-vendorable.
```

Fixes #65968.
@marpaia
Copy link
Contributor

marpaia commented Jul 25, 2018

/sig release

@k8s-ci-robot k8s-ci-robot added the sig/release Categorizes an issue or PR as relevant to SIG Release. label Jul 25, 2018
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. 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/release Categorizes an issue or PR as relevant to SIG Release. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants