Commit Graph

11307 Commits

Author SHA1 Message Date
Maksym Pavlenko
e1026f5fab
Merge pull request #6579 from zhsj/fix-gccgo
Fix build with gccgo
2022-02-22 09:57:35 -08:00
Kazuyoshi Kato
77c0539e9a Use containerd/protobuild instead of stevvooe/protobuild
The new version still supports gogo/protobuf, but can be used with newer
protobuf packages if version = 2.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-02-22 00:03:31 +00:00
Phil Estes
8b9498909d
Merge pull request #6580 from zhsj/replace-ctx
Replace golang.org/x/net/context with std library
2022-02-21 14:13:24 -05:00
Shengjing Zhu
d28981d48e Fix build with gccgo
gccgo changes the mangling scheme
b483d0e0a2

The change is available in gcc-11, which is the least version that
implements go1.16.

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2022-02-22 02:31:58 +08:00
Shengjing Zhu
f4f41296c2 Replace golang.org/x/net/context with std library
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2022-02-22 02:27:05 +08:00
Kazuyoshi Kato
296f75bd07 Do not use weak import
According to https://github.com/protocolbuffers/protobuf/issues/9184

> Weak fields are an old and deprecated internal-only feature that we never
> open sourced.

This blocks us to upgrade protoc.

Fixes #6232.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-02-21 18:26:40 +00:00
Kazuyoshi Kato
3febabffeb Add protoc-gen-go-fieldpath
This command will replace protobuf/plugin/fieldpath when we migrate
off from gogo/protobuf.

See #6564 for the detail.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-02-21 17:36:12 +00:00
Fu Wei
d128c3767b
Merge pull request #6571 from fuweid/fix-6402-for-runc.v1 2022-02-21 13:39:15 +08:00
Wei Fu
7901f4b331 containerd-shim-runc-v1: return init pid when clean dead shim
If containerd-shim-runc-v1 process dead abnormally, such as received
kill -s 9 signal, panic or other unkown reasons, the containerd-shim-runc-v1
server can not reap runc container and forward init process exit event.
This will lead the container leaked in dockerd. When shim dead, containerd
will clean dead shim, here read init process pid and forward exit event
with pid at the same time.

Related to: #6402

Signed-off-by: Jeff Zvier <zvier20@gmail.com>
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-02-20 15:12:50 +08:00
Kathryn Baldauf
a3303e7214 Update TestContainerSymlinkVolumes to use windows path
Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
2022-02-18 16:21:40 -08:00
Sebastiaan van Stijn
481fb923c5
go.mod: update to github.com/emicklei/go-restful/v3 v3.7.3
full diff: https://github.com/emicklei/go-restful/compare/v2.9.5...v3.7.3

- Switch to using go modules
- Add check for wildcard to fix CORS filter
- Add check on writer to prevent compression of response twice
- Add OPTIONS shortcut WebService receiver
- Add Route metadata to request attributes or allow adding attributes to routes
- Add wroteHeader set
- Enable content encoding on Handle and ServeHTTP
- Feat: support google custom verb
- Feature: override list of method allowed without content-type
- Fix Allow header not set on '405: Method Not Allowed' responses
- Fix Go 1.15: conversion from int to string yields a string of one rune
- Fix WriteError return value
- Fix: use request/response resulting from filter chain
- handle path params with prefixes and suffixes
- HTTP response body was broken, if struct to be converted to JSON has boolean value
- List available representations in 406 body
- Support describing response headers
- Unwrap function in filter chain + remove unused dispatchWithFilters

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-02-18 21:54:27 +01:00
Phil Estes
c0bbaf5d15
Merge pull request #6491 from jsturtevant/windows-platforms
Use Windows matcher when on Windows platform in all code paths
2022-02-18 13:07:37 -05:00
ruiwen-zhao
fb0b8d6177 Use fs.RootPath when mounting volumes
Signed-off-by: Ruiwen Zhao <ruiwen@google.com>
2022-02-17 19:20:00 +00:00
Fu Wei
3122239ee5
Merge pull request #6452 from zvier/main 2022-02-17 10:50:48 +08:00
Phil Estes
39afc6fd47
Merge pull request #6515 from gabriel-samfira/enable-restart-monitor
[Windows][Integration] Enable TestRestartMonitor
2022-02-16 10:37:29 -05:00
Phil Estes
67bd2e94f4
Merge pull request #6554 from thaJeztah/update_deps2
go.mod: fsnotify v1.5.1, moby/sys/mountinfo v0.6.0, moby/sys/signal v0.7.0
2022-02-16 10:36:48 -05:00
Derek McGowan
39259a8f35
Merge pull request #6531 from dmcgowan/prepare-v1.6.0
Prepare release notes for v1.6.0
2022-02-15 17:48:47 -08:00
Derek McGowan
8713c0472f
Prepare release notes for v1.6.0
Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-02-15 16:20:48 -08:00
Derek McGowan
b73979f113
Merge pull request #6555 from thaJeztah/bump_go_1.17.7
Update Go to 1.16.14, 1.17.7
2022-02-15 08:41:03 -08:00
Sebastiaan van Stijn
f261498e0e
Update Go to 1.16.14, 1.17.7
Includes security fixes for crypto/elliptic (CVE-2022-23806), math/big (CVE-2022-23772),
and cmd/go (CVE-2022-23773).

