Commit Graph

1444 Commits

Author SHA1 Message Date
Lantao Liu
c83a55d617
Merge pull request #734 from Random-Liu/update-containerd
Update containerd.
2018-04-17 10:01:48 -07:00
Lantao Liu
5cb4744f27 Fix portforward for host network.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-17 08:24:44 +00:00
Lantao Liu
19882b8028
Merge pull request #735 from mikebrow/track-golang-point-releases
start tracking golang updates for 1.10.x
2018-04-16 22:45:25 -07:00
Lantao Liu
b7af412106
Merge pull request #731 from Random-Liu/add-release-instruction
Add release instruction to make the release process written down.
2018-04-16 18:40:27 -07:00
Mike Brown
5f87a2a0d9 start tracking golang updates for 1.10.x
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-04-16 08:03:52 -05:00
Lantao Liu
9aa9f85a03 Add release instruction to make the release process written down.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-16 06:46:22 +00:00
Lantao Liu
da285a10b9 Update containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-16 06:25:21 +00:00
Lantao Liu
77a33b10a9
Merge pull request #729 from Random-Liu/fix-portforward
Add socat back.
2018-04-10 23:08:57 -07:00
Lantao Liu
69b3f3aeac Add socat back.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-11 01:53:24 +00:00
Lantao Liu
b09489de96
Merge pull request #727 from Random-Liu/fix-symlink-layer
Support symlink layer in image import.
2018-04-10 18:32:29 -07:00
Lantao Liu
9f85c48e4c Support symlink layer in image import.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-10 22:08:45 +00:00
Lantao Liu
de0afd70ee
Merge pull request #728 from abhi/socat
Minor cleanup of comment in ansible
2018-04-09 16:34:38 -07:00
abhi
f7a0b43734 Minor cleanup of comment in ansible
Signed-off-by: abhi <abhi@docker.com>
2018-04-09 15:57:24 -07:00
Lantao Liu
3d0706c4e5
Merge pull request #691 from abhi/socat
Getting rid of nsenter and socat
2018-04-09 15:34:44 -07:00
abhi
c200cb4642 Updating ansible installer
Signed-off-by: abhi <abhi@docker.com>
2018-04-09 14:31:49 -07:00
Abhinandan Prativadi
1317854ec1 Updating travis.yml and Readme to remove nsenter and socal
Signed-off-by: abhi <abhi@docker.com>
2018-04-09 14:31:49 -07:00
abhi
02b952ec17 Getting rid of socat
Signed-off-by: abhi <abhi@docker.com>
2018-04-09 14:31:44 -07:00
Lantao Liu
304045491c
Merge pull request #725 from Random-Liu/fix-resolver-race
Fix resolver race
2018-04-09 13:10:44 -07:00
Lantao Liu
2e693ad4f6
Merge pull request #724 from Random-Liu/add-cni-config-template
Add cni config template
2018-04-09 13:10:05 -07:00
Lantao Liu
a68530c1e8 Port containerd fix #2276
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-09 18:36:06 +00:00
Lantao Liu
d8a3c5f254 Address comments.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-09 18:15:09 +00:00
Lantao Liu
b2099c2061 Add cni config template support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-07 06:34:45 +00:00
Lantao Liu
68ef2c338e Update containerd to v1.1.0-rc.1
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-07 00:49:58 +00:00
abhi
aeef99a76e Using netns to perform socat
This commit removes the usage of nsenter and uses netns
to perform socat operation.

