Commit graph

2134 commits

Author SHA1 Message Date
Mrunal Patel
946307e5c2 Make pid namespace sharing optional and disabled by default
We reverse the logic so that pid ns sharing is disabled by default.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-11-18 06:47:06 -08:00
Daniel J Walsh
e23723d62e
Merge pull request #1161 from cevich/nuke_old_rpm_stuffs
Remove disused contrib/rpm
2017-11-17 15:07:00 -05:00
Mrunal Patel
d68da8929a
Merge pull request #1149 from weiwei04/share_pid_namespace
share pid namespace for Pod container
2017-11-17 08:12:49 -10:00
Chris Evich
bbd9a6528c Remove disused contrib/rpm
I don't believe the files in this dir are actually used anymore.  Remove
them so content can be added to this directory in the future w/o
clashing.

Signed-off-by: Chris Evich <cevich@redhat.com>
2017-11-17 11:49:18 -05:00
Wei Wei
702ab3ee3a share pid namespace for Pod container
Signed-off-by: Wei Wei <weiwei.inf@gmail.com>
2017-11-17 09:56:33 +08:00
Mrunal Patel
7b837b5a1e
Merge pull request #1156 from weiwei04/replace_crioctl_with_crictl
replace crioctl with crictl in e2e
2017-11-15 09:38:21 -10:00
Daniel J Walsh
31111ba651
Merge pull request #1154 from runcom/move-crio-socket
Move crio default sock to /var/run/crio/crio.sock
2017-11-15 10:14:22 -05:00
Wei Wei
b0b6611bdf replace crioctl in e2e with crictl
Signed-off-by: Wei Wei <weiwei.inf@gmail.com>
2017-11-15 16:15:54 +08:00
Antonio Murdaca
429a687ced
Merge pull request #1153 from mrunalp/add_kube_version_var
test: Add a version var for kube branches
2017-11-14 23:06:01 +01:00
Mrunal Patel
3596aa0155 test: Add a version var for kube branches
This allows us to cache a k8s branch for cri-o 1.0 branch
while allowing overriding of k8s branch in master and other
newer cri-o branches.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-11-14 09:58:53 -08:00
Mrunal Patel
8fe6dd36a4
Move crio default sock to /var/run/crio/crio.sock
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-14 16:11:43 +01:00
Daniel J Walsh
e7471600f8
Merge pull request #585 from runcom/comp-matrix
README.md: add compatibility matrix
2017-11-14 10:02:40 -05:00
Antonio Murdaca
21252ed22d
Merge pull request #1151 from mdshuai/fix-test-typo
fix syntax for test/README.md
2017-11-14 10:36:47 +01:00
Antonio Murdaca
692af73b0b
README.md: add compatibility matrix
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-14 09:39:30 +01:00
DeShuai Ma
e90e0c7062 fix typo for test/README.md
Signed-off-by: DeShuai Ma <dma@redhat.com>
2017-11-14 15:29:27 +08:00
Mrunal Patel
a447b2985c
Merge pull request #1148 from agonzalezro/config-tests
Add tests for server/config.go
2017-11-13 18:58:50 -10:00
Mrunal Patel
6ed8fbeea2
Merge pull request #1150 from runcom/bump-kube-1.9-master
vendor: bump to Kube 1.9/master
2017-11-13 10:54:45 -10:00
Antonio Murdaca
7a675ccd92
vendor: bump to Kube 1.9/master
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-13 19:57:20 +01:00
Mrunal Patel
7076c73172
Merge pull request #1152 from runcom/deprecate-crioctl
hack: validate tests for crioctl deprecation
2017-11-13 07:41:57 -10:00
Antonio Murdaca
8ae0aee7e5
hack: validate tests for crioctl deprecation
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-13 16:55:45 +01:00
Álex González
c3f86cd016
Add tests for server/config.go
The tests are trying to read an write configuration files and check that the
fields are being set or saved properly.

A folder fixtures/ was created on server/ as well adding an example crio.conf
file to it.

