Bump swarmkit to 0fe3f12bdbfee0d47216de0118c569b1042e1588 #37059

thaJeztah · 2018-05-14T14:37:12Z

Full diff: moby/swarmkit@bd69f6e...0fe3f12

Changes included:

[fips] Support a flag that indicates that the cluster requires mandatory FIPS mode on all nodes swarmkit#2594 [fips] Support a flag that indicates that the cluster requires mandatory FIPS mode on all nodes
[fips] Propagate the FIPS boolean to the manager, raft storage layer, and raft DEK management swarmkit#2586 [fips] Propagate the FIPS boolean to the manager, raft storage layer, and raft DEK management
vendor: update gRPC, protobuf swarmkit#2452 vendor: update gRPC, protobuf
Bump CFSSL swarmkit#2644 Bump CFSSL
Minor cleanup of raft encryption algorithms swarmkit#2635 Minor cleanup of raft encryption algorithms
[docs] Document how raft encryption works swarmkit#2622 [docs] Document how raft encryption works
Fix deepcopy.Copy panicing with BoolValue swarmkit#2652 Fix deepcopy.Copy panicing with BoolValue

Updated vendors related to the above;

update google.golang.org/grpc to v1.7.5 (full diff: grpc/grpc-go@v1.3.0...v1.7.5)
update github.com/gogo/protobuf to v0.5 (full diff: gogo/protobuf@v0.4...v0.5)
update github.com/golang/protobuf to 1e59b77b52bf8e4b449a57e6f79f21226d571845 (full diff: golang/protobuf@7a211bc...1e59b77)

Bump Google Cloud SDK for gRPC

golang.org/x/oauth2 golang/oauth2@96382aa...cdc340f
google.golang.org/api googleapis/google-api-go-client@3cc2e59...d7aa31f
cloud.google.com/go googleapis/google-cloud-go@9d965e6...v0.22.0
- Before this we were roughly on v0.6.0; googleapis/google-cloud-go@9d965e6...v0.6.0
github.com/googleapis/gax-go googleapis/gax-go@da06d19...de2cc08
google.golang.org/genproto googleapis/go-genproto@d80a6e2...7bb2a89
go.opencensus.io v0.9.0

Update gRPC, protobuf, to match containerd 1.1.0

google.golang.org/grpc grpc/grpc-go@v1.7.5...v1.10.1
github.com/golang/protobuf golang/protobuf@1e59b77...v1.1.0
github.com/gogo/protobuf gogo/protobuf@v0.5...v1.0.0
github.com/cloudflare/cfssl https://github.com/cloudflare/cfssl/7fb22c8cba7ecaf98e4082d22d65800cf45e042a...1.3.2
github.com/google/certificate-transparency-go google/certificate-transparency-go@d90e65c...05f3323
golang.org/x/crypto golang/crypto@558b687...1a580b3

Update BuildKit and dependencies

Updates BuildKit to current master (github.com/moby/buildkit): moby/buildkit@be6da00...7a4a2a2

Update vendored dependencies to match BuildKit:

