Skip to content

Commit a04aeea

Browse files
nathanleclairenathanleclaire
authored
Merge pull request docker-archive#451 from chungers/pmode-vendor
Updating vendor.json
2 parents 62c3990 + 7c70f9d commit a04aeea

File tree

9 files changed

+165
-49
lines changed

9 files changed

+165
-49
lines changed

‎pkg/loadbalancer/docker.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ package loadbalancer
33
import (
44
"crypto/tls"
55
"fmt"
6-
log "github.com/Sirupsen/logrus"
7-
"github.com/docker/engine-api/client"
8-
"github.com/docker/go-connections/sockets"
9-
"github.com/docker/go-connections/tlsconfig"
106
"net/http"
117
"os"
128
"runtime"
9+
10+
log "github.com/Sirupsen/logrus"
11+
"github.com/docker/docker/client"
12+
"github.com/docker/go-connections/sockets"
13+
"github.com/docker/go-connections/tlsconfig"
1314
)
1415

1516
const (
16-
clientVersion = "1.24"
17+
clientVersion = "1.25"
1718
)
1819

1920
// NewDockerClient creates a new API client.

‎pkg/loadbalancer/info.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package loadbalancer
22

33
import (
44
log "github.com/Sirupsen/logrus"
5-
"github.com/docker/engine-api/client"
5+
"github.com/docker/docker/client"
66
"golang.org/x/net/context"
77
)
88

‎pkg/loadbalancer/listener.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ package loadbalancer
22

33
import (
44
"fmt"
5-
log "github.com/Sirupsen/logrus"
6-
"github.com/docker/engine-api/types/swarm"
75
"net/url"
86
"strconv"
97
"strings"
8+
9+
log "github.com/Sirupsen/logrus"
10+
"github.com/docker/docker/api/types/swarm"
1011
)
1112