Note: some extra paths about Vagrant and VSCode were added to gitignore.
Signed-off-by: Álex González <agonzalezro@gmail.com>
2017-11-13 13:43:47 +01:00
Mrunal Patel
25ac83196f
Merge pull request #1146 from runcom/setspp
container_create: set the seccomp profile in the container object
2017-11-12 09:36:35 -10:00
Antonio Murdaca
586eda8245
container_create: set the seccomp profile in the container object
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-12 17:51:32 +01:00
Daniel J Walsh
edf2300205
Merge pull request #1142 from runcom/fixies-bump
Bump v1.8.0
2017-11-12 06:24:35 -05:00
Antonio Murdaca
4d1e77ff9d
version: bump v1.9.0-dev
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-12 01:54:20 +01:00
Antonio Murdaca
80f54bc14d
version: bump v1.8.0
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-12 01:54:20 +01:00
Antonio Murdaca
99e8676967
container_list: guard against list filter being nil
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-12 01:54:20 +01:00
Antonio Murdaca
e99a78edff
*: add crictl.yaml
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-12 01:54:19 +01:00
Antonio Murdaca
33f699bad4
server: validate labels size to avoid dos
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-12 01:54:19 +01:00
Antonio Murdaca
befd719812
Revert "Merge pull request #654 from nalind/storage-update"
This reverts commit 4c06116c18, reversing
changes made to c5e73ba65f.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-12 01:54:19 +01:00
Antonio Murdaca
98f7591d5f
Merge pull request #1132 from sak0/dev
allow update running/created container.
2017-11-12 01:51:04 +01:00
CuiHaozhi
a7f919f071 allow update running/created container.
Signed-off-by: CuiHaozhi <cuihaozhi@chinacloud.com.cn>
2017-11-11 11:04:07 -05:00
Mrunal Patel
56eb473aaa
Merge pull request #1139 from runcom/close-img
pkg: storage: image: close image after using it
2017-11-10 05:15:52 -10:00
Daniel J Walsh
e9200aacba
Merge pull request #1110 from edsantiago/more_testing_fixes
Various test-scaffolding fixes
2017-11-10 08:22:06 -05:00
Antonio Murdaca
4f4e228274
pkg: storage: image: close image after using it
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-10 14:21:22 +01:00
Daniel J Walsh
4fb52c2b12
Merge pull request #1133 from runcom/prom-runtime-metrics
server: add prometheus metrics for CRI operations
2017-11-10 07:30:59 -05:00
Daniel J Walsh
71d2131c8c
Merge pull request #1138 from runcom/fix-image-policy
image_pull: repull when image ID (config digest) changed
2017-11-10 05:28:07 -05:00
Antonio Murdaca
8611c2dfef
image_pull: repull when image ID (config digest) changed
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-09 19:46:55 +01:00
Antonio Murdaca
190650ecca
Merge pull request #1131 from nalind/update-tar-split
Bump github.com/vbatts/tar-split
2017-11-09 18:43:36 +01:00
Antonio Murdaca
b959f8996d
server: add prometheus metrics for CRI operations
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-09 16:51:00 +01:00
Nalin Dahyabhai
7d9a89e3a7 Bump github.com/vbatts/tar-split
Update vendor/github.com/vbatts/tar-split to v0.10.2, to fix
CVE-2017-14992, per https://github.com/vbatts/tar-split/pull/42.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-11-09 09:16:34 -05:00
Antonio Murdaca
9d3c442b7b
Merge pull request #1130 from cevich/fix_clone_k8s_two
Fix Local modifications exist in repository
2017-11-09 14:50:18 +01:00
Chris Evich
d49fb788da Fix Local modifications exist in repository
Depending on the state of upstream repositories, it's possible the
kubernetes repo could change between the ``setup`` and ``run`` phase.
Alternatively, something during ``setup`` itself could mangle the repo.

Add an option to force clone the kubernetes repo.  This gives support
for testing on multiple CRI-O branches, realizing some benefit from
caching, yet also allows hauling in brand-new-kubernetes for the e2e
tests.

Signed-off-by: Chris Evich <cevich@redhat.com>
2017-11-08 12:34:45 -05:00
Antonio Murdaca
f4883dd27a
Makefile: do not install man1 files
kpod removal actually removed all man1 docs but the Makefile was still
referencing man1 stuff. CRI-O doesn't have man1 so let's drop that
altogether now.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-08 16:11:55 +01:00
Daniel J Walsh
c9b3d3df28
Merge pull request #1111 from mheon/remove_kpod
Remove kpod code after repository move
2017-11-07 14:44:40 -05:00
Ed Santiago
b7697672f0 Various test-scaffolding fixes
* Skip some tests if the bridge-custom plugin is
  unavailable. This CNI plugin is not distributed in
  any RPM, it is only available by compiling from a
  side branch in runcom's private github. We can't
  use it in a real integration-test setting.

* Don't use `run()` inside cleanup handlers. It will
  override $status, which is a double whammy:
   - successful cleanup will mask a test failure
   - when a test is `skip()`ed, crictl may fail,
     and $status will indicate failure.

* seccomp test: use existing $SECCOMP_PROFILE instead of
  assuming a path under $CRIO_ROOT

Signed-off-by: Ed Santiago <santiago@redhat.com>
2017-11-06 07:14:33 -07:00
Daniel J Walsh
6b6d634cfc
Merge pull request #1115 from mountkin/fix-makefile
fix "docker run" command in Makefile
2017-11-06 05:08:25 -05:00
Mrunal Patel
3f9e539bde
Merge pull request #1117 from runcom/setup-cwd
container_create: setup cwd for containers
2017-11-04 05:21:26 -07:00
Shijiang Wei
d5ffe34758 fix "docker run" command in Makefile
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2017-11-04 16:51:47 +08:00
Matthew Heon
c37d369259 Add readme pointer to new kpod repository
Signed-off-by: Matthew Heon <mheon@redhat.com>
2017-11-03 14:37:42 -04:00