add github.com/grpc-ecosystem/grpc-opentracing dependency
add github.com/opentracing/opentracing-go dependency
downgrade github.com/pkg/errors to a tagged release: pkg/errors@v0.8.0...839d9e9
github.com/containerd/continuity containerd/continuity@d8fb858...3e8f2ea
- Add fstest.CreateSocket containerd/continuity#110 Add fstest.CreateSocket
github.com/containerd/fifo containerd/fifo@fbfb6a1...3d5202a
- Add apache license to files
github.com/containerd/go-runc containerd/go-runc@4f6e87a...f271fa2
- runc: be able to get the full ps data (ps -f table) containerd/go-runc#37 runc: be able to get the full ps data (ps -f table)
- Add ConsoleSocket to RestoreOpts containerd/go-runc#40 Add ConsoleSocket to RestoreOpts
github.com/containerd/console containerd/console@2748ece...cb7008a
- Add OpenBSD support containerd/console#21 Add OpenBSD support
github.com/syndtr/gocapability syndtr/gocapability@2c00dae...db04d3c
- Add support for ambient capabilities syndtr/gocapability#11 Add support for ambient capabilities
- Fix issue #12: break too early syndtr/gocapability#13 Fix issue Easy setup w/ Vagrant & Puppet #12: break too early
golang.org/x/net golang/net@5561cd9...0ed95ab
golang.org/x/text golang/text@f72d839...19e5161
golang.org/x/time golang/time@a4bde12...f51c127
github.com/tonistiigi/fsutil tonistiigi/fsutil@dea3a0d...93a0fd1
- Don’t hang on diskwriter errors tonistiigi/fsutil#16 Don not hang on diskwriter errors
- fix fd leak on send tonistiigi/fsutil#17 fix fd leak on send
- avoid possible receiver panic/deadlock on sender error tonistiigi/fsutil#18 avoid possible receiver panic/deadlock on sender error
- receive: read stream to EOF on close tonistiigi/fsutil#20 receive: read stream to EOF on close
- avoid not-exist error on walker tonistiigi/fsutil#21 avoid not-exist error on walker
- Generalize chtimes() implementation for non-linux platforms tonistiigi/fsutil#27 Generalize chtimes() implementation for non-linux platforms
- walker: handle parents and subdirs in includepatterns tonistiigi/fsutil#28 walker: handle parents and subdirs in includepatterns

thaJeztah · 2018-05-14T14:37:28Z

ping @cyli PTAL (not sure if the API changes were still desirable)

yongtang

LGTM

codecov · 2018-05-14T20:47:22Z

Codecov Report

❗ No coverage uploaded for pull request base (master@ca25df3). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #37059   +/-   ##
=========================================
  Coverage          ?   35.31%           
=========================================
  Files             ?      615           
  Lines             ?    45956           
  Branches          ?        0           
=========================================
  Hits              ?    16230           
  Misses            ?    27583           
  Partials          ?     2143

thaJeztah · 2018-05-15T17:40:58Z

Bumped once more to include moby/swarmkit#2452

cpuguy83 · 2018-05-15T17:46:22Z

Compile issues.

thaJeztah · 2018-05-15T17:58:20Z

dang; looks like issues in other vendors 😓

17:50:06 # github.com/docker/docker/vendor/github.com/moby/buildkit/session/filesync
17:50:06 vendor/github.com/moby/buildkit/session/filesync/filesync.go:69:13: undefined: metadata.FromContext
17:50:06 vendor/github.com/moby/buildkit/session/filesync/filesync.go:185:8: undefined: metadata.NewContext
17:50:33 # github.com/docker/docker/vendor/cloud.google.com/go/logging/apiv2
17:50:33 vendor/cloud.google.com/go/logging/apiv2/config_client.go:167:11: undefined: metadata.FromContext
17:50:33 vendor/cloud.google.com/go/logging/apiv2/config_client.go:168:8: undefined: metadata.NewContext
17:50:33 vendor/cloud.google.com/go/logging/apiv2/config_client.go:202:11: undefined: metadata.FromContext
17:50:33 vendor/cloud.google.com/go/logging/apiv2/config_client.go:203:8: undefined: metadata.NewContext
17:50:33 vendor/cloud.google.com/go/logging/apiv2/config_client.go:218:11: undefined: metadata.FromContext
17:50:33 vendor/cloud.google.com/go/logging/apiv2/config_client.go:219:8: undefined: metadata.NewContext
17:50:33 vendor/cloud.google.com/go/logging/apiv2/config_client.go:234:11: undefined: metadata.FromContext
17:50:33 vendor/cloud.google.com/go/logging/apiv2/config_client.go:235:8: undefined: metadata.NewContext
17:50:33 vendor/cloud.google.com/go/logging/apiv2/config_client.go:250:11: undefined: metadata.FromContext
17:50:33 vendor/cloud.google.com/go/logging/apiv2/config_client.go:251:8: undefined: metadata.NewContext
17:50:33 vendor/cloud.google.com/go/logging/apiv2/config_client.go:251:8: too many errors

cpuguy83 · 2018-05-15T18:35:50Z

Working on gcloud.

thaJeztah · 2018-05-15T18:46:38Z

