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

Rebase 1.7 20170705 #39

Merged
merged 43 commits into from
Jul 6, 2017
Merged

Rebase 1.7 20170705 #39

merged 43 commits into from
Jul 6, 2017

Commits on Jul 5, 2017

  1. UPSTREAM: <carry>: reallow the ability to post across namespaces in api 

    :100644 100644 a9b6b37... 2328ffc... M	pkg/apiserver/api_installer.go
    @pweil- @deads2k
    pweil- authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    023e1f4 View commit details
    Browse the repository at this point in the history

  2. UPSTREAM: <carry>: add kubelet timeouts 

    :100644 100644 c561ddb... 17ef5df... M	pkg/kubelet/server.go
    @soltysh @deads2k
    soltysh authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    0aa2872 View commit details
    Browse the repository at this point in the history

  3. UPSTREAM: <carry>: Tolerate node ExternalID changes with no cloud pro… 

    …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
    @DirectXMan12 @deads2k
    DirectXMan12 authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    91d3dd1 View commit details
    Browse the repository at this point in the history

  4. UPSTREAM: <carry>: Add our types to kubectl get error

    @deads2k
    Andy Goldstein authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    b7a0c68 View commit details
    Browse the repository at this point in the history

  5. UPSTREAM: <carry>: Allow overriding default generators for run

    @liggitt @deads2k
    liggitt authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    8388d98 View commit details
    Browse the repository at this point in the history

  6. UPSTREAM: <carry>: force import ordering for stable codegen

    @deads2k
    Andy Goldstein authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    dadea4f View commit details
    Browse the repository at this point in the history

  7. UPSTREAM: <drop>: merge multiple registrations for the same group 

    :100644 100644 ac7025a... dce57e1... M	pkg/apimachinery/registered/registered.go
    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    58d8cdc View commit details
    Browse the repository at this point in the history

  8. UPSTREAM: <carry>: add service serving cert signer to token controller 

    :100644 100644 b32534e... 3e694fc... M	pkg/controller/serviceaccount/tokens_controller.go
    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    d934a42 View commit details
    Browse the repository at this point in the history

  9. UPSTREAM: <carry>: fix fifo resync, remove after FIFO is dead 

    :100644 100644 eaa35e6... 2a50982... M	pkg/client/cache/fifo.go
:100644 100644 0f2ceb8... 667c168... M	pkg/client/cache/fifo_test.go
    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    b398d12 View commit details
    Browse the repository at this point in the history

  10. UPSTREAM: <carry>: ignored namespace lifecycle resources

    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    b902757 View commit details
    Browse the repository at this point in the history

  11. UPSTREAM: <carry>: Disable file locking in clientcmd 

    Doesn't offer enough use, complicates creation and setup.
    @smarterclayton @deads2k
    smarterclayton authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    bcef1e9 View commit details
    Browse the repository at this point in the history

  12. UPSTREAM: <carry>: Disable e2e pre-check on scheduler predicates 

    We don't run system pods so waiting for them is somewhat pointless
    @deads2k
    Andy Goldstein authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    e806904 View commit details
    Browse the repository at this point in the history

  13. UPSTREAM: <drop>: add origin resource shortcuts to kube shortcut rest… 

    …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
    @deads2k
    Andy Goldstein authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    2b4d170 View commit details
    Browse the repository at this point in the history

  14. UPSTREAM: <carry>: Double container probe timeout 

    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
    @smarterclayton @deads2k
    smarterclayton authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    c0244d6 View commit details
    Browse the repository at this point in the history

  15. UPSTREAM: <carry>: Increase service endpoint test timeout 

    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
    @smarterclayton @deads2k
    smarterclayton authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    4585ffa View commit details
    Browse the repository at this point in the history

  16. UPSTREAM: <carry>: Pod deletion can be contended, causing test failure 

    Add a longer timeout to the test to deal with kubernetes#11016.

:100644 100644 fee5a4c9b4... 2fa0a919b4... M	test/e2e/pods.go
    @smarterclayton @deads2k
    smarterclayton authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    6704b24 View commit details
    Browse the repository at this point in the history

  17. UPSTREAM: docker/engine-api: 26718: Add Logs to ContainerAttachOptions 

    This is docker/docker PR 26718 because docker has reintegrated
engine-api into the primary docker repo.
    @sttts @deads2k
    sttts authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    1383c7a View commit details
    Browse the repository at this point in the history

  18. UPSTREAM: <carry>: update clientset generator for openshift groups 

    :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
    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    7254f2d View commit details
    Browse the repository at this point in the history

  19. UPSTREAM: carry: google.golang.org/grpc 231b4cfea0e79843053a33f5fe90b… 

    …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
    @sttts @deads2k
    sttts authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    c35e567 View commit details
    Browse the repository at this point in the history

  20. UPSTREAM: <carry>: match kube rbac setup in e2es with openshift kinds 

    :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
    @ncdc @deads2k
    ncdc authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    c713bc2 View commit details
    Browse the repository at this point in the history

  21. UPSTREAM: <carry>: openapi test, patch in updated package name 

    :100644 100644 517a280dea... c29f226bc8... M	staging/src/k8s.io/apiserver/pkg/endpoints/openapi/openapi_test.go
    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    952d1e1 View commit details
    Browse the repository at this point in the history

  22. UPSTREAM: 00000: make AsVersionedObjects default cleanly 

    :100644 100644 c77502bfec... c018a4973a... M	pkg/kubectl/resource/result.go
    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    b89d498 View commit details
    Browse the repository at this point in the history

  23. UPSTREAM: <carry>: Fix to avoid REST API calls at log level 2. 

    :100644 100644 4a4894cee0... fa2eb5773d... M	staging/src/k8s.io/apiserver/pkg/server/httplog/log.go
    @deads2k
    Avesh Agarwal authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    9dcd3f3 View commit details
    Browse the repository at this point in the history

  24. UPSTREAM: 00000: disambiguate operation names for legacy discovery 

    :100644 100644 fb648e5285... 21d36a92dd... M	staging/src/k8s.io/apiserver/pkg/endpoints/discovery/legacy.go
    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    bdbdd93 View commit details
    Browse the repository at this point in the history

  25. UPSTREAM: <drop>: drop post 3.7 rebase. allows disabled aggregator 

    :000000 100644 0000000000... fa8da1bf25... A	staging/src/k8s.io/apiserver/pkg/server/drop_patch.go
    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    b29a612 View commit details
    Browse the repository at this point in the history

  26. UPSTREAM: <carry>: remove JSON codec

    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    be28c48 View commit details
    Browse the repository at this point in the history

  27. UPSTREAM: 47975: make proto time precision match json

    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    ce52778 View commit details
    Browse the repository at this point in the history

  28. UPSTREAM: 48017: Plumb preferred version to nested object encoder

    @liggitt @deads2k
    liggitt authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    d15583f View commit details
    Browse the repository at this point in the history

  29. UPSTREAM: 47740: Add websocket protocol authentication method

    @liggitt @deads2k
    liggitt authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    605d6aa View commit details
    Browse the repository at this point in the history

  30. UPSTREAM: 47740: Use websocket protocol authenticator in apiserver

    @liggitt @deads2k
    liggitt authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    c68aec8 View commit details
    Browse the repository at this point in the history

  31. UPSTREAM: <carry>: add patch to allow shimming SCC 

    :000000 100644 0000000000... b684356ed4... A	pkg/registry/core/rest/scc_patch.go
:100644 100644 66e2a7be20... ea1028e61e... M	pkg/registry/core/rest/storage_core.go
    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    ce7bd67 View commit details
    Browse the repository at this point in the history

  32. UPSTREAM: <carry>: update client namer rules for amguity 

    :100644 100644 29ebffe021... 5c9d4d81b1... M	cmd/libs/go2idl/client-gen/generators/client_generator.go
    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    7a0bf1d View commit details
    Browse the repository at this point in the history

  33. UPSTREAM: <carry>: update group references 

    :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
    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    15ec6a1 View commit details
    Browse the repository at this point in the history

  34. UPSTREAM: 47823: don't pass CRI error through to waiting state reason

    @sjenning @deads2k
    sjenning authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    821e2dd View commit details
    Browse the repository at this point in the history

  35. UPSTREAM: 47094: prioritize messages for long steps

    @eparis @deads2k
    eparis authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    cadb81e View commit details
    Browse the repository at this point in the history

  36. UPSTREAM: 47919: Use %q formatter for error messages from the AWS SDK. … 

    …kubernetes#47789
    @deads2k
    Robert Rati authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    43cbf80 View commit details
    Browse the repository at this point in the history

  37. UPSTREAM: 47367: Add client side event rate limiting

    @derekwaynecarr @deads2k
    derekwaynecarr authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    81a4b2b View commit details
    Browse the repository at this point in the history

  38. UPSTREAM: 48261: Fix removing finalizer for garbage collector 

    The loop should use 'continue' not 'break', otherwise removeFinalizer()
not only removes "orphaningFinalizer" from its finalizers list but
also removes others.
    @deads2k
    FengyunPan authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    0bb01fb View commit details
    Browse the repository at this point in the history

  39. UPSTREAM: 48343: don't accept delete tokens that are waiting to be re… 

    …aped
    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    a9e19a2 View commit details
    Browse the repository at this point in the history

  40. UPSTREAM: 44784: Handle vendored names in OpenAPI gen 

    :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
    @smarterclayton @deads2k
    smarterclayton authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    914c8cb View commit details
    Browse the repository at this point in the history

  41. UPSTREAM: 48354: allow a deletestrategy to opt-out of GC

    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    85af5cb View commit details
    Browse the repository at this point in the history

  42. UPSTREAM: 48394: GuaranteedUpdate must write if stored data is not ca… 

    …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.
    @smarterclayton @deads2k
    smarterclayton authored and deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    cd460ce View commit details
    Browse the repository at this point in the history

  43. UPSTREAM: 47347: actually check for a live discovery endpoint before … 

    …aggregating
    @deads2k
    deads2k committed Jul 5, 2017
    Configuration menu
    Copy the full SHA
    695f48a View commit details
    Browse the repository at this point in the history