1213
type listener struct {
@@ -131,7 +132,7 @@ func listenersFromExposedPorts(service swarm.Service) []*listener {
131132
requestedPublishPorts := map[uint32]uint32{} // key - target port Y (app/container port), value = publish port X
132133
if service.Spec.EndpointSpec != nil {
133134
for _, p := range service.Spec.EndpointSpec.Ports {
134-
if p.PublishedPort > 0 {
135+
if p.PublishedPort > 0 && strings.EqualFold(string(p.PublishMode), "ingress") {
135136
// Only if the user has specify the desired publish port
136137
requestedPublishPorts[p.TargetPort] = p.PublishedPort
137138
}

‎pkg/loadbalancer/listener_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package loadbalancer
22

33
import (
4-
"github.com/docker/engine-api/types/swarm"
4+
"github.com/docker/docker/types/swarm"
55
"github.com/stretchr/testify/require"
66
"testing"
77
)

‎pkg/loadbalancer/poll.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package loadbalancer
22

33
import (
44
log "github.com/Sirupsen/logrus"
5-
"github.com/docker/engine-api/client"
6-
"github.com/docker/engine-api/types"
7-
"github.com/docker/engine-api/types/swarm"
5+
"github.com/docker/docker/api/types"
6+
"github.com/docker/docker/api/types/swarm"
7+
"github.com/docker/docker/client"
88
"golang.org/x/net/context"
99
"reflect"
1010
"sync"

‎pkg/loadbalancer/poll_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package loadbalancer
22

33
import (
4-
mock_client "github.com/docker/editions/mock/docker/engine-api/client"
5-
"github.com/docker/engine-api/types/swarm"
4+
"github.com/docker/docker/api/types/swarm"
5+
mock_client "github.com/docker/editions/mock/docker/docker/client"
66
"github.com/golang/mock/gomock"
77
"github.com/stretchr/testify/require"
88
"golang.org/x/net/context"

‎pkg/loadbalancer/services.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package loadbalancer
33
import (
44
"fmt"
55
log "github.com/Sirupsen/logrus"
6-
"github.com/docker/engine-api/types/swarm"
6+
"github.com/docker/docker/api/types/swarm"
77
"time"
88
)
99

‎pkg/loadbalancer/services_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package loadbalancer
22

33
import (
4-
"github.com/docker/engine-api/types/swarm"
4+
"github.com/docker/docker/api/types/swarm"
55
"github.com/stretchr/testify/require"
66
"testing"
77
)

‎vendor/vendor.json

Lines changed: 146 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@
3939
"revisionTime": "2016-04-13T16:48:03Z"
4040
},
4141
{
42-
"checksumSHA1": "aIVG5Hhd+jR/5G05Hquc4OyVvmY=",
42+
"checksumSHA1": "B+GonfgNwOAJMEe0WUHQGATRtMA=",
4343
"path": "github.com/Microsoft/go-winio",
44-
"revision": "f778f05015353be65d242f3fedc18695756153bb",
45-
"revisionTime": "2016-03-06T02:57:29Z"
44+
"revision": "562bb09f6612d9a4e91597184709d1cdba95af93",
45+
"revisionTime": "2016-11-03T18:56:17Z"
4646
},
4747
{
48-
"checksumSHA1": "2avCvSn0XonfApKKuTMyiQmk7s0=",
48+
"checksumSHA1": "z9ckOyaoHErgXLQDx514AOMxdeo=",
4949
"path": "github.com/Sirupsen/logrus",
50-
"revision": "3ec0642a7fb6488f65b06f9040adc67e3990296a",
51-
"revisionTime": "2016-08-29T20:23:21Z"
50+
"revision": "abc6f20dabf4b10195f233ad21ea6c5ba33acae0",
51+
"revisionTime": "2016-11-11T12:09:51Z"
5252
},
5353
{
5454
"checksumSHA1": "AR18v6oWAJZzHOGAwwK2Rk98xqM=",
@@ -228,14 +228,110 @@
228228
{
229229
"checksumSHA1": "f1wARLDzsF/JoyN01yoxXEwFIp8=",
230230
"path": "github.com/docker/distribution/digest",
231-
"revision": "feddf6cd4e439577ab270d8e3ba63a5d7c5c0d55",
232-
"revisionTime": "2016-06-02T18:22:55Z"
231+
"revision": "7694c31658cfc0f9db97cd7ffaef9008b620a4d2",
232+
"revisionTime": "2016-11-14T23:22:52Z"
233233
},
234234
{
235-
"checksumSHA1": "PzXRTLmmqWXxmDqdIXLcRYBma18=",
235+
"checksumSHA1": "0nVrpfzMAIALB7Glf7kpXjYe/Ig=",
236236
"path": "github.com/docker/distribution/reference",
237-
"revision": "feddf6cd4e439577ab270d8e3ba63a5d7c5c0d55",
238-
"revisionTime": "2016-06-02T18:22:55Z"
237+
"revision": "7694c31658cfc0f9db97cd7ffaef9008b620a4d2",
238+
"revisionTime": "2016-11-14T23:22:52Z"
239+
},
240+
{
241+
"checksumSHA1": "dJSH0r1iCWsqqk02ngrfKjWOraI=",
242+
"path": "github.com/docker/docker/api/types",
243+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
244+
"revisionTime": "2016-11-15T21:31:06Z"
245+
},
246+
{
247+
"checksumSHA1": "jVJDbe0IcyjoKc2xbohwzQr+FF0=",
248+
"path": "github.com/docker/docker/api/types/blkiodev",
249+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
250+
"revisionTime": "2016-11-15T21:31:06Z"
251+
},
252+
{
253+
"checksumSHA1": "a7YUrTYYcZoERgGNr2OqCdj/L48=",
254+
"path": "github.com/docker/docker/api/types/container",
255+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
256+
"revisionTime": "2016-11-15T21:31:06Z"
257+
},
258+
{
259+
"checksumSHA1": "fzeGodcTcWuV18AT0BcvB4EFByo=",
260+
"path": "github.com/docker/docker/api/types/events",
261+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
262+
"revisionTime": "2016-11-15T21:31:06Z"
263+
},
264+
{
265+
"checksumSHA1": "oNOnELdnOaqMJgiFsS85fHecBy0=",
266+
"path": "github.com/docker/docker/api/types/filters",
267+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
268+
"revisionTime": "2016-11-15T21:31:06Z"
269+
},
270+
{
271+
"checksumSHA1": "4rxOgOCSZleDDi5HKWnhwR+PnK4=",
272+
"path": "github.com/docker/docker/api/types/mount",
273+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
274+
"revisionTime": "2016-11-15T21:31:06Z"
275+
},
276+
{
277+
"checksumSHA1": "vGvZtL6F5XsNlr1p/tmLO1b3dN0=",
278+
"path": "github.com/docker/docker/api/types/network",
279+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
280+
"revisionTime": "2016-11-15T21:31:06Z"
281+
},
282+
{
283+
"checksumSHA1": "BHWRYLuNJly1Asgi2s/OQiS+LJU=",
284+
"path": "github.com/docker/docker/api/types/reference",
285+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
286+
"revisionTime": "2016-11-15T21:31:06Z"
287+
},
288+
{
289+
"checksumSHA1": "XNedxDfkAxGCe5d8nLNPJRbWwDE=",
290+
"path": "github.com/docker/docker/api/types/registry",
291+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
292+
"revisionTime": "2016-11-15T21:31:06Z"
293+
},
294+
{
295+
"checksumSHA1": "VTxWyFud/RedrpllGdQonVtGM/A=",
296+
"path": "github.com/docker/docker/api/types/strslice",
297+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
298+
"revisionTime": "2016-11-15T21:31:06Z"
299+
},
300+
{
301+
"checksumSHA1": "jC1aa8j3Z8exu1p1Nq7DBwsiTtQ=",
302+
"path": "github.com/docker/docker/api/types/swarm",
303+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
304+
"revisionTime": "2016-11-15T21:31:06Z"
305+
},
306+
{
307+
"checksumSHA1": "XwEQCyDAwJhWtDk0njEv/qHlWvA=",
308+
"path": "github.com/docker/docker/api/types/time",
309+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
310+
"revisionTime": "2016-11-15T21:31:06Z"
311+
},
312+
{
313+
"checksumSHA1": "iRarXGLKK2hKs5sdktWlAcP6adM=",
314+
"path": "github.com/docker/docker/api/types/versions",
315+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
316+
"revisionTime": "2016-11-15T21:31:06Z"
317+
},
318+
{
319+
"checksumSHA1": "RIgimuGvNoJ++D2oVc2HZWO1ULI=",
320+
"path": "github.com/docker/docker/api/types/volume",
321+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
322+
"revisionTime": "2016-11-15T21:31:06Z"
323+
},
324+
{
325+
"checksumSHA1": "pwOlKyMkC2o9H1gfjTtdyUfRpRs=",
326+
"path": "github.com/docker/docker/client",
327+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
328+
"revisionTime": "2016-11-15T21:31:06Z"
329+
},
330+
{
331+
"checksumSHA1": "8I0Ez+aUYGpsDEVZ8wN/Ztf6Zqs=",
332+
"path": "github.com/docker/docker/pkg/tlsconfig",
333+
"revision": "5f577bfa6b319ab88dacc4259b4d8485bd7e1b9f",
334+
"revisionTime": "2016-11-15T21:31:06Z"
239335
},
240336
{
241337
"checksumSHA1": "PDXSPZlb43hdy26n6hZi2UJxi5I=",
@@ -328,28 +424,28 @@
328424
"revisionTime": "2016-09-03T00:12:24Z"
329425
},
330426
{
331-
"checksumSHA1": "42YGW0xAQT+pnQ2s8A9tYgfQhAg=",
427+
"checksumSHA1": "JbiWTzH699Sqz25XmDlsARpMN9w=",
332428
"path": "github.com/docker/go-connections/nat",
333-
"revision": "988efe982fdecb46f01d53465878ff1f2ff411ce",
334-
"revisionTime": "2016-09-03T00:06:09Z"
429+
"revision": "4ccf312bf1d35e5dbda654e57a9be4c3f3cd0366",
430+
"revisionTime": "2016-11-15T16:18:49Z"
335431
},
336432
{
337-
"checksumSHA1": "3sQ35fcqLJRnyTqaZn8Zb9l97uk=",
433+
"checksumSHA1": "wV/3d0bXQI540Y6lVXgwfxfboys=",
338434
"path": "github.com/docker/go-connections/sockets",
339-
"revision": "988efe982fdecb46f01d53465878ff1f2ff411ce",
340-
"revisionTime": "2016-09-03T00:06:09Z"
435+
"revision": "4ccf312bf1d35e5dbda654e57a9be4c3f3cd0366",
436+
"revisionTime": "2016-11-15T16:18:49Z"
341437
},
342438
{
343-
"checksumSHA1": "acyHmsV4QAeJGUQaOGsO9qHmMG0=",
439+
"checksumSHA1": "DYKVPp+oYtFl91zBUk0o45CQw7Q=",
344440
"path": "github.com/docker/go-connections/tlsconfig",
345-
"revision": "988efe982fdecb46f01d53465878ff1f2ff411ce",
346-
"revisionTime": "2016-09-03T00:06:09Z"
441+
"revision": "4ccf312bf1d35e5dbda654e57a9be4c3f3cd0366",
442+
"revisionTime": "2016-11-15T16:18:49Z"
347443
},
348444
{
349-
"checksumSHA1": "HbqQOZa0qqtYp9AHhQCjOiFLdFc=",
445+
"checksumSHA1": "fInaxX723rCKOcfKMY8/x6f1o8E=",
350446
"path": "github.com/docker/go-units",
351-
"revision": "09dda9d4b0d748c57c14048906d3d094a58ec0c9",
352-
"revisionTime": "2016-05-24T16:34:22Z"
447+
"revision": "8a7beacffa3009a9ac66bad506b18ffdd110cf97",
448+
"revisionTime": "2016-10-20T21:32:27Z"
353449
},
354450
{
355451
"checksumSHA1": "FCeEm2BWZV/n4oTy+SGd/k0Ab5c=",
@@ -380,8 +476,14 @@
380476
{
381477
"checksumSHA1": "3AoPMXlmVq2+iWMpsdJZkcUKHB8=",
382478
"path": "github.com/opencontainers/runc/libcontainer/user",
383-
"revision": "afaa21f79ade3b2e99a68f3f15e7219155aa4662",
384-
"revisionTime": "2016-06-03T22:35:53Z"
479+
"revision": "43c43004ef0563ceab23bb8f254cd5061a6f607e",
480+
"revisionTime": "2016-11-14T11:01:43Z"
481+
},
482+
{
483+
"checksumSHA1": "ynJSWoF6v+3zMnh9R0QmmG6iGV8=",
484+
"path": "github.com/pkg/errors",
485+
"revision": "248dadf4e9068a0b3e79f02ed0a610d935de5302",
486+
"revisionTime": "2016-10-29T09:36:37Z"
385487
},
386488
{
387489
"checksumSHA1": "zKKp5SZ3d3ycKe4EKMNT0BqAWBw=",
@@ -417,20 +519,32 @@
417519
{
418520
"checksumSHA1": "9jjO5GjLa0XF/nfWihF02RoH4qc=",
419521
"path": "golang.org/x/net/context",
420-
"revision": "1358eff22f0dd0c54fc521042cc607f6ff4b531a",
421-
"revisionTime": "2016-09-01T04:28:38Z"
522+
"revision": "e57319ce2bbbdc638169d4756554fbaedc805399",
523+
"revisionTime": "2016-11-15T18:38:51Z"
524+
},
525+
{
526+
"checksumSHA1": "WHc3uByvGaMcnSoI21fhzYgbOgg=",
527+
"path": "golang.org/x/net/context/ctxhttp",
528+
"revision": "e57319ce2bbbdc638169d4756554fbaedc805399",
529+
"revisionTime": "2016-11-15T18:38:51Z"
422530
},
423531
{
424532
"checksumSHA1": "LvdVRE0FqdR68SvVpRkHs1rxhcA=",
425533
"path": "golang.org/x/net/proxy",
426-
"revision": "1358eff22f0dd0c54fc521042cc607f6ff4b531a",
427-
"revisionTime": "2016-09-01T04:28:38Z"
534+
"revision": "e57319ce2bbbdc638169d4756554fbaedc805399",
535+
"revisionTime": "2016-11-15T18:38:51Z"
428536
},
429537
{
430-
"checksumSHA1": "85cxg2Rd2bSb8OLyjHqCSu2xbVY=",
538+
"checksumSHA1": "KqecwXo3OO+p4N+E9RhlHvl9I+w=",
431539
"path": "golang.org/x/sys/unix",
432-
"revision": "7a56174f0086b32866ebd746a794417edbc678a1",
433-
"revisionTime": "2016-03-02T19:58:15Z"
540+
"revision": "b699b7032584f0953262cb2788a0ca19bb494703",
541+
"revisionTime": "2016-11-10T11:58:56Z"
542+
},
543+
{
544+
"checksumSHA1": "fpW2dhGFC6SrVzipJx7fjg2DIH8=",
545+
"path": "golang.org/x/sys/windows",
546+
"revision": "b699b7032584f0953262cb2788a0ca19bb494703",
547+
"revisionTime": "2016-11-10T11:58:56Z"
434548
},
435549
{
436550
"checksumSHA1": "+OgOXBoiQ+X+C2dsAeiOHwBIEH0=",

0 commit comments

Comments
 (0)