Have a bump, but more failures, let me push what I have right now

thaJeztah · 2018-05-15T18:49:33Z

golang.org/x/oauth2 golang/oauth2@96382aa...cdc340f
google.golang.org/api googleapis/google-api-go-client@3cc2e59...d7aa31f
cloud.google.com/go googleapis/google-cloud-go@9d965e6...v0.22.0
- Before this we were roughly on v0.6.0; googleapis/google-cloud-go@9d965e6...v0.6.0
github.com/googleapis/gax-go googleapis/gax-go@da06d19...de2cc08
google.golang.org/genproto googleapis/go-genproto@d80a6e2...7bb2a89
go.opencensus.io v0.9.0

Building: bundles/binary-daemon/dockerd-dev
# github.com/docker/docker/vendor/google.golang.org/genproto/googleapis/rpc/status
vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go:111:28: undefined: proto.InternalMessageInfo
# github.com/docker/docker/vendor/google.golang.org/genproto/googleapis/api/label
vendor/google.golang.org/genproto/googleapis/api/label/label.pb.go:86:37: undefined: proto.InternalMessageInfo
# github.com/docker/docker/vendor/google.golang.org/genproto/protobuf/field_mask
vendor/google.golang.org/genproto/protobuf/field_mask/field_mask.pb.go:258:31: undefined: proto.InternalMessageInfo
# github.com/docker/docker/vendor/google.golang.org/genproto/googleapis/api/annotations
vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go:63:26: undefined: proto.InternalMessageInfo
vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go:349:30: undefined: proto.InternalMessageInfo
vendor/google.golang.org/genproto/googleapis/api/annotations/http.pb.go:614:39: undefined: proto.InternalMessageInfo

cyli

The changes themselves LGTM - the API changes are just in swarmkit, and the FIPS boolean will just be false here since it's not routed through to the engine.

Sorry about the vendor issues :|

thaJeztah · 2018-05-16T20:40:35Z

