Commit 493ee8b2 authored by Davanum Srinivas's avatar Davanum Srinivas

Fix make cross build failure

had to fix the method getSecurityOpts in helpers_windows.go to match the implementation in helpers_linux.go from commit: bf01fa2f Fixes #50675
parent 3211d4dd
......@@ -26,7 +26,6 @@ import (
dockercontainer "github.com/docker/docker/api/types/container"
dockerfilters "github.com/docker/docker/api/types/filters"
"github.com/golang/glog"
"k8s.io/api/core/v1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)
......@@ -34,19 +33,10 @@ func DefaultMemorySwap() int64 {
return 0
}
func (ds *dockerService) getSecurityOpts(containerName string, sandboxConfig *runtimeapi.PodSandboxConfig, separator rune) ([]string, error) {
hasSeccompSetting := false
annotations := sandboxConfig.GetAnnotations()
if _, ok := annotations[v1.SeccompContainerAnnotationKeyPrefix+containerName]; !ok {
_, hasSeccompSetting = annotations[v1.SeccompPodAnnotationKey]
} else {
hasSeccompSetting = true
func (ds *dockerService) getSecurityOpts(seccompProfile string, separator rune) ([]string, error) {
if seccompProfile != "" {
glog.Warningf("seccomp annotations are not supported on windows")
}
if hasSeccompSetting {
glog.Warningf("seccomp annotations found, but it is not supported on windows")
}
return nil, nil
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment