Commit Graph

8308 Commits

Author SHA1 Message Date
Maksym Pavlenko
8b03df2dae Enable linter on windows
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2020-10-07 15:08:20 -07:00
Maksym Pavlenko
944e9b70e2
Merge pull request #4607 from dmcgowan/cleanup-cri-packages
Move cri server packages under pkg/cri
2020-10-07 14:05:38 -07:00
Derek McGowan
b22b627300
Move cri server packages under pkg/cri
Organizes the cri related server packages under pkg/cri

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-10-07 13:09:37 -07:00
Akihiro Suda
f44b072781
Merge pull request #4593 from dmcgowan/merge-cri
Merge cri master
2020-10-08 03:41:03 +09:00
Derek McGowan
1c60ae7f87
Use local version of cri packages
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-10-07 10:59:40 -07:00
Derek McGowan
e7a350176a
Merge containerd/cri into containerd/containerd
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-10-07 10:58:39 -07:00
Derek McGowan
0820015314 Prepare cri for merge to containerd
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-10-07 10:58:39 -07:00
Michael Crosby
de546a154f
Merge pull request #4605 from mxpv/nri-fix
Revendor NRI
2020-10-07 13:57:37 -04:00
Maksym Pavlenko
d0f6895d8d Revendor NRI
Signed-off-by: Maksym Pavlenko <mxpv@apple.com>
2020-10-07 10:34:48 -07:00
Michael Crosby
a0b3b4e4da
Merge pull request #1593 from moolen/fix/add-nri-labels
Add missing sandbox labels when invoking nri
2020-10-07 13:17:06 -04:00
Maksym Pavlenko
c408aa9086
Merge pull request #4600 from ktock/repositoryscope
Allow to use repository scope helper function from other packages
2020-10-06 13:43:25 -07:00
Phil Estes
bc08a19f3a
Merge pull request #1595 from dmcgowan/fix-unix-lint
Fix unix lint
2020-10-06 08:37:01 -04:00
ktock
4b882eb93a Export repository scope helper functions
`docker.Authorizer` requires library clients to configure scope via context.
It is helpful for the clients to use the helper (currently private) functions
for generating scope string and to use that function with the combination of
other scope-related ones (e.g. `docker.WithScope`).

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-10-06 10:49:01 +09:00
Derek McGowan
6f98abc2a6 Add macos target for lint
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-10-05 17:46:01 -07:00
Derek McGowan
07c98d0bf1 Fix lint in Unix environments
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-10-05 17:46:01 -07:00
Moritz Johner
f87302ab20 Add missing sandbox labels when invoking nri plugins
Signed-off-by: Moritz Johner <beller.moritz@googlemail.com>
2020-10-03 23:30:09 +02:00
Derek McGowan
d852786705
Merge pull request #4599 from estesp/fix-script-var
Windows CNI install script using lowercase "destdir"
2020-10-03 10:24:12 -07:00
Phil Estes
615af428a3
Windows CNI install script using lowercase "destdir"
Fixes packaging via GH Actions script, which sets DESTDIR and is used
across many scripts.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-10-02 16:31:28 -04:00
Mike Brown
d620c30d7e
Merge pull request #1592 from dmcgowan/stricter-lint
Align lint with containerd
2020-10-01 14:53:36 -05:00
Akihiro Suda
e3aa6a39c8
Merge pull request #4597 from mc256/patch-1
Update BUILDING.md - add dependency libseccomp-dev
2020-10-02 01:02:06 +09:00
Derek McGowan
77cf032195 Enable golangci on Windows
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-10-01 09:01:16 -07:00
Mike Brown
07cc1af22d
Merge pull request #1591 from hickeyma/impr-img-reg-doc
Doc (registry): Update to the image registry doc
2020-10-01 10:43:08 -05:00
mc256
60d24c4a95
Update BUILDING.md - add dependency libseccomp-dev
I got these errors when I try to build containerd:

```
go build "-mod=vendor" "-buildmode=pie"  -tags "seccomp selinux apparmor" -ldflags "-X main.gitCommit="a220b9c6cc100f71ddc67152a12fc04622313dca" -X main.version=1.0.0-rc92+dev " -o runc .
Package libseccomp was not found in the pkg-config search path.
Perhaps you should add the directory containing `libseccomp.pc'
to the PKG_CONFIG_PATH environment variable
No package 'libseccomp' found
Package libseccomp was not found in the pkg-config search path.
Perhaps you should add the directory containing `libseccomp.pc'
to the PKG_CONFIG_PATH environment variable
No package 'libseccomp' found
pkg-config: exit status 1
```

Solved this problem by installing one extra dependency `libseccomp-dev`. I am using Ubuntu 20.04 and everything works well!

See also: opencontainers/runc#1032

Signed-off-by: Jun Lin Chen <webmaster@mc256.com>
2020-10-01 10:59:35 -04:00
Derek McGowan
a3c0e8859c Align lint checks with containerd
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-09-30 23:17:46 -07:00
Derek McGowan
83e6efc6fc Use tabs in protofile indentation
This is enforced as part of containerd's fmt checks

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-09-30 21:50:33 -07:00
Martin Hickey
fe5fdccdaf Update after review
Review comments:
- https://github.com/containerd/cri/pull/1591#pullrequestreview-499636859

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
2020-09-30 19:00:08 +00:00
Martin Hickey
70a56ae327 Updates to the image registry doc
Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
2020-09-30 14:51:59 +00:00
Phil Estes
803c5f467d
Merge pull request #4595 from thaJeztah/update_logrus
vendor: sirupsen/logrus v1.7.0
2020-09-30 09:24:16 -04:00
Sebastiaan van Stijn
0714e4be98
vendor: sirupsen/logrus v1.7.0
full diff: https://github.com/sirupsen/logrus/compare/v1.6.0...v1.7.0

