Daniel J Walsh
b9ffd277b9
Merge pull request #1192 from runcom/no-libkpod
...
libkpod -> lib rename
2017-12-01 08:44:44 -05:00
Antonio Murdaca
910cfab6e9
Merge pull request #910 from sameo/topic/bats
...
test: Add timeout before checking for status
2017-12-01 13:30:13 +01:00
Samuel Ortiz
a2e08d5dc4
test: Add timeout before checking for status
...
Under some slow environment (nested VMs) or with some
not as fast runtimes (Clear Containers), asking for a
status right away is racy.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
2017-12-01 10:21:50 +01:00
Antonio Murdaca
0eaa52c356
Merge pull request #1184 from willstudy/unit_test
...
Adding unit tests for server/secrets.go
2017-12-01 10:04:30 +01:00
Antonio Murdaca
0ab5e80c38
Merge pull request #1193 from mrunalp/go_1.8.5
...
Bump up go version to 1.8.5
2017-11-30 22:19:34 +01:00
Mrunal Patel
2cae11ba35
Merge pull request #1189 from runcom/fix-apparmor-master
...
container_create: fix apparmor from container config
2017-11-30 08:56:46 -10:00
Mrunal Patel
40da5c2c16
Merge pull request #1186 from runcom/fixups-env-master
...
Fix env handling on exec
2017-11-30 08:54:33 -10:00
Antonio Murdaca
b8bba70f99
libkpod -> lib rename
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 17:08:26 +01:00
Mrunal Patel
32d2c2d57c
Bump up go version to 1.8.5
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-11-30 08:02:02 -08:00
Antonio Murdaca
c8aad704dd
container_create: fix apparmor from container config
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 16:12:16 +01:00
Antonio Murdaca
ea0bf448fe
test: add exec/execsync env conflict test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 12:54:58 +01:00
Antonio Murdaca
902acca4af
container_create: correctly set image and kube envs
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 12:28:50 +01:00
Antonio Murdaca
b59f31a2d5
oci: do not append conmon env to container process
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 11:23:42 +01:00
Antonio Murdaca
c6f68f1bf1
container_exec: use process file with runc exec
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-30 11:23:37 +01:00
Mrunal Patel
6faef13293
Merge pull request #1168 from weiwei04/remove_crioctl
...
remove crioctl source code
2017-11-29 17:06:51 -10:00
Mrunal Patel
b2a78eba2b
Merge pull request #1185 from runcom/fix-runtime-deps
...
README.md: add all runtime dependencies
2017-11-29 05:47:13 -10:00
Antonio Murdaca
bae4d2241f
README.md: add all runtime dependencies
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-11-29 15:57:17 +01:00
Wei Wei
3006a2159a
drop crioctl source code
...
Signed-off-by: Wei Wei <weiwei.inf@gmail.com>
2017-11-29 21:07:50 +08:00
Antonio Murdaca
5f5a7a3648
Merge pull request #1162 from mrunalp/add_partial_support
...
conmon: Add support for partial/newline log tags
2017-11-29 11:47:09 +01:00
Liu Chang
c0ad5277e6
Adding unit tests for server/secrets.go
...
Signed-off-by: Liu Chang <liuchang@qiniu.com>
2017-11-29 17:42:19 +08:00
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
