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

Upgrade to k8s-v1.7 #1693

Merged
merged 13 commits into from
Jul 14, 2017
Merged

Upgrade to k8s-v1.7 #1693

merged 13 commits into from
Jul 14, 2017

Conversation

r2d4
Copy link
Contributor

@r2d4 r2d4 commented Jul 13, 2017

No description provided.

dlorenc and others added 13 commits July 13, 2017 09:16
* Added a godep-update-k8s script for upgrading.
$ KUBE_VERSION ./hack/godeps/godep-update-k8s.sh

* Added client-go version ldflags to localkube and minikube.  The
version package is now split in both kubernetes and client-go, so we
need to supply both ldflags.

* Change cross builds to use BUILD_IN_DOCKER

* Add a patch for kube-proxy
The setup of kube-proxy recently changed, making the registering of the
component config a fatal error instead of a warning.  This patch
reverts it to be a warning, which is a no-op for us anyways since we
don't supply a config file.
The k8s components are registering their flags on localkube, polluting
the flag namespace.  A 'version' flag was added, which conflicts with a
localkube flag.  Changing the name of this flag so that there is no
conflict.
Also switch out-of-order format strings in test output.
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 13, 2017
@codecov-io
Copy link

Codecov Report

Merging #1693 into master will decrease coverage by 0.21%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1693      +/-   ##
==========================================
- Coverage   38.77%   38.55%   -0.22%     
==========================================
  Files          51       51              
  Lines        2664     2674      +10     
==========================================
- Hits         1033     1031       -2     
- Misses       1452     1463      +11     
- Partials      179      180       +1
Impacted Files Coverage Δ
pkg/localkube/proxy.go 0% <0%> (ø) ⬆️
pkg/localkube/apiserver.go 0% <0%> (ø) ⬆️
pkg/util/kubeconfig/config.go 50.46% <0%> (-1.87%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e550e3d...1aaeb67. Read the comment docs.

@dlorenc
Copy link
Contributor

dlorenc commented Jul 13, 2017

Was this just a rebase + merge from the 1.7 branch?

@r2d4
Copy link
Contributor Author

r2d4 commented Jul 13, 2017

Yup, small rebase conflict in the makefile, but that was easily resolved.

@r2d4 r2d4 merged commit 1c06d18 into kubernetes:master Jul 14, 2017
@r2d4 r2d4 deleted the k8s-1.7-rebase branch July 14, 2017 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants