Commit graph

2256 commits

Author SHA1 Message Date
Mrunal Patel
d10490bccf test: Add an integration test for partial line in logs
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-11-28 18:57:26 -08:00
Mrunal Patel
4cf4137be0 conmon: Add support for partial/newline log tags
This is for ttps://github.com/kubernetes/kubernetes/pull/55922

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-11-28 18:57:21 -08:00
Mrunal Patel
4a32d0ff33
Merge pull request #1183 from runcom/fix-image-pull-master
image_pull: fix image resolver
2017-11-28 16:49:15 -10:00
Antonio Murdaca
87f1ae214f
image_pull: fix image resolver
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-28 23:53:18 +01:00
Mrunal Patel
63371009ae
Merge pull request #1181 from runcom/remove-git-validation-ci
CI: drop git-validation as it's never used
2017-11-28 12:46:35 -10:00
Antonio Murdaca
03fb727f2b
CI: drop git-validation as it's never used
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-28 11:40:06 +01:00
Antonio Murdaca
851759c73b
Merge pull request #1179 from willstudy/unit_test
Adding unit tests for server/utils.go
2017-11-27 19:34:24 +01:00
Daniel J Walsh
8518e06e81
Merge pull request #1166 from willstudy/dev
Improve the readability of crio.8.md
2017-11-27 11:08:05 -05:00
Liu Chang
42800cc96b Adding unit tests for server/utils.go
Signed-off-by: Liu Chang <liuchang@qiniu.com>
2017-11-27 16:01:00 +08:00
Liu Chang
bf515de94d Improve the readability of crio.8.md
Signed-off-by: Liu Chang <liuchang@qiniu.com>
2017-11-27 11:04:09 +08:00
Mrunal Patel
070b8bfdc5
Merge pull request #1176 from runcom/fix-e2e-1.0
contrib: parametrize the crio socket for kube
2017-11-22 09:36:15 -10:00
Mrunal Patel
7508cdeace
Merge pull request #1173 from runcom/fix-cve
Add /proc/scsi to masked paths
2017-11-22 05:35:33 -10:00
Antonio Murdaca
67e2d28c86
Merge pull request #1171 from WeiZhang555/fix-readme
Cleanup: remove redundant lines in tutorial
2017-11-22 14:53:44 +01:00
Antonio Murdaca
2f344c7533
contrib: parametrize the crio socket for kube
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-22 14:14:06 +01:00
Antonio Murdaca
a75362dca0
Add /proc/scsi to masked paths
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-22 12:25:43 +01:00
z00280905
2fbbf49541 Cleanup: remove redundant lines in tutorial
Signed-off-by: z00280905 <zhangwei555@huawei.com>
2017-11-22 17:37:11 +08:00
Mrunal Patel
73c1a9823f
Merge pull request #1167 from runcom/wire-critest
CI: wire in critest
2017-11-21 06:16:19 -10:00
Antonio Murdaca
6da7193ff5
CI: wire in critest
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-21 11:19:37 +01:00
Antonio Murdaca
b3f59f31ad
Merge pull request #1159 from weiwei04/replace_crioctl_with_crictl_wip
Replace crioctl with crictl
2017-11-20 15:27:30 +01:00
Wei Wei
25dfde9044 replace crioctl with crictl
Signed-off-by: Wei Wei <weiwei.inf@gmail.com>
2017-11-20 13:46:52 +08:00
Daniel J Walsh
6c8ab88e9e
Merge pull request #1163 from mrunalp/pid_ns_opt_in
Make pid namespace sharing optional and disabled by default
2017-11-19 06:06:35 -05:00
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