Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dockershim: clean up unused security context code #48742

Merged
merged 1 commit into from
Jul 12, 2017
Merged

dockershim: clean up unused security context code #48742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions pkg/kubelet/dockershim/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ go_library(
"helpers_linux.go",
"naming.go",
"security_context.go",
"selinux_util.go",
],
tags = ["automanaged"],
deps = [
Expand All @@ -39,7 +40,6 @@ go_library(
"//pkg/kubelet/dockershim/cm:go_default_library",
"//pkg/kubelet/dockershim/errors:go_default_library",
"//pkg/kubelet/dockershim/libdocker:go_default_library",
"//pkg/kubelet/dockershim/securitycontext:go_default_library",
"//pkg/kubelet/leaky:go_default_library",
"//pkg/kubelet/network:go_default_library",
"//pkg/kubelet/network/cni:go_default_library",
Expand Down Expand Up @@ -86,6 +86,7 @@ go_test(
"helpers_test.go",
"naming_test.go",
"security_context_test.go",
"selinux_util_test.go",
],
data = [
"fixtures/seccomp/sub/subtest",
Expand All @@ -99,7 +100,6 @@ go_test(
"//pkg/kubelet/container/testing:go_default_library",
"//pkg/kubelet/dockershim/errors:go_default_library",
"//pkg/kubelet/dockershim/libdocker:go_default_library",
"//pkg/kubelet/dockershim/securitycontext:go_default_library",
"//pkg/kubelet/dockershim/testing:go_default_library",
"//pkg/kubelet/network:go_default_library",
"//pkg/kubelet/network/testing:go_default_library",
Expand Down Expand Up @@ -134,7 +134,6 @@ filegroup(
"//pkg/kubelet/dockershim/errors:all-srcs",
"//pkg/kubelet/dockershim/libdocker:all-srcs",
"//pkg/kubelet/dockershim/remote:all-srcs",
"//pkg/kubelet/dockershim/securitycontext:all-srcs",
"//pkg/kubelet/dockershim/testing:all-srcs",
],
tags = ["automanaged"],
Expand Down
11 changes: 2 additions & 9 deletions pkg/kubelet/dockershim/security_context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ import (
"github.com/blang/semver"
dockercontainer "github.com/docker/engine-api/types/container"

"k8s.io/api/core/v1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/dockershim/securitycontext"
knetwork "k8s.io/kubernetes/pkg/kubelet/network"
)

Expand Down Expand Up @@ -101,14 +99,9 @@ func modifyHostConfig(sc *runtimeapi.LinuxContainerSecurityContext, hostConfig *
hostConfig.CapDrop = sc.GetCapabilities().DropCapabilities
}
if sc.SelinuxOptions != nil {
hostConfig.SecurityOpt = securitycontext.ModifySecurityOptions(
hostConfig.SecurityOpt = addSELinuxOptions(
hostConfig.SecurityOpt,
&v1.SELinuxOptions{
User: sc.SelinuxOptions.User,
Role: sc.SelinuxOptions.Role,
Type: sc.SelinuxOptions.Type,
Level: sc.SelinuxOptions.Level,
},
sc.SelinuxOptions,
separator,
)
}
Expand Down
25 changes: 12 additions & 13 deletions pkg/kubelet/dockershim/security_context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"github.com/stretchr/testify/assert"

runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
"k8s.io/kubernetes/pkg/kubelet/dockershim/securitycontext"
)

func TestModifyContainerConfig(t *testing.T) {
Expand Down Expand Up @@ -83,10 +82,10 @@ func TestModifyHostConfig(t *testing.T) {
}
setSELinuxHC := &dockercontainer.HostConfig{
SecurityOpt: []string{
fmt.Sprintf("%s:%s", securitycontext.DockerLabelUser('='), "user"),
fmt.Sprintf("%s:%s", securitycontext.DockerLabelRole('='), "role"),
fmt.Sprintf("%s:%s", securitycontext.DockerLabelType('='), "type"),
fmt.Sprintf("%s:%s", securitycontext.DockerLabelLevel('='), "level"),
fmt.Sprintf("%s:%s", selinuxLabelUser('='), "user"),
fmt.Sprintf("%s:%s", selinuxLabelRole('='), "role"),
fmt.Sprintf("%s:%s", selinuxLabelType('='), "type"),
fmt.Sprintf("%s:%s", selinuxLabelLevel('='), "level"),
},
}

Expand Down Expand Up @@ -184,10 +183,10 @@ func TestModifyHostConfigAndNamespaceOptionsForContainer(t *testing.T) {
}
setSELinuxHC := &dockercontainer.HostConfig{
SecurityOpt: []string{
fmt.Sprintf("%s:%s", securitycontext.DockerLabelUser('='), "user"),
fmt.Sprintf("%s:%s", securitycontext.DockerLabelRole('='), "role"),
fmt.Sprintf("%s:%s", securitycontext.DockerLabelType('='), "type"),
fmt.Sprintf("%s:%s", securitycontext.DockerLabelLevel('='), "level"),
fmt.Sprintf("%s:%s", selinuxLabelUser('='), "user"),
fmt.Sprintf("%s:%s", selinuxLabelRole('='), "role"),
fmt.Sprintf("%s:%s", selinuxLabelType('='), "type"),
fmt.Sprintf("%s:%s", selinuxLabelLevel('='), "level"),
},
IpcMode: dockercontainer.IpcMode(sandboxNSMode),
NetworkMode: dockercontainer.NetworkMode(sandboxNSMode),
Expand Down Expand Up @@ -415,10 +414,10 @@ func fullValidHostConfig() *dockercontainer.HostConfig {
CapAdd: []string{"addCapA", "addCapB"},
CapDrop: []string{"dropCapA", "dropCapB"},
SecurityOpt: []string{
fmt.Sprintf("%s:%s", securitycontext.DockerLabelUser('='), "user"),
fmt.Sprintf("%s:%s", securitycontext.DockerLabelRole('='), "role"),
fmt.Sprintf("%s:%s", securitycontext.DockerLabelType('='), "type"),
fmt.Sprintf("%s:%s", securitycontext.DockerLabelLevel('='), "level"),
fmt.Sprintf("%s:%s", selinuxLabelUser('='), "user"),
fmt.Sprintf("%s:%s", selinuxLabelRole('='), "role"),
fmt.Sprintf("%s:%s", selinuxLabelType('='), "type"),
fmt.Sprintf("%s:%s", selinuxLabelLevel('='), "level"),
},
}
}
53 changes: 0 additions & 53 deletions pkg/kubelet/dockershim/securitycontext/BUILD
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions pkg/kubelet/dockershim/securitycontext/doc.go
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions pkg/kubelet/dockershim/securitycontext/fake.go
View file
Open in desktop

This file was deleted.

131 changes: 0 additions & 131 deletions pkg/kubelet/dockershim/securitycontext/provider.go
View file
Open in desktop

This file was deleted.