Kubernetes Submit Queue c743e68fb1 Merge pull request #50694 from dims/fix-make-cross-problem-with-helpers ...

Automatic merge from submit-queue (batch tested with PRs 50694, 50702)

Fix make cross build failure

**What this PR does / why we need it**:

had to fix the method getSecurityOpts in helpers_windows.go to
match the implementation in helpers_linux.go from commit:
bf01fa2f00


**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

Fixes #50675

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```

2017-08-15 14:28:24 -07:00

..

cm

Use buildozer to delete licenses() rules except under third_party/

2017-08-11 09:32:39 -07:00

errors

Use buildozer to delete licenses() rules except under third_party/

2017-08-11 09:32:39 -07:00

fixtures/seccomp

Add the seccomp profile loading test to dockershim

2017-05-03 12:55:56 -07:00

libdocker

Merge pull request #46105 from sjenning/update-conatiner-resource-cri

2017-08-11 14:14:00 -07:00

remote

Merge pull request #46105 from sjenning/update-conatiner-resource-cri

2017-08-11 14:14:00 -07:00

testing

Use buildozer to delete licenses() rules except under third_party/

2017-08-11 09:32:39 -07:00

BUILD

move KubeletConfiguration out of componentconfig API group

2017-08-15 08:12:42 -07:00

checkpoint_store_test.go

initialize directory while creating checkpoint file store

2017-02-17 16:56:46 -08:00

checkpoint_store.go

dockershim: call sync() after writing the checkpoint

2017-03-14 18:36:51 -07:00

convert_test.go

Updates Docker Engine API

2017-07-13 12:55:07 -07:00

convert.go

Updates Docker Engine API

2017-07-13 12:55:07 -07:00

doc.go

Update CRI references

2017-06-09 10:16:40 +08:00

docker_checkpoint_test.go

dockershim: checkpoint HostNetwork property

2017-06-21 13:10:47 -05:00

docker_checkpoint.go

dockershim: checkpoint HostNetwork property

2017-06-21 13:10:47 -05:00

docker_container_test.go

Merge pull request #49107 from edevil/try_remove_old_log

2017-07-20 15:08:17 -07:00

docker_container.go

Use seccomp from security context

2017-08-13 15:42:15 +08:00

docker_image_test.go

Updates Docker Engine API

2017-07-13 12:55:07 -07:00

docker_image.go

Updates Docker Engine API

2017-07-13 12:55:07 -07:00

docker_legacy_test.go

Updates Docker Engine API

2017-07-13 12:55:07 -07:00

docker_legacy.go

Updates Docker Engine API

2017-07-13 12:55:07 -07:00

docker_sandbox_test.go

dockershim: don't spam logs with pod IP errors before networking is ready

2017-06-12 15:07:38 -05:00

docker_sandbox.go

Use seccomp from security context

2017-08-13 15:42:15 +08:00

docker_service_test.go

Updates Docker Engine API

2017-07-13 12:55:07 -07:00

docker_service.go

move KubeletConfiguration out of componentconfig API group

2017-08-15 08:12:42 -07:00

docker_stats.go

Update CRI references

2017-06-09 10:16:40 +08:00

docker_streaming.go

Fix TODO: rename podInfraContainerID to podSandboxID

2017-07-20 17:45:55 -07:00

exec.go

update import

2017-07-20 11:03:49 -07:00

helpers_linux_test.go

Rename runtime/default to docker default

2017-08-13 15:42:15 +08:00

helpers_linux.go

Rename runtime/default to docker default

2017-08-13 15:42:15 +08:00

helpers_test.go

Updates Docker Engine API

2017-07-13 12:55:07 -07:00

helpers_unsupported.go

Use seccomp from security context

2017-08-13 15:42:15 +08:00

helpers_windows.go

Fix make cross build failure

2017-08-15 14:25:35 -04:00

helpers.go

Updates Docker Engine API

2017-07-13 12:55:07 -07:00

naming_test.go

Update CRI references

2017-06-09 10:16:40 +08:00

naming.go

Update CRI references

2017-06-09 10:16:40 +08:00

security_context_test.go

Updates Docker Engine API

2017-07-13 12:55:07 -07:00

security_context.go

Merge pull request #47019 from jessfraz/allowPrivilegeEscalation

2017-07-31 16:56:58 -07:00

selinux_util_test.go

dockershim: clean up unused security context code

2017-07-10 17:48:26 -07:00

selinux_util.go

dockershim: clean up unused security context code

2017-07-10 17:48:26 -07:00