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

Upstream sync #2

Merged
merged 43 commits into from
Apr 23, 2019
Merged

Upstream sync #2

merged 43 commits into from
Apr 23, 2019

Commits on Apr 10, 2019

  1. Add tcp service for grpc listeners 

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
    @crosbymichael
    crosbymichael committed Apr 10, 2019
    Configuration menu
    Copy the full SHA
    b911ae3 View commit details
    Browse the repository at this point in the history

  2. Set nofile to 1048576 

    Closes #3201

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
    @crosbymichael
    crosbymichael committed Apr 10, 2019
    Configuration menu
    Copy the full SHA
    1a1f8f1 View commit details
    Browse the repository at this point in the history

  3. Fix API forward events for shims 

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
    @crosbymichael
    crosbymichael committed Apr 10, 2019
    Configuration menu
    Copy the full SHA
    4ba756e View commit details
    Browse the repository at this point in the history

  4. Add support for required plugins. 

    Signed-off-by: Lantao Liu <lantaol@google.com>
    @Random-Liu
    Random-Liu committed Apr 10, 2019
    Configuration menu
    Copy the full SHA
    4b3b99e View commit details
    Browse the repository at this point in the history

  5. Use $TEST_RUNTIME for cri test. 

    Signed-off-by: Lantao Liu <lantaol@google.com>
    @Random-Liu
    Random-Liu committed Apr 10, 2019
    Configuration menu
    Copy the full SHA
    a12f836 View commit details
    Browse the repository at this point in the history

  6. Improve shim shutdown logic 

    Shims no longer call `os.Exit` but close the context on shutdown so that
events and other resources have hit the `defer`s.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
    @crosbymichael
    crosbymichael committed Apr 10, 2019
    Configuration menu
    Copy the full SHA
    ae87730 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2019

  1. Merge pull request #3197 from Random-Liu/add-required-plugins 

    Add support for required plugins.
    @estesp
    estesp authored Apr 11, 2019
    Configuration menu
    Copy the full SHA
    5703f41 View commit details
    Browse the repository at this point in the history

  2. Add dialer for events service 

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
    @crosbymichael
    crosbymichael committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    047348e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3204 from crosbymichael/fix-forward 

    Fix API forward events for shims
    @dmcgowan
    dmcgowan authored Apr 11, 2019
    Configuration menu
    Copy the full SHA
    acca107 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3202 from crosbymichael/nofile 

    Set nofile to 1048576
    @dmcgowan
    dmcgowan authored Apr 11, 2019
    Configuration menu
    Copy the full SHA
    ff90b03 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3162 from crosbymichael/tcpservice 

    Add tcp service for grpc listeners
    @dmcgowan
    dmcgowan authored Apr 11, 2019
    Configuration menu
    Copy the full SHA
    5f4c977 View commit details
    Browse the repository at this point in the history

  6. Rename hrpc to tcpServer 

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
    @crosbymichael
    crosbymichael committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    97d247c View commit details
    Browse the repository at this point in the history

  7. Check task list to avoid unnecessary cleanup. 

    Signed-off-by: Lantao Liu <lantaol@google.com>
    @Random-Liu
    Random-Liu committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    9cc5878 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2019

  1. Correct import path in services/server package 

    Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
    Jared Cordasco committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    a7af3c1 View commit details
    Browse the repository at this point in the history

  2. Correct PusherFunc helper to match Pusher intf 

    Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
    Jared Cordasco committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    fc167f9 View commit details
    Browse the repository at this point in the history

  3. Requeue events in the shim publisher 

    Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
    @crosbymichael
    crosbymichael committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    63c7a87 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3207 from crosbymichael/ttrpc-deps 

    Requeue events in the ttrpc publisher
    @estesp
    estesp authored Apr 12, 2019
    Configuration menu
    Copy the full SHA
    906e8bc View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3205 from Random-Liu/test-runtime-for-cri 

    Use $TEST_RUNTIME for cri test.
    @crosbymichael
    crosbymichael authored Apr 12, 2019
    Configuration menu
    Copy the full SHA
    32e788a View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2019

  1. bump mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb 

    - mistifyio/go-zfs#72 Switch to google/uuid
  - removes the github.com/pborman/uuid dependency

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Apr 14, 2019
    Configuration menu
    Copy the full SHA
    c9059c7 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2019

  1. Merge pull request #3216 from thaJeztah/bump_mistify_zfs 

    bump mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb
    @estesp
    estesp authored Apr 15, 2019
    Configuration menu
    Copy the full SHA
    396eba1 View commit details
    Browse the repository at this point in the history

  2. Update go-winio in vendor.conf 

    Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
    @kevpar
    kevpar committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    05dd66b View commit details
    Browse the repository at this point in the history

  3. Allow dumping stacks via ETW capture state 

    Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
    @kevpar
    kevpar committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    78f3dc4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3217 from kevpar/etw-capture-state 

    Enable dumping Goroutine stacks via ETW capture state
    John Howard authored Apr 15, 2019
    Configuration menu
    Copy the full SHA
    cc73dc3 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2019

  1. Access to client's GRPC connection object 

    Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
    @mxpv
    mxpv committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    be2cbd0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3208 from mxpv/client 

    Allow reuse client for external GRPC services
    @crosbymichael
    crosbymichael authored Apr 16, 2019
    Configuration menu
    Copy the full SHA
    665715b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3213 from jcordasc/small-fixes 

    Correct import path and PusherFunc signature
    @crosbymichael
    crosbymichael authored Apr 16, 2019
    Configuration menu
    Copy the full SHA
    8722ec0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3209 from Random-Liu/fix-v1-shim-cleanup 

    Shim v1: Check task list to avoid unnecessary cleanup.
    @estesp
    estesp authored Apr 16, 2019
    Configuration menu
    Copy the full SHA
    4c16017 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2019

  1. .mailmap: update Akihiro Suda's email address 

    No affiliation change (NTT).