removes dependency on github.com/konsorten/go-windows-terminal-sequences

Features:
   * a new buffer pool management API has been added
   * a set of `<LogLevel>Fn()` functions have been added

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-30 13:44:50 +02:00
Phil Estes
edfeb46867
Merge pull request #4591 from AkihiroSuda/crun-015
CI: update crun to v0.15
2020-09-29 08:50:28 -04:00
Akihiro Suda
c385d1102b
CI: update crun to v0.15
Changes: https://github.com/containers/crun/releases/tag/0.15

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-09-29 17:12:23 +09:00
Mike Brown
2e3bebb297
Merge pull request #1583 from thaJeztah/simplify_ensure_removeall_windows
pkg/server: make ensureRemoveAll() an alias for os.RemoveAll() on Windows
2020-09-28 14:26:18 -05:00
Derek McGowan
4a6b47d470
Merge pull request #4586 from dmcgowan/update-cri-push
Update CRI tests to build and push to gcs
2020-09-28 09:10:27 -07:00
Akihiro Suda
84aacd583a
Merge pull request #4585 from kevpar/update-hcsshim-vendor
Update github.com/Microsoft/hcsshim to v0.8.10
2020-09-26 18:39:33 +09:00
Akihiro Suda
91a49b6a24
Merge pull request #4583 from thaJeztah/bump_console_v1.0.1
vendor: containerd/console v1.0.1, golang.org/x/sys 2334cc1a136f0a5b4384f1a27e3634457be08553
2020-09-26 18:38:42 +09:00
Derek McGowan
65df8db289
Remove sudo from installation and cri release
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-09-25 14:40:59 -07:00
Derek McGowan
4e0b13544e
Update CRI tests to build and push to gcs
This enables to the CRI e2e tests to use the build from a PR

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-09-25 14:12:57 -07:00
Kevin Parsons
a043c0dc3d Update github.com/Microsoft/hcsshim to v0.8.10
Brings in a variety of changes, mostly to the containerd shim.

There is also a change to the Windows layer unpack code which fixes #4301.

Release link: https://github.com/microsoft/hcsshim/releases/tag/v0.8.10

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2020-09-25 09:28:53 -07:00
Mike Brown
6d2731834c
Merge pull request #1587 from thaJeztah/bump_containerd_v1.4.1
vendor: containerd/containerd v1.4.1
2020-09-24 17:29:44 -05:00
Sebastiaan van Stijn
8b5cc2e1dc
vendor: containerd/console v1.0.1
full diff: https://github.com/containerd/consolve/compare/v1.0.0...v1.0.1

vendor golang.org/x/sys 2334cc1a136f0a5b4384f1a27e3634457be08553

full diff: ed371f2e16...2334cc1a13

- unix: add Darwin support for clonefile syscalls
- Adds openat2 for linux
  openat2 is a new syscall added to Linux 5.6. It provides a superset of
  openat(2) functionality, extending it with flags telling the kernel how
  to resolve the paths.

  For more info, see https://lwn.net/Articles/803237/

  NOTE that this is a second attempt to add the call; the previous one
  (https://golang.org/cl/227280) was reverted
  (https://golang.org/cl/227846) due to the test case failure on ARM
  (https://golang.org/issue/38357).

  This CL has the test case reworked to be less assumptive to the testing
  environment. In particular, it first tries if the most simplistic
  openat2() call succeeds, and skips the test otherwise. It is done that
  way because CI can be under under different kernels and in various
  envrionments -- in particular, Docker+seccomp can result in EPERM from a
  system call (which is not expected otherwise).

  For previous discussions about the test case, see
  https://golang.org/cl/227865.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-24 23:34:18 +02:00
Sebastiaan van Stijn
9f61affa09
vendor: containerd/containerd v1.4.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-24 23:25:07 +02:00
Mike Brown
c988d797be
Merge pull request #1372 from cofyc/update-config-syntax
update config syntax in registry.md
2020-09-24 15:59:56 -05:00
Mike Brown
2c2dd59f32
Merge branch 'master' into update-config-syntax 2020-09-24 15:58:39 -05:00
Mike Brown
b3678ddad2
Merge pull request #1562 from dims/update-to-latest-k8s-1.19.0-release
Update to latest k8s 1.19.2 release
2020-09-24 15:46:28 -05:00
Mike Brown
b1ee4c0d7b
Merge pull request #1570 from yoheiueda/masked
Set masked and readonly paths based on default Unix spec
2020-09-24 15:45:58 -05:00
Derek McGowan
ce4439a815
Merge pull request #4582 from dmcgowan/set-1.2-EOL-date
Set 1.2.x end of life date to October 15
2020-09-24 13:16:01 -07:00
Derek McGowan
281069cbb5
Set 1.2.x end of life date in RELEASES.md
The maintainers discussed extending the end of life date for 1.2
to allow time for EOL announcement and migration to 1.3.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-09-24 11:48:12 -07:00
Maksym Pavlenko
efc67b192d
Merge pull request #4580 from dmcgowan/move-release-build-makefile
Move CRI release logic to Makefile
2020-09-23 16:41:10 -07:00
Derek McGowan
241be70250
Move github releases to use Makefile for cri release
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-09-23 14:10:27 -07:00
Derek McGowan
f35f21dd0b
Add CRI release functionality to makefile
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-09-23 14:10:27 -07:00