Rebase 1.7 20170705 #39
Merged
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
:100644 100644 a9b6b37... 2328ffc... M pkg/apiserver/api_installer.go
:100644 100644 c561ddb... 17ef5df... M pkg/kubelet/server.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
:100644 100644 ac7025a... dce57e1... M pkg/apimachinery/registered/registered.go
:100644 100644 b32534e... 3e694fc... M pkg/controller/serviceaccount/tokens_controller.go
:100644 100644 eaa35e6... 2a50982... M pkg/client/cache/fifo.go :100644 100644 0f2ceb8... 667c168... M pkg/client/cache/fifo_test.go
Doesn't offer enough use, complicates creation and setup.
We don't run system pods so waiting for them is somewhat pointless
…mapper :100644 100644 c5980bd... f9853d6... M pkg/kubectl/cmd/util/factory_test.go :100644 100644 2a7c7bc... d3d8b50... M pkg/kubectl/cmd/util/shortcut_restmapper.go :100644 100644 20d671e... 3f5bcce... M pkg/kubectl/cmd/util/shortcut_restmapper_test.go :100644 100644 9d7a8fc... 49bbc93... M pkg/kubectl/kubectl.go
Until kubernetes#11016 is resolved, we suspect that a combination of start latency and the corresponding effect on sync pod latency is causing status manager to fail to report within the 2 minute window. Double for now :100644 100644 30b6fd0e94... ea322bbddb... M test/e2e/common/container_probe.go
Until kubernetes#11016 is fixed, this reduces flakiness in extended suites where long start delays result in this test failing. :100644 100644 62b8918f36... 99d37eca2f... M test/e2e/framework/util.go
Add a longer timeout to the test to deal with kubernetes#11016. :100644 100644 fee5a4c9b4... 2fa0a919b4... M test/e2e/pods.go
This is docker/docker PR 26718 because docker has reintegrated engine-api into the primary docker repo.
:100644 100644 dbe04473b0... 00880df577... M cmd/libs/go2idl/client-gen/generators/client_generator.go :100644 100644 d6ed531d41... 9230930b55... M cmd/libs/go2idl/client-gen/main.go
…d4d84b23cd3 for kubelet api :000000 100644 0000000000... f3637b9b0c... A pkg/kubelet/api/Godeps/Godeps.json :000000 100644 0000000000... 4cdaa53d56... A pkg/kubelet/api/Godeps/Readme :000000 100644 0000000000... ca84afaf35... A pkg/kubelet/api/VENDOR.md
:100644 100644 b86eda7c5e... 3192bc484f... M test/e2e/examples.go :100644 100644 2d348ece4e... 406f8d15d0... M test/e2e/framework/authorizer_util.go :100644 100644 92eefcfecf... 97ffb2381d... M test/e2e/ingress.go :100644 100644 ea2f70cb30... 791327ec8e... M test/e2e/kubectl.go :100644 100644 40b6f5438e... 450b3dfe96... M test/e2e/pre_stop.go :100644 100644 d9eba6995e... c2b168112e... M test/e2e/volume_provisioning.go
:100644 100644 517a280dea... c29f226bc8... M staging/src/k8s.io/apiserver/pkg/endpoints/openapi/openapi_test.go
:100644 100644 c77502bfec... c018a4973a... M pkg/kubectl/resource/result.go
:100644 100644 4a4894cee0... fa2eb5773d... M staging/src/k8s.io/apiserver/pkg/server/httplog/log.go
:100644 100644 fb648e5285... 21d36a92dd... M staging/src/k8s.io/apiserver/pkg/endpoints/discovery/legacy.go
:000000 100644 0000000000... fa8da1bf25... A staging/src/k8s.io/apiserver/pkg/server/drop_patch.go
:000000 100644 0000000000... b684356ed4... A pkg/registry/core/rest/scc_patch.go :100644 100644 66e2a7be20... ea1028e61e... M pkg/registry/core/rest/storage_core.go
:100644 100644 29ebffe021... 5c9d4d81b1... M cmd/libs/go2idl/client-gen/generators/client_generator.go
:100644 100644 5c9d4d81b1... 0826f688bb... M cmd/libs/go2idl/client-gen/generators/client_generator.go :100644 100644 406f8d15d0... 96c5a9136b... M test/e2e/framework/authorizer_util.go
The loop should use 'continue' not 'break', otherwise removeFinalizer() not only removes "orphaningFinalizer" from its finalizers list but also removes others.
:100644 100644 7f24adabbc... 3bd17c0228... M staging/src/k8s.io/apiserver/pkg/endpoints/openapi/openapi.go :100644 100644 c29f226bc8... f9b52c28e3... M staging/src/k8s.io/apiserver/pkg/endpoints/openapi/openapi_test.go
…nonical An optimization added to the GuaranteedUpdate loop changed the comparison of the current objects serialization against the stored data, instead comparing to the in memory object, which defeated the mechanism we use to migrate stored data. This commit preserves that optimization but correctly verifies the in memory serialization against the on disk serialization by fetching the latest serialized data. Since most updates are not no-ops, this should not regress the performance of the normal path.
|
Cannot follow your color coding in the gdoc. |
|
Looks good as far as I can judge. |
|
Merging as our starting level. |
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.
This takes kube 1.7.0 and puts our picks on top: https://docs.google.com/spreadsheets/d/1AVI6MoSxELwDQspL9F1Y10S39eLm1VpSpMGdfXRKxHU/edit#gid=0 .
For now we have cyclical repo dependencies because of an e2e carry. That will go away later in 3.7.