go1.17.7 (released 2022-02-10) includes security fixes to the crypto/elliptic,
math/big packages and to the go command, as well as bug fixes to the compiler,
linker, runtime, the go command, and the debug/macho, debug/pe, and net/http/httptest
packages. See the Go 1.17.7 milestone on our issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.17.7+label%3ACherryPickApproved

full diff: https://github.com/golang/go/compare/go1.17.6...go1.17.7

Update Go to 1.17.6

go1.17.6 (released 2022-01-06) includes fixes to the compiler, linker, runtime,
and the crypto/x509, net/http, and reflect packages. See the Go 1.17.6 milestone
on our issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.17.6+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-02-15 16:28:23 +01:00
Sebastiaan van Stijn
1a31772a7a
go.mod: github.com/moby/sys/signal v0.7.0
full diff: https://github.com/moby/sys/compare/signal/v0.6.0...signal/v0.7.0

- add LCOW supported signals to windows signal map

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-02-15 14:17:17 +01:00
Sebastiaan van Stijn
b1881bdc04
go.mod: github.com/moby/sys/mountinfo v0.6.0
full diff: https://github.com/moby/sys/compare/mountinfo/v0.5.0...mountinfo/v0.6.0

- Add MountedFast (Note: most users should keep using Mounted, which already
  incorporates all optimizations from MountedFast)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-02-15 14:15:32 +01:00
Sebastiaan van Stijn
b6a6757c11
go.mod: github.com/fsnotify/fsnotify v1.5.1
full diff: https://github.com/fsnotify/fsnotify/compare/v1.4.9...v1.5.1

Relevant changes:

- Fix unsafe pointer conversion
- Drop support/testing for Go 1.11 and earlier
- Update x/sys to latest
- add //go:build lines
- add go 1.17 to test matrix

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-02-15 14:11:18 +01:00
Fu Wei
de8c9651ba
Merge pull request #6533 from a2ush/modify-cri-architecture-doc 2022-02-15 09:31:46 +08:00
Maksym Pavlenko
7efd485b6e
Merge pull request #6543 from dmcgowan/update-cni-v1.1.2
Update go-cni to v1.1.3
2022-02-14 17:03:54 -08:00
Derek McGowan
fa19714db9
Update go-cni to v1.1.3
Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-02-14 10:37:31 -08:00
Akihiro Suda
e0fc9fe44d
Merge pull request #6544 from bobbypage/cloudinit
Wait for containerd installation in GCE scripts
2022-02-12 12:12:16 +09:00
David Porter
6e3cc28a66 Wait for containerd installation in GCE scripts
Prior to running the `kube-node-installation.service`, the containerd
installation should be complete as the k8s installation may have
dependencies on containerd and related binaries (e.g ctr). Add
wants/after systemd directives to ensure
`kube-node-installation.service` will only start after containerd
installation completes.

