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

Update kubernetes dependencies to k8s 1.13.5 #6857

Merged
merged 5 commits into from
May 6, 2019
Merged

Update kubernetes dependencies to k8s 1.13.5 #6857

merged 5 commits into from
May 6, 2019

Conversation

justinsb
Copy link
Member

This is supporting the CRD effort (#6849), kubebuilder &
controller-runtime currently depend on k8s 1.13.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 29, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

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

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 29, 2019
@k8s-ci-robot k8s-ci-robot added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/storage Categorizes an issue or PR as relevant to SIG Storage. labels Apr 29, 2019
@justinsb
Copy link
Member Author

We should probably cherry-pick this back to 1.13, and to 1.14. We might cherry-pick a k8s 1.14 dependency update on top of this to 1.14 (but I learned that not cherry picking the steps along the way is painful for these updates with the go version changes!)

@zetaab zetaab mentioned this pull request Apr 30, 2019
Closed
@zetaab
Copy link
Member

zetaab commented May 5, 2019

at least one error you can fix in:
https://github.com/kubernetes/kops/blob/master/pkg/instancegroups/instancegroups.go#L36
instead of that use
cmd "k8s.io/kubernetes/pkg/kubectl/cmd/drain"

justinsb added 5 commits May 6, 2019 09:58
@justinsb
Update kubernetes dependencies to 1.13.5
78ebe93 
Notable changes:

* openapi-gen moved to k8s.io/kube-openapi/cmd/openapi-gen
* templates moved to k8s.io/kubernetes/pkg/kubectl/util/templates
@justinsb
Update k8s to 1.13.5: vendor directory
4f06ae0
@justinsb
Generated apimachinery
f3efa04
@justinsb
bazel: fix distroless imports for latest bazel
1cf4a93
@justinsb
Remove test that causes klog conflict
6adc608
@rdrgmnzs
Copy link
Contributor

rdrgmnzs commented May 6, 2019

Looks great! Thanks for putting in all the work to get this merged @justinsb

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 6, 2019
@justinsb justinsb mentioned this pull request May 6, 2019
Merged
@k8s-ci-robot k8s-ci-robot merged commit dbae685 into kubernetes:master May 6, 2019
@zetaab
Copy link
Member

zetaab commented May 6, 2019

@justinsb could you cherry-pick to release-1.13

@mikesplain mikesplain added this to the 1.13 milestone May 7, 2019
This was referenced May 10, 2019
Closed
Merged
Merged
k8s-ci-robot added a commit that referenced this pull request May 14, 2019
@k8s-ci-robot
Merge pull request #6975 from mikesplain/automated-cherry-pick-of-#68…
d32995c 
…57-origin-release-1.13

Automated cherry pick of #6857: Update kubernetes dependencies to 1.13.5
k8s-ci-robot added a commit that referenced this pull request May 14, 2019
@k8s-ci-robot
Merge pull request #6936 from mikesplain/automated-cherry-pick-of-#68…
6bf497c 
…57-origin-release-1.14

Automated cherry pick of #6857: Update kubernetes dependencies to 1.13.5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@rdrgmnzs rdrgmnzs

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick 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. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.13
Development

Successfully merging this pull request may close these issues.
5 participants
@justinsb @k8s-ci-robot @zetaab @rdrgmnzs @mikesplain