Commit Graph

1685 Commits

Author SHA1 Message Date
Mike Brown
a1e4f99a32
Merge pull request #1296 from Random-Liu/fix-ssh-disconnect
Set keepalive for ssh in windows test.
2019-09-25 10:02:59 -05:00
Lantao Liu
2eba67a7ee
Merge pull request #1287 from crosbymichael/cgroups
Use type alias from containerd for cgroup metric types
2019-09-24 17:34:49 -07:00
Lantao Liu
4a0b0a883f Set keepalive for ssh in windows test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-24 16:57:31 -07:00
Lantao Liu
36f393dc6d
Merge pull request #1292 from Random-Liu/better-kube-up
Document simpler kube-up.sh
2019-09-24 13:17:17 -07:00
Lantao Liu
44e1f8ded5
Merge pull request #1294 from jterry75/fix_windows_hostname_upstream
Forward SandboxConfig.Hostname to Workload container activation
2019-09-24 11:40:51 -07:00
Justin Terry (VM)
ed7873ef1e Forward SandboxConfig.Hostname to Workload container activation
1. For Windows the Hostname property is not inherited from the sandbox and must
be passed for the Workload container activations as well.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-09-24 10:21:17 -07:00
Mike Brown
4f203aa8ba
Merge pull request #1293 from Random-Liu/update-hcsshim
Update hcsshim to c088f411aaf3585d8dffc9deb4289ffa32854497.
2019-09-24 10:07:56 -05:00
Lantao Liu
e8a788d786 Update hcsshim to c088f411aaf3585d8dffc9deb4289ffa32854497.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-24 00:11:58 -07:00
Lantao Liu
bad68a8270
Merge pull request #1284 from liyanhui1228/win_portforward
Add windows port forward support
2019-09-23 22:17:08 -07:00
Mike Brown
0a6d9f188b
Merge pull request #1291 from Random-Liu/fix-indent-cni
Fix indent in cni.template.
2019-09-23 19:52:31 -05:00
Angela Li
dc413bd6d6 Add windows portforward support
Signed-off-by: Angela Li <yanhuil@google.com>
2019-09-23 17:36:43 -07:00
Lantao Liu
56fa16ef9c Update the kube-up doc with a simpler approach.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-23 17:24:10 -07:00
Lantao Liu
b4c46db790 Fix indent in cni.template.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-23 16:08:39 -07:00
Lantao Liu
f7f64fdefd
Merge pull request #1289 from Random-Liu/ignore-permission-denied
Ignore temporary permission denied error.
2019-09-23 15:36:26 -07:00
Lantao Liu
67440484f2 Ignore temporary permission denied error.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-23 12:17:24 -07:00
Michael Crosby
c8c7c54a6e Use typealias for containerd metrics
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-09-20 16:01:48 -04:00
Michael Crosby
437123646a Update containerd to ed16170c4c
1.3.0+2