Signed-off-by: David Porter <porterdavid@google.com>
2022-02-10 16:01:13 -08:00
Derek McGowan
c0f8188469
Update go-cni to v1.1.2
Fixes panic when exec is nil

Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-02-10 12:40:51 -08:00
Phil Estes
a7f43c8926
Merge pull request #6540 from gabriel-samfira/enable-tests-on-windows
Enable TestContainerPTY and TestContainerUsername
2022-02-10 15:31:59 -05:00
Phil Estes
e2c5f8f932
Merge pull request #6500 from NickJackolson/nickjackolson/docupdate
Update BUILDING.md
2022-02-10 11:29:43 -05:00
James Sturtevant
83c80388b2 Initialize platform matchers for current platform
Signed-off-by: James Sturtevant <jsturtevant@gmail.com>
2022-02-10 08:03:25 -08:00
Mete Durlu
dea7ae27a9 Add instructions on using go with admin perms
For testing and possibly other operations go might need elevated
permissions. Some parts of documentation and the BUILDING.md mention
using `sudo go` but does not explain how to achieve this. This commit
inserts instructions to the BUILDING.md as a small note. Note mentions
systemwide and local solutions.

Signed-off-by: Mete Durlu <mete.durlu@ibm.com>
2022-02-10 16:35:42 +01:00
Gabriel Adrian Samfira
4f0d5f0ee3 Enable TestContainerPTY and TestContainerUsername
Enables TestContainerPTY and TestContainerUsername on Windows.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
2022-02-10 06:46:42 +00:00
Derek McGowan
0340e84cde
Merge pull request #6537 from dmcgowan/prepare-v1.6.0-rc.4
Prepare release notes for v1.6.0-rc.4
2022-02-09 22:21:09 -08:00
Shuntaro Azuma
7321032716 Change the context to avoid misunderstandings
Signed-off-by: Shuntaro Azuma <azush@amazon.com>
2022-02-10 11:06:25 +09:00
Derek McGowan
6827eec7aa
Prepare release notes for v1.6.0-rc.4
Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-02-09 14:43:29 -08:00
Maksym Pavlenko
eb011d127b
Merge pull request #6536 from mxpv/runtime-name
Change file name for shim binary path
2022-02-09 12:53:50 -08:00
Maksym Pavlenko
b0623a06ee Change file name for shim binary path
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-02-09 12:06:55 -08:00
Michael Crosby
e8a5a5443f
Merge pull request #6532 from egernst/image-param-for-ctr-stress
containerd-stress: introduce option for specifying image
2022-02-09 11:44:25 -05:00
Derek McGowan
a9f61ba2c8
Merge pull request #6524 from dmcgowan/prepare-1.6.0-rc.3
Prepare release notes for v1.6.0-rc.3
2022-02-08 08:42:26 -08:00
Mike Brown
1a3efb5cd1
Merge pull request #6529 from Gorgonx7/dark-light-mode-logo
Use white logo in github dark mode
2022-02-08 09:04:46 -06:00
James Gordon
daaf031e2f Use white logo in github dark mode
I noticed the logo was not correct in dark mode and was hard to see, here is some fancy mark down to make the white logo appear in dark mode and the dark logo appear in light mode

Signed-off-by: James Gordon <james.gordon1628@gmail.com>
2022-02-08 14:29:48 +00:00
Derek McGowan
efc6ca4c47
Prepare release notes for v1.6.0-rc.3
Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-02-07 22:03:44 -08:00
Fu Wei
6a628b64ac
Merge pull request #6514 from marquiz/fixes/rdt 2022-02-08 09:31:49 +08:00
Derek McGowan
33b7f779a6
Merge pull request #6504 from jepio/jepio/pkg-oom-v2-quiet-shutdown
pkg/oom/v2: handle EventChan routine shutdown quietly
2022-02-07 16:20:42 -08:00
Phil Estes
d1c3b751c6
Merge pull request #6523 from fuweid/fix-6484
fix: .dockerignore make git working tree dirty
2022-02-07 16:17:17 -05:00
Michael Crosby
2a588a619e
Merge pull request #6518 from egernst/ctr-stress-exec-fixup
containerd-stress: start task ctr before starting execs
2022-02-07 11:47:53 -05:00
Wei Fu
7e821fb618 fix: .dockerignore makes git working tree dirty
The .github/workflows/release/Dockerfile will use working dir as docker
build context. But the .dockerignore will ignore the .github/release/...
and cause dirty. We should remove it and verify git working tree after
build.

Fix: #6484

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-02-08 00:15:50 +08:00
Eric Ernst
ac2692d30f containerd-stress: introduce option for specifying image
allow user to specify what image should be used for containerd-stress.

Signed-off-by: Eric Ernst <eric_ernst@apple.com>
2022-02-06 09:55:16 -08:00