Signed-off-by: abhi <abhi@docker.com>
2018-04-05 13:28:00 -07:00
Lantao Liu
c0f483adcf
Merge pull request #719 from qiujian16/qj_update_reademe
Update readme on how to configure cri plugin
2018-04-03 19:12:31 -07:00
Jian Qiu
8a7cd184dd Update README to add link on cri configuration
Signed-off-by: Qiu Jian <qiujian@cn.ibm.com>
2018-04-04 09:25:26 +08:00
Lantao Liu
9049463568
Merge pull request #720 from Random-Liu/update-containerd-before-release
Update containerd once before release.
2018-04-03 13:32:22 -07:00
Lantao Liu
55c54d118d Update containerd once before release.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-03 18:25:51 +00:00
Lantao Liu
2bc72b6e0c
Merge pull request #717 from Random-Liu/enable-tls-streaming
Enable TLS streaming in all the setup.
2018-04-02 19:38:44 -07:00
Lantao Liu
ad7bffc093 Enable TLS streaming in all the setup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-03 00:17:26 +00:00
Lantao Liu
6e13a4dd52
Merge pull request #713 from mikebrow/use-self-certified-ca
switches from not CA signed to self CA signed for streaming TLS
2018-04-02 17:00:25 -07:00
Lantao Liu
facb6082f7
Merge pull request #716 from Random-Liu/update-cri-test
Update cri test to include RunAsGroup test.
2018-04-02 15:54:27 -07:00
Lantao Liu
839f9c3253
Merge pull request #715 from Random-Liu/upgrade-ansible
Upgrade the tarball version in ansible.
2018-04-02 15:54:13 -07:00
Mike Brown
c7793564fc switches from not CA signed to self CA signed for streaming TLS
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-04-02 17:50:12 -05:00
Lantao Liu
334f7ddf0a Update cri test to include RunAsGroup test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-02 21:29:09 +00:00
Lantao Liu
d36d62ecd4
Merge pull request #714 from mikebrow/disable-tls-flag
adds a new flag to enable TLS support (insecure for now)
2018-04-02 14:20:37 -07:00
Lantao Liu
b287fec35d Upgrade the tarball version in ansible.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-02 20:06:20 +00:00
Lantao Liu
c4f80aecb7
Merge pull request #711 from tklauser/libapparmor-dep
Drop libapparmor dependency from build docs
2018-04-02 11:55:27 -07:00
Mike Brown
2f9f721b63 adds a new flag to enable TLS support insecure for now
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-04-02 12:27:55 -05:00
Tobias Klauser
d29678a3c4 Drop libapparmor dependency from build docs
As of opencontainers/runc@db093f6 runc no longer depends on libapparmor
thus libapparmor-dev no longer needs to be installed to build it or
anythind that depends on it (like containerd or cri-containerd). Adjust
the documentation accordingly.

containerd/containerd#2238 did the same for containerd.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2018-03-31 18:18:12 +02:00
Lantao Liu
ed92befab7
Merge pull request #710 from Random-Liu/support-run-as-group
Add RunAsGroup support.
2018-03-30 17:21:25 -07:00
Lantao Liu
ed20174ce4 Add RunAsGroup support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-30 22:26:07 +00:00
Lantao Liu
f99f0be5ae
Merge pull request #707 from Random-Liu/fix-log-output
Fix a log output.
2018-03-28 16:18:58 -07:00
Lantao Liu
0fc1372b77
Merge pull request #706 from tkellen/patch-1
fully specify --container-runtime-endpoint flag
2018-03-28 16:18:44 -07:00
Lantao Liu
71c8b6b9e0
Merge pull request #704 from Random-Liu/use-systemd
Use systemd service cgroup and oom score adj.
2018-03-28 14:53:24 -07:00
Lantao Liu
be43ad09da Fix a log output.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-28 21:31:44 +00:00
Tyler Kellen
11189f6e8b fully specify --container-runtime-endpoint flag
Resolves this warning:
"/run/containerd/containerd.sock" as endpoint is deprecated please
consider using full url format "unix:///run/containerd/containerd.sock"

Signed-off-by: Tyler Kellen <tyler@sleekcode.net>
2018-03-28 17:23:43 -04:00
Lantao Liu
2073d270a5
Merge pull request #705 from Random-Liu/update-vendors
Update cri-tools, containerd and kubernetes version.
2018-03-28 09:56:53 -07:00
Lantao Liu
bb480ceabd Update cri-tools, containerd and kubernetes version.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-28 00:45:01 +00:00
Lantao Liu
ddda05211b Use systemd service cgroup and oom score adj.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-28 00:30:59 +00:00