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

Jump to bottom

release-1.7: Update boilerplate for 2018 #57796

Closed
wants to merge 3 commits into from
Closed

release-1.7: Update boilerplate for 2018 #57796

wants to merge 3 commits into from

Conversation

nikhita
Copy link
Member

@nikhita nikhita commented Jan 3, 2018

This is acts a cherry pick of #57735.

Note: This is not an automated cherry-pick since lots of things have changed since 1.7 and a cherry-pick leads to lots of conflicts in the generated files.

This PR has been created by manually making the changes as in https://github.com/kubernetes/kubernetes/pull/57735/files/83bc631bee60ef2c6f9024869a8747ba9eddf556 and then running hack/update-all.sh.

This also unblocks further client-go 4.0 releases. (see #57245)

Release note:

NONE

/assign wojtek-t cblecker sttts

@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Jan 3, 2018
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 3, 2018
@k8s-github-robot
Copy link

This PR is not for the master branch but does not have the cherrypick-approved label. Adding the do-not-merge/cherry-pick-not-approved label.

@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Jan 3, 2018
nikhita
nikhita commented Jan 3, 2018
View reviewed changes
api/openapi-spec/swagger.json Outdated
@@ -2,7 +2,7 @@
"swagger": "2.0",
"info": {
"title": "Kubernetes",
"version": "v1.7.13"
"version": "v1.7.12"
Copy link
Member Author

Choose a reason for hiding this comment

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

Is this correct?

Copy link
Member

Choose a reason for hiding this comment

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

hmm - I don't think so.

staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json Outdated
@@ -1,6 +1,6 @@
{
"ImportPath": "k8s.io/apiextensions-apiserver",
"GoVersion": "go1.8",
"GoVersion": "go1.9",
Copy link
Member Author

Choose a reason for hiding this comment

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

Is this correct?

Copy link
Contributor

Choose a reason for hiding this comment

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

Did we support 1.9 with kube 1.7? You probably have to switch the go version locally.

Copy link
Member Author

Choose a reason for hiding this comment

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

You probably have to switch the go version locally.

Yeah, thought so. Will do.

staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json
@@ -174,6 +174,10 @@
"ImportPath": "github.com/golang/protobuf/ptypes/timestamp",
"Rev": "4bd1920723d7b7c925de087aa32e2187708897f7"
},
{
"ImportPath": "github.com/google/btree",
"Rev": "7d79101e329e5a3adf994758c578dab82b90c017"
Copy link
Member Author

Choose a reason for hiding this comment

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

Are these changes correct?

Copy link
Contributor

Choose a reason for hiding this comment

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

This is odd. Is it the only one added? Or anything changed? Maybe godep behaviour is slightly different, or we had invalid Godeps.json? Does our CI test this?

This was referenced Jan 3, 2018
Merged
Closed
wojtek-t
wojtek-t reviewed Jan 3, 2018
View reviewed changes
Copy link
Member

@wojtek-t wojtek-t left a comment

Choose a reason for hiding this comment

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

Neither of those non-year related changes look ok.

api/openapi-spec/swagger.json Outdated
@@ -2,7 +2,7 @@
"swagger": "2.0",
"info": {
"title": "Kubernetes",
"version": "v1.7.13"
"version": "v1.7.12"
Copy link
Member

Choose a reason for hiding this comment

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

hmm - I don't think so.

federation/apis/openapi-spec/swagger.json Outdated
@@ -2,7 +2,7 @@
"swagger": "2.0",
"info": {
"title": "Generic API Server",
"version": "v1.7.13"
"version": "v1.7.12"
Copy link
Member

Choose a reason for hiding this comment

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

this one too

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: nikhita
We suggest the following additional approver: wojtek-t

Assign the PR to them by writing /assign @wojtek-t in a comment when ready.

No associated issue. Update pull-request body to add a reference to an issue, or get approval with /approve no-issue

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-ci-robot
Copy link
Contributor

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

Test name Commit Details Rerun command
pull-kubernetes-verify a3087b3 link /test pull-kubernetes-verify

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.

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.

@wojtek-t
Copy link
Member

wojtek-t commented Jan 3, 2018

@cblecker - this PR still doesn't seem to be correct. If you can take it over and help with that it would be great.

@cblecker cblecker mentioned this pull request Jan 3, 2018
Merged
@nikhita
Copy link
Member Author

nikhita commented Jan 4, 2018

Closing in favor of #57804.

@nikhita nikhita closed this Jan 4, 2018
k8s-github-robot pushed a commit that referenced this pull request Jan 4, 2018
Merge pull request #57804 from cblecker/nikhita-update-to-2018-releas…
7d64fdf 
…e-1.7

Automatic merge from submit-queue.

release-1.7: Update boilerplate for 2018

**What this PR does / why we need it**:
This is an attempted carry of @nikhita's PR, #57796.
This is acts a cherry pick of #57735.

**Note**: This is not an automated cherry-pick since lots of things have changed since 1.7 and a cherry-pick leads to lots of conflicts in the generated files.

This also unblocks further client-go 4.0 releases. (see #57245)

**Release note**:
```release-note
NONE
```
@nikhita nikhita deleted the update-to-2018-release-1.7 branch January 4, 2018 10:23
@sttts sttts mentioned this pull request Jan 9, 2018
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sttts sttts sttts left review comments

@wojtek-t wojtek-t wojtek-t left review comments

Assignees

@sttts sttts

@cblecker cblecker

@vishh vishh

@wojtek-t wojtek-t

@mwielgus mwielgus

Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@nikhita @k8s-github-robot @k8s-ci-robot @wojtek-t @sttts @cblecker @vishh @mwielgus