Bumped BuildKit a bit, and looks to be building now (CI is down, so don't know if it passes)

thaJeztah · 2018-05-17T00:14:11Z

^^ WARNING: CI is down; don't be fooled an think it's green 😅

thaJeztah · 2018-05-17T01:08:57Z

01:02:40 integration/build/build_session_test.go:88:34:warning: cannot use "foo1" (constant of type string) as context.Context value in argument to session.NewSession: missing method Deadline (gosimple)
01:02:40 integration/build/build_session_test.go:88:47:warning: too few arguments in call to session.NewSession (gosimple)

thaJeztah · 2018-06-01T13:44:01Z

hmf, looks like we need to re-vndr;

13:08:18  M vendor/github.com/containerd/continuity/fs/copy.go
13:08:18  M vendor/github.com/containerd/continuity/fs/copy_linux.go
13:08:18  M vendor/github.com/containerd/continuity/sysx/xattr_linux.go
13:08:18 ?? vendor/github.com/containerd/continuity/sysx/xattr_linux_386.go
13:08:18 ?? vendor/github.com/containerd/continuity/sysx/xattr_linux_amd64.go
13:08:18 ?? vendor/github.com/containerd/continuity/sysx/xattr_linux_arm.go
13:08:18 ?? vendor/github.com/containerd/continuity/sysx/xattr_linux_arm64.go
13:08:18 ?? vendor/github.com/containerd/continuity/sysx/xattr_linux_ppc64.go
13:08:18 ?? vendor/github.com/containerd/continuity/sysx/xattr_linux_ppc64le.go
13:08:18 ?? vendor/github.com/containerd/continuity/sysx/xattr_linux_s390x.go

Changes included: - moby/swarmkit#2594 [fips] Support a flag that indicates that the cluster requires mandatory FIPS mode on all nodes - moby/swarmkit#2586 [fips] Propagate the FIPS boolean to the manager, raft storage layer, and raft DEK management Signed-off-by: Sebastiaan van Stijn <[email protected]>

- update github.com/docker/swarmkit to b39ef49 - update google.golang.org/grpc to v1.7.5 - update github.com/gogo/protobuf to v0.5 - update github.com/golang/protobuf to 1e59b77b52bf8e4b449a57e6f79f21226d571845 Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Updates buildkit to current master (github.com/moby/buildkit): moby/buildkit@be6da00...7a4a2a2 Fixes build failures due to gRPC bumps; 18:54:28 vendor/github.com/moby/buildkit/session/filesync/filesync.go:185:8:warning: NewContext not declared by package metadata (gosimple) 18:54:28 vendor/github.com/moby/buildkit/session/filesync/filesync.go:69:13:warning: FromContext not declared by package metadata (gosimple) 18:54:28 vendor/github.com/moby/buildkit/session/filesync/filesync.go:185:8:warning: NewContext not declared by package metadata (interfacer) 18:54:28 vendor/github.com/moby/buildkit/session/filesync/filesync.go:69:13:warning: FromContext not declared by package metadata (interfacer) 18:54:28 vendor/github.com/moby/buildkit/session/filesync/filesync.go:69:13:warning: FromContext not declared by package metadata (unconvert) 18:54:28 vendor/github.com/moby/buildkit/session/filesync/filesync.go:185:8:warning: NewContext not declared by package metadata (unconvert) Update vendored dependencies to match BuildKit: - add github.com/grpc-ecosystem/grpc-opentracing dependency - add github.com/opentracing/opentracing-go dependency - downgrade github.com/pkg/errors to a tagged release: pkg/errors@v0.8.0...839d9e9 - github.com/containerd/continuity containerd/continuity@d8fb858...3e8f2ea - containerd/continuity#110 Add fstest.CreateSocket - github.com/containerd/fifo containerd/fifo@fbfb6a1...3d5202a - Add apache license to files - github.com/containerd/go-runc containerd/go-runc@4f6e87a...f271fa2 - containerd/go-runc#37 runc: be able to get the full ps data (ps -f table) - containerd/go-runc#40 Add ConsoleSocket to RestoreOpts - github.com/containerd/console containerd/console@2748ece...cb7008a - containerd/console#21 Add OpenBSD support - github.com/syndtr/gocapability syndtr/gocapability@2c00dae...db04d3c - syndtr/gocapability#11 Add support for ambient capabilities - syndtr/gocapability#13 Fix issue moby#12: break too early - golang.org/x/net golang/net@5561cd9...0ed95ab - golang.org/x/text golang/text@f72d839...19e5161 - golang.org/x/time golang/time@a4bde12...f51c127 - github.com/tonistiigi/fsutil tonistiigi/fsutil@dea3a0d...93a0fd1 - tonistiigi/fsutil#16 Don not hang on diskwriter errors - tonistiigi/fsutil#17 fix fd leak on send - tonistiigi/fsutil#18 avoid possible receiver panic/deadlock on sender error - tonistiigi/fsutil#20 receive: read stream to EOF on close - tonistiigi/fsutil#21 avoid not-exist error on walker - tonistiigi/fsutil#27 Generalize chtimes() implementation for non-linux platforms - tonistiigi/fsutil#28 walker: handle parents and subdirs in includepatterns Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Vincent Demeester <[email protected]>

vdemeester · 2018-06-05T09:02:04Z

Rebased 😅

vdemeester · 2018-06-05T09:44:51Z

09:06:40 --- FAIL: TestLocalVolumeSize (0.00s)
09:06:40 	service_linux_test.go:66: assertion failed: 1024 (ls[1].UsageData.Size int64) != 1 (int64)
09:06:40 FAIL

Flaky unit tests ? can't reproduce this failure on my laptop...

vdemeester · 2018-06-06T09:17:56Z

@thaJeztah I guess this has been "taken over" by #36895, am I right ?

thaJeztah · 2018-06-06T23:06:53Z

Yes, let's close this one; there's some dependencies that could be updated, but we can do separate

GordonTheTurtle added the status/0-triage label May 14, 2018

thaJeztah added status/2-code-review area/swarm and removed status/0-triage labels May 14, 2018

yongtang approved these changes May 14, 2018

View reviewed changes

yongtang added the rebuild/janky label May 14, 2018

GordonTheTurtle removed the rebuild/janky label May 14, 2018

yongtang added the rebuild/janky label May 14, 2018

GordonTheTurtle removed the rebuild/janky label May 14, 2018

thaJeztah changed the title ~~Bump swarmkit to 8aa9c33bcdff9ea38fc79e0b1d054199917513f3~~ Bump swarmkit to b39ef4960a3170b36cef5c6dc79e170e0c95c81a May 15, 2018

cyli approved these changes May 16, 2018

View reviewed changes

thaJeztah force-pushed the bump-swarmkit branch 2 times, most recently from 2627771 to 7bdfb24 Compare May 16, 2018 18:50

thaJeztah force-pushed the bump-swarmkit branch from 080fbfa to 69905bb Compare May 17, 2018 00:02

thaJeztah force-pushed the bump-swarmkit branch 3 times, most recently from a5a9e39 to 81f1a1f Compare May 17, 2018 01:00

thaJeztah force-pushed the bump-swarmkit branch from 81f1a1f to 80f952a Compare May 17, 2018 09:52

thaJeztah requested a review from vdemeester as a code owner May 17, 2018 09:52

vdemeester force-pushed the bump-swarmkit branch from 331c13f to 5023ef8 Compare June 1, 2018 13:53

vdemeester mentioned this pull request Jun 1, 2018

Add support for init on services #37183

Merged

This was referenced Jun 1, 2018

Update miekg/dns to v1.0.7 moby/libnetwork#2172

Merged

Update miekg/dns to v1.0.7 #37192

Merged

vdemeester added rebuild/janky labels Jun 4, 2018

GordonTheTurtle removed rebuild/experimental labels Jun 4, 2018

vdemeester added status/4-merge and removed status/2-code-review labels Jun 4, 2018

thaJeztah and others added 6 commits June 5, 2018 10:53

Bump Google Cloud SDK for gRPC

264766c

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Update gRPC, protobuf, to match containerd 1.1.0

cbf4d50

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Bump swarmkit to 0fe3f12

189e75a

Signed-off-by: Vincent Demeester <[email protected]>

vdemeester force-pushed the bump-swarmkit branch from 5023ef8 to 189e75a Compare June 5, 2018 08:58

vdemeester added the rebuild/janky label Jun 5, 2018

GordonTheTurtle removed the rebuild/janky label Jun 5, 2018

thaJeztah closed this Jun 6, 2018

thaJeztah deleted the bump-swarmkit branch June 6, 2018 23:07

Bump swarmkit to 0fe3f12bdbfee0d47216de0118c569b1042e1588 #37059

Bump swarmkit to 0fe3f12bdbfee0d47216de0118c569b1042e1588 #37059

Uh oh!

Conversation

thaJeztah commented May 14, 2018 • edited by vdemeester Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Bump Google Cloud SDK for gRPC

Update gRPC, protobuf, to match containerd 1.1.0

Update BuildKit and dependencies

Uh oh!

thaJeztah commented May 14, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yongtang left a comment

Choose a reason for hiding this comment

Uh oh!

codecov bot commented May 14, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

thaJeztah commented May 15, 2018

Uh oh!

cpuguy83 commented May 15, 2018

Uh oh!

thaJeztah commented May 15, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cpuguy83 commented May 15, 2018

Uh oh!

thaJeztah commented May 15, 2018

Uh oh!

thaJeztah commented May 15, 2018

Uh oh!

cyli left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented May 16, 2018

Uh oh!

thaJeztah commented May 17, 2018

Uh oh!

thaJeztah commented May 17, 2018

Uh oh!

thaJeztah commented Jun 1, 2018

Uh oh!

vdemeester commented Jun 5, 2018

Uh oh!

vdemeester commented Jun 5, 2018

Uh oh!

vdemeester commented Jun 6, 2018

Uh oh!

thaJeztah commented Jun 6, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

thaJeztah commented May 14, 2018 •

edited by vdemeester

Loading

thaJeztah commented May 14, 2018 •

edited

Loading

codecov bot commented May 14, 2018 •

edited

Loading

thaJeztah commented May 15, 2018 •

edited

Loading