Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
493ee8b2
Commit
493ee8b2
authored
Aug 15, 2017
by
Davanum Srinivas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
13 deletions
+3
-13
helpers_windows.go
pkg/kubelet/dockershim/helpers_windows.go
+3
-13
No files found.
pkg/kubelet/dockershim/helpers_windows.go
View file @
493ee8b2
...
...
@@ -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
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment