Codecov Report

Merging #2419 into master will increase coverage by 0.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #2419      +/-   ##
==========================================
+ Coverage    60.6%   60.61%   +0.01%     
==========================================
  Files         128      128              
  Lines       26362    26366       +4     
==========================================
+ Hits        15976    15982       +6     
+ Misses       8984     8978       -6     
- Partials     1402     1406       +4

LGTM 👍

I don't think we should merge this. I think there is a case where a user may want or need to use a proxy, and they can't because we've made it impossible.

I don't think we should merge this. I think there is a case where a user may want or need to use a proxy, and they can't because we've made it impossible.

My understanding is that this is not any worse than what it was before the gRPC change to start dialing into proxies first. So, I think it should be ok to make this change. We can easily provide the option to do proxy later. @dperny

That's fine then.

Looks like this PR was merged using the rebase and merge option on GitHub; trying to cherry-pick the original commit gave me a "bad object" error;

git checkout -b 17.09-backport-proxy upstream/bump_v17.09
git cherry-pick -s -S -x 6493e25b7c7df3e3f1616c34467ca0f2f450592e
fatal: bad object 6493e25b7c7df3e3f1616c34467ca0f2f450592e

Can we standardise on one approach (either "merge commit" or "rebase and merge"?

@thaJeztah the standard is supposed to always be "merge commit". I believe there was some confusion around that leading to this, but we've uniformly communicated that "merge commits" are the standard.

@nishanttotla thanks! I think it's possible to disable the other options if you have admin access to the repository

@thaJeztah done! Now only merge commits are allowed to SwarmKit.

Thanks!