The former email address will continue to be available for the time being.

For daily communication, I still prefer to use my gmail.com address.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
    @AkihiroSuda
    AkihiroSuda committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    cfb8b55 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3220 from AkihiroSuda/akihirosuda-email 

    .maimap: update Akihiro Suda's email address
    @crosbymichael
    crosbymichael authored Apr 17, 2019
    Configuration menu
    Copy the full SHA
    56d8a05 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2019

  1. Move to sha-specified test image for nanoserver 

    Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
    @estesp
    estesp committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    6bcf463 View commit details
    Browse the repository at this point in the history

  2. Fix error on pull hang in CI 

    Kill the underlying containerd after outputting error. Otherwise CI
hangs indefinitely and requires the CI infrastructure to kill the build
at the timeout expiration.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
    @fuweid @estesp
    fuweid authored and estesp committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    a4942ca View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3222 from estesp/test-appveyor 

    Update to sha-specific nanoserver image reference to fix AppVeyor CI runs
    @crosbymichael
    crosbymichael authored Apr 18, 2019
    Configuration menu
    Copy the full SHA
    b819d05 View commit details
    Browse the repository at this point in the history

  4. Write stack dump to os.TempDir() as well 

    Signed-off-by: John Howard <jhoward@microsoft.com>
    John Howard committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    7718d06 View commit details
    Browse the repository at this point in the history

  5. bump gocapability 

    full diff: syndtr/gocapability@db04d3c...d983527

changes included:

  - syndtr/gocapability#14 capability: Deprecate NewPid and NewFile for NewPid2 and NewFile2
  - syndtr/gocapability#16 Fix capHeader.pid type

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    0fd0256 View commit details
    Browse the repository at this point in the history

  6. Update x/crypto to 88737f569e3a9c7ab309cdc09a07fe7fc87233c3 

    full diff: golang/crypto@4979611...88737f5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    a333dbc View commit details
    Browse the repository at this point in the history

  7. bump containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    06a3a48 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #3224 from thaJeztah/bump_crypto 

    Update x/crypto to 88737f569e3a9c7ab309cdc09a07fe7fc87233c3
    @estesp
    estesp authored Apr 18, 2019
    Configuration menu
    Copy the full SHA
    a905b0f View commit details
    Browse the repository at this point in the history

  9. Merge pull request #3190 from jhowardmsft/jjh/stack2file 

    Write stack dump to `os.TempDir()` as well
    @estesp
    estesp authored Apr 18, 2019
    Configuration menu
    Copy the full SHA
    ffe0b69 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #3223 from thaJeztah/bump_gocapability 

    Bump syndtr/gocapability d983527, containerd/console
    @crosbymichael
    crosbymichael authored Apr 18, 2019
    Configuration menu
    Copy the full SHA
    a91e043 View commit details
    Browse the repository at this point in the history

  11. Convert Windows CI to use Microsoft MCR image urls 

    Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
    @jterry75
    jterry75 committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    e6fc0ed View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2019

  1. Merge pull request #3230 from jterry75/fix_windows_image 

    Convert Windows CI to use Microsoft MCR image urls
    @estesp
    estesp authored Apr 19, 2019
    Configuration menu
    Copy the full SHA
    c2fb5d7 View commit details
    Browse the repository at this point in the history

  2. Don't write dumped stacks to file for ETW capture state 

    Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
    @kevpar
    kevpar committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    0376dd4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3231 from kevpar/dump-stacks-to-file 

    Don't write dumped stacks to file for ETW capture state
    @estesp
    estesp authored Apr 19, 2019
    Configuration menu
    Copy the full SHA
    835e6d0 View commit details
    Browse the repository at this point in the history