move securitycontext from dockertools to dockershim

2017-05-01 17:31:11 -07:00 · 2017-05-01 17:31:11 -07:00 · 951b2d922b
parent b209f47562
commit 951b2d922b
9 changed files with 3 additions and 3 deletions
--- a/pkg/kubelet/dockershim/security_context.go
+++ b/pkg/kubelet/dockershim/security_context.go
@ -26,7 +26,7 @@ import (

 	"k8s.io/kubernetes/pkg/api/v1"
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
-	"k8s.io/kubernetes/pkg/kubelet/dockertools/securitycontext"
+	"k8s.io/kubernetes/pkg/kubelet/dockershim/securitycontext"
 	knetwork "k8s.io/kubernetes/pkg/kubelet/network"
 )

--- a/pkg/kubelet/dockershim/security_context_test.go
+++ b/pkg/kubelet/dockershim/security_context_test.go
@ -26,7 +26,7 @@ import (
 	"github.com/stretchr/testify/assert"

 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
-	"k8s.io/kubernetes/pkg/kubelet/dockertools/securitycontext"
+	"k8s.io/kubernetes/pkg/kubelet/dockershim/securitycontext"
 )

 func TestModifyContainerConfig(t *testing.T) {
--- a/pkg/kubelet/dockertools/securitycontext/BUILD
+++ b/pkg/kubelet/dockertools/securitycontext/BUILD
--- a/pkg/kubelet/dockertools/securitycontext/doc.go
+++ b/pkg/kubelet/dockertools/securitycontext/doc.go
@ -15,4 +15,4 @@ limitations under the License.
 */

 // Package securitycontext contains security context api implementations
-package securitycontext // import "k8s.io/kubernetes/pkg/kubelet/dockertools/securitycontext"
+package securitycontext // import "k8s.io/kubernetes/pkg/kubelet/dockershim/securitycontext"
--- a/pkg/kubelet/dockertools/securitycontext/fake.go
+++ b/pkg/kubelet/dockertools/securitycontext/fake.go
--- a/pkg/kubelet/dockertools/securitycontext/provider.go
+++ b/pkg/kubelet/dockertools/securitycontext/provider.go
--- a/pkg/kubelet/dockertools/securitycontext/provider_test.go
+++ b/pkg/kubelet/dockertools/securitycontext/provider_test.go
--- a/pkg/kubelet/dockertools/securitycontext/types.go
+++ b/pkg/kubelet/dockertools/securitycontext/types.go
--- a/pkg/kubelet/dockertools/securitycontext/util.go
+++ b/pkg/kubelet/dockertools/securitycontext/util.go