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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge v1.2.1 master #1383

Merged
merged 24 commits into from
Apr 12, 2017
Merged

Merge v1.2.1 master #1383

merged 24 commits into from
Apr 12, 2017

Commits on Apr 11, 2017

  1. Bump go-rancher version

    @emilevauge
    Manuel Laufenberg authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    8d650da View commit details
    Browse the repository at this point in the history

  2. update oxy hash

    @emilevauge
    dtomcej authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    ef83a59 View commit details
    Browse the repository at this point in the history

  3. Docs: Update default value for DefaultMaxIdleConnsPerHost.

    @timoreimann @emilevauge
    timoreimann authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    ec7ba15 View commit details
    Browse the repository at this point in the history

  4. Chunk taskArns into groups of 100 

    If the ECS cluster has > 100 tasks, passing them to
ecs.DescribeTasksRequest() will result in the AWS API returning
errors.

This patch breaks them into chunks of at most 100, and calls
DescribeTasks for each chunk.

We also return early in case ListTasks returns no values; this
prevents DescribeTasks from throwing HTTP errors.
    @owen @emilevauge
    owen authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    c876462 View commit details
    Browse the repository at this point in the history

  5. Fix metrics registering

    @matevzmihalic @emilevauge
    matevzmihalic authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    f324983 View commit details
    Browse the repository at this point in the history

  6. Rename health check URL parameter to path. 

    Also improve documentation.
    @timoreimann @emilevauge
    timoreimann authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    a507cb4 View commit details
    Browse the repository at this point in the history

  7. Pass context to ListReleases when checking for new versions. 

    Required by go-github update.
    @timoreimann @emilevauge
    timoreimann authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    e011792 View commit details
    Browse the repository at this point in the history

  8. Update vulcand and pin deps in glide.yaml

    @akanto @emilevauge
    akanto authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    5250c9c View commit details
    Browse the repository at this point in the history

  9. Reset glide files to versions from upstream/v1.2.

    @timoreimann @emilevauge
    timoreimann authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    fd1cf24 View commit details
    Browse the repository at this point in the history

  10. Update github.com/containous/oxy only.

    @timoreimann @emilevauge
    timoreimann authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    b02e289 View commit details
    Browse the repository at this point in the history

  11. Revert "Pass context to ListReleases when checking for new versions." 

    This reverts commit 07db6a2.
    @timoreimann @emilevauge
    timoreimann authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    b385ffa View commit details
    Browse the repository at this point in the history

  12. Fix default config in generic Mesos provider 

    Signed-off-by: Emile Vauge <emile@vauge.com>
    @emilevauge
    emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    736f9b3 View commit details
    Browse the repository at this point in the history

  13. Removed unused log 

    Signed-off-by: Emile Vauge <emile@vauge.com>
    @emilevauge
    emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    51f3f6b View commit details
    Browse the repository at this point in the history

  14. Refactor k8s client config 

    Signed-off-by: Emile Vauge <emile@vauge.com>
    @emilevauge
    emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    b99a919 View commit details
    Browse the repository at this point in the history

  15. Abort Kubernetes Ingress update if Kubernetes API call fails (#1295) 

    * Abort Kubernetes Ingress update if Kubernetes API call fails

Currently if a Kubernetes API call fails we potentially remove a working service from Traefik. This changes it so if a Kubernetes API call fails we abort out of the ingress update and use the current working config. Github issue: #1240

Also added a test to cover when requested resources (services and endpoints) that the user has specified don鈥檛 exist.

* Specifically capturing the tc range as documented here: https://blog.golang.org/subtests

* Updating service names in the mock data to be more clear

* Updated expected data to match what currently happens in the loadIngress

* Adding a blank Servers to the expected output so we compare against that instead of nil.

* Replacing the JSON test output with spew for the TestMissingResources test to help ensure we have useful output incase of failures

* Adding a temporary fix to the GetEndoints mocked function so we can override the return value for if the endpoints exist.

After the 1.2 release the use of properExists should be removed and the GetEndpoints function should return false for the second value indicating the endpoint doesn鈥檛 exist. However at this time that would break a lot of the tests.

* Adding quick TODO line about removing the properExists property

* Link to issue 1307 re: properExists flag.
    @regner @emilevauge
    regner authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    b023939 View commit details
    Browse the repository at this point in the history

  16. Docker: Added warning if network could not be found (#1310) 

    * Added warning if network could not be found

* Removed regex import from master

* Corrected wrong function call
    @zweizeichen @emilevauge
    zweizeichen authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    a73fee5 View commit details
    Browse the repository at this point in the history

  17. Add check on task status in addition to desired status

    @Yshayy @emilevauge
    Yshayy authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    5c2d91a View commit details
    Browse the repository at this point in the history

  18. Add Docker task list test 

    Signed-off-by: Emile Vauge <emile@vauge.com>
    @emilevauge
    emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    a456d36 View commit details
    Browse the repository at this point in the history

  19. sub-tests + Fatalf/Errorf 

    Signed-off-by: Emile Vauge <emile@vauge.com>
    @emilevauge
    emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    6edc092 View commit details
    Browse the repository at this point in the history

  20. Prepare release v1.2.0 

    Signed-off-by: Emile Vauge <emile@vauge.com>
    @emilevauge
    emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    2cd4c82 View commit details
    Browse the repository at this point in the history

  21. k8s: Do not log service fields when GetService is failing. 

    Update tests too.
    @timoreimann @emilevauge
    timoreimann authored and emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    f2297dd View commit details
    Browse the repository at this point in the history

  22. bump lego 0e2937900 

    Signed-off-by: Emile Vauge <emile@vauge.com>
    @emilevauge
    emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    87ce060 View commit details
    Browse the repository at this point in the history

  23. Prepare release v1.2.1 

    Signed-off-by: Emile Vauge <emile@vauge.com>
    @emilevauge
    emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    a590155 View commit details
    Browse the repository at this point in the history

  24. Merge v1.2.1-master 

    Signed-off-by: Emile Vauge <emile@vauge.com>
    @emilevauge
    emilevauge committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    aeb1718 View commit details
    Browse the repository at this point in the history