Includes changes for cgroup metrics type alias

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-09-20 10:06:22 -04:00
Lantao Liu
470776c903
Merge pull request #1274 from Random-Liu/dualstack
Add DualStack support
2019-09-19 21:32:26 -07:00
Lantao Liu
c1ece0c801 Address comment.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-19 14:05:28 -07:00
Lantao Liu
b431316edd
Merge pull request #1280 from estesp/add-default-path-env
Add back default UNIX env to container config
2019-09-19 11:41:03 -07:00
Lantao Liu
df88e190c3
Merge pull request #1281 from estesp/golangci-config
Move golangci-lint configuration out of Makefile
2019-09-19 10:27:20 -07:00
Phil Estes
161abf8f5b
Fix golangci-lint findings
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-09-19 09:38:40 -04:00
Phil Estes
1e3cd5b052
Move golangci-lint configuration out of Makefile
Add 2m deadline; similar to containerd, recent issues with golangci-lint
taking more than 1 minute (seen in recent containerd/cri PRs as well).

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-09-19 09:23:12 -04:00
Phil Estes
229eb19bd6
Add back default UNIX env to container config
Due to changes to the defaults in containerd, the CRI path to creating a
container OCI config needs to add back in the default UNIX $PATH (and
any other defaults) as that is the expected behavior from other
runtimes.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-09-19 09:00:25 -04:00
Lantao Liu
35eb96d901 Update deployment and integration test
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-18 17:21:37 -07:00
Lantao Liu
5a68bd70c8 Update kubernetes to 1.16.0-rc.2
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-18 17:21:37 -07:00
Antonio Ojea
fcd6bf318b Report Additional POD IPs
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-18 17:21:37 -07:00
Lantao Liu
9d60f9c56e
Merge pull request #1264 from Random-Liu/windows-support-2
Add Implementation for WCOW process isolation support.
2019-09-18 11:38:11 -07:00
Lantao Liu
7e96aaab09 Add CRI Validation test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-18 10:46:29 -07:00
Lantao Liu
dc964de85f Add windows implmenetation
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-18 10:46:29 -07:00
Lantao Liu
bbcf564745 Add windows image platform comparer
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-18 10:46:28 -07:00
Lantao Liu
c6cb25c158 Open/create log file with FILE_SHARE_DELETE on windows
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-18 10:46:28 -07:00
Lantao Liu
59b6ed641f Update containerd to 59a625defb
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-12 18:13:15 -07:00
Lantao Liu
3a6510756e
Merge pull request #1260 from bart0sh/PR0001-container-annotations
Use container annotations when creating containers
2019-09-12 16:36:59 -07:00
Mike Brown
738179542a add a test case for container_annotations
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2019-09-10 11:28:59 +03:00
Ed Bartosh
05a9028969 Use container annotations when creating containers
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
2019-09-10 11:28:59 +03:00
Ed Bartosh
e28689657a Add ContatinerAnnotations to the Runtime and config
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
2019-09-10 11:28:51 +03:00
Lantao Liu
307e802aa5
Merge pull request #1271 from mikebrow/update-readme-goinstr
need to move instr to more recent golang; remove integration/*.go from lint verify test
2019-09-09 17:00:53 -07:00
Mike Brown
da03c5bb9a remove integration files from lint verify
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2019-09-09 11:17:25 -07:00
Mike Brown
02596d2758 need to move up to a more recent golang
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2019-09-09 09:59:29 -07:00
Lantao Liu
6961bfa1d4
Merge pull request #1266 from Random-Liu/support-local-containerd
Support local containerd release.
2019-09-06 17:47:19 -07:00
Lantao Liu
763461f47f Support local containerd release.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-06 16:26:14 -07:00
Lantao Liu
6f59705a3f
Merge pull request #1256 from Random-Liu/exec-background
Clarify exec behavior in some edge cases
2019-09-03 17:22:00 -07:00
Lantao Liu
115b7664d9 Clarify some exec behavior.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-03 16:52:23 -07:00
Lantao Liu
857a2d0cc7
Merge pull request #1258 from Random-Liu/windows-support-1
Build CRI Plugin on Windows and Add Presubmit
2019-09-03 16:51:34 -07:00
Lantao Liu
0122e90b20 Add presubmit test for windows.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-03 16:23:42 -07:00
Lantao Liu
86de625ece Update vendor
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-03 16:23:42 -07:00
Lantao Liu
50c73e6dc5 Move unix specific logic into _unix.go
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-03 16:23:42 -07:00
Lantao Liu
7b606375ae
Merge pull request #1259 from Random-Liu/fix-potential-panic-for-unknown-state
Fix panic for task in unknown state.
2019-09-03 16:20:15 -07:00
Mike Brown
2d17942b17
Merge pull request #1252 from Random-Liu/update-cri-tools
Update cri-tools to fix all image reference test failure.
2019-09-03 18:09:00 -05:00