Stable 20160510 #19
Closed
Stable 20160510 #19
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
We don't care about api docs, swagger, description, or codec gen for now. It would be best to fix the others where they are broken. |
|
@deads2k on it |
|
I'd say we don't care about protobuf atm, either. |
|
@soltysh we don't but serialization tests seems to care... |
|
bummer... |
|
(fixed all govet errors related to us, gofmt errors, etc.) |
mfojtik
force-pushed
the
post-rebase
branch
3 times, most recently
from
22c4121 to
a289b15
Compare
:100644 100644 a9b6b37... 2328ffc... M pkg/apiserver/api_installer.go
:100644 100644 af19945... 0617165... M pkg/kubectl/describe.go
Conflicts: Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/cmd/exec.go Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/cmd/portforward.go Conflicts: Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/cmd/exec.go Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/cmd/portforward.go :100644 100644 eef0235... bf46a2d... M pkg/kubectl/cmd/exec.go :100644 100644 942a1c5... 52570ac... M pkg/kubectl/cmd/portforward.go
Contains previous commits: - UPSTREAM: <carry>: Update v1beta3 - UPSTREAM: 15053<carry>: Conversions for v1beta3 - UPSTREAM: <carry>: v1beta3 scc integration for PSC - UPSTREAM: <carry>: respect fuzzing defaults for v1beta3 SecurityContext - UPSTREAM: <carry>: Update v1beta3 PodLogOptions - UPSTREAM: <carry>: v1beta3 scc priority field - UPSTREAM: <carry>: v1beta3 default fsgroup/supgroup strategies to RunAsAny - UPSTREAM: <carry>: scc v1beta3 capability defaulting :100644 100644 a1fc556... 74fde3c... M pkg/api/install/install.go :100644 100644 6040c54... e00a441... M pkg/api/registered/registered.go :100644 100644 bc3fbbe... f7f0265... M pkg/api/testing/fuzzer.go :000000 100644 0000000... f8f22b4... A pkg/api/v1beta3/conversion.go :000000 100644 0000000... 7b2c004... A pkg/api/v1beta3/conversion_generated.go :000000 100644 0000000... a4c3aab... A pkg/api/v1beta3/conversion_test.go :000000 100644 0000000... 02393ad... A pkg/api/v1beta3/conversion_volumesource_test.go :000000 100644 0000000... ea050d5... A pkg/api/v1beta3/deep_copy_generated.go :000000 100644 0000000... 1689b35... A pkg/api/v1beta3/defaults.go :000000 100644 0000000... 6396549... A pkg/api/v1beta3/defaults_test.go :000000 100644 0000000... f7620a8... A pkg/api/v1beta3/register.go :000000 100644 0000000... 784ee45... A pkg/api/v1beta3/types.go :100644 100644 ac0121d... 182f2e4... M pkg/client/unversioned/request.go :100644 100644 e74e238... fcb9232... M pkg/kubectl/cmd/rollingupdate.go CHANGES v1beta3 typemeta usage UPSTREAM: revert: 902e416: <carry>: v1beta3 scc This reverts commit 902e4168787f2734cf4324881eb5f89e0d5c1e75. :100644 100644 e34476f... 486c7c4... M pkg/api/v1beta3/conversion_generated.go :100644 100644 3bd7323... cc0d540... M pkg/api/v1beta3/deep_copy_generated.go :100644 100644 d81bace... cf8cf86... M pkg/api/v1beta3/defaults.go :100644 100644 15fb596... 9c5f998... M pkg/api/v1beta3/defaults_test.go :100644 100644 839ee1f... d018994... M pkg/api/v1beta3/types.go UPSTREAM: <carry>: v1beta3: ensure only v1 appears in discovery for legacy API group :100644 100644 c2be65f... 6db1406... M pkg/genericapiserver/genericapiserver.go
:100644 100644 c561ddb... 17ef5df... M pkg/kubelet/server.go
:100644 100644 e2c1032... ec56d39... M pkg/controller/node/nodecontroller.go
…vider Previously, if the kubelet tried to register itself with the API server, and was rejected due to the external ID changing, it would delete the node object and recreate it. This commit causes it to tolerate a change in ExternalID when the ExternalID is not being provided by a cloud provider, assuming the new ExternalID is either the node's (metadata) name, or one of node's addresses. :100644 100644 0c4fdc1... 8deaa82... M pkg/kubelet/kubelet.go
… setting Reverts behavior change made in k8s PR 18089 Carry until k8s issue 20090 is resolved and provides a way to opt out of clusterDNS-only behavior This was changed in k8s PR 18089 :100644 100644 4bf134f... d5a3e7a... M pkg/kubelet/kubelet.go :100644 100644 9a353a0... 01e82f0... M pkg/kubelet/kubelet_test.go
…ntainer setting for readonlyrootfs :100644 100644 9bd5b16... de6a16d... M pkg/securitycontext/provider.go
:000000 100644 0000000... 6ca484b... A pkg/util/workqueue/default_rate_limiters.go :000000 100644 0000000... 8a96fb0... A pkg/util/workqueue/default_rate_limiters_test.go :000000 100644 0000000... 272ba52... A pkg/util/workqueue/rate_limitting_queue.go :000000 100644 0000000... deca140... A pkg/util/workqueue/rate_limitting_queue_test.go
This was a bug with the conversion path - asking to be converted to the destination is incorrect. :100644 100644 ccc1f9b... 6b193f9... M pkg/kubectl/resource_printer_test.go :100644 100644 9a4a708... 36fc286... M pkg/runtime/scheme.go :100644 100644 36c66fa... 2c72c27... M pkg/runtime/serializer/versioning/versioning.go
…tream :100644 100644 eceffea... 78f966c... M pkg/storage/cacher.go :100644 100644 afc1ee7... 0d3ba66... M pkg/storage/cacher_test.go
:100644 100644 32b1c71... f404d25... M pkg/util/runtime/runtime.go
… the host:port format :100644 100644 a5000a8... 99d4cd2... M pkg/util/net/http.go :100644 100644 1de67ca... 08cc858... M pkg/util/net/http_test.go
:100644 100644 b32534e... 3e694fc... M pkg/controller/serviceaccount/tokens_controller.go
… running the shared informer
|
We've been merging these into a stable branch, so that master tracks the latest level we're working on from kube |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Still running verify-all and some tests but it compiles and unit tests seems to work.
Output from unit tests: https://paste.fedoraproject.org/365103/62967286 (I believe the failures are fine since i'm running this on OSX and I get the same failures running tests for k8s master).
@smarterclayton needs to rebase kubernetes#25033
Some other notes from this:
int->int32conversions (I have to update manually generated v1beta3 conversions and I also generated protobuf for v1beta3 ;-)registry.StorechangesThere were other minor edits to some picks, but I can't remember them, so I advise to check your carry/pick to make sure I did not removed/changed something that I should not.
Also I'm sorry if I changed the author of the pick (i have to amend some changes and I really don't want to reformat the patch unless somebody tell me to do it ;-)