From 951b2d922b24d0c002c92f7b62d9863f0acb02fe Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Mon, 1 May 2017 17:31:11 -0700 Subject: [PATCH] move securitycontext from dockertools to dockershim --- pkg/kubelet/dockershim/security_context.go | 2 +- pkg/kubelet/dockershim/security_context_test.go | 2 +- pkg/kubelet/{dockertools => dockershim}/securitycontext/BUILD | 0 pkg/kubelet/{dockertools => dockershim}/securitycontext/doc.go | 2 +- pkg/kubelet/{dockertools => dockershim}/securitycontext/fake.go | 0 .../{dockertools => dockershim}/securitycontext/provider.go | 0 .../securitycontext/provider_test.go | 0 .../{dockertools => dockershim}/securitycontext/types.go | 0 pkg/kubelet/{dockertools => dockershim}/securitycontext/util.go | 0 9 files changed, 3 insertions(+), 3 deletions(-) rename pkg/kubelet/{dockertools => dockershim}/securitycontext/BUILD (100%) rename pkg/kubelet/{dockertools => dockershim}/securitycontext/doc.go (95%) rename pkg/kubelet/{dockertools => dockershim}/securitycontext/fake.go (100%) rename pkg/kubelet/{dockertools => dockershim}/securitycontext/provider.go (100%) rename pkg/kubelet/{dockertools => dockershim}/securitycontext/provider_test.go (100%) rename pkg/kubelet/{dockertools => dockershim}/securitycontext/types.go (100%) rename pkg/kubelet/{dockertools => dockershim}/securitycontext/util.go (100%) diff --git a/pkg/kubelet/dockershim/security_context.go b/pkg/kubelet/dockershim/security_context.go index f683110270c..f116675126f 100644 --- 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" ) diff --git a/pkg/kubelet/dockershim/security_context_test.go b/pkg/kubelet/dockershim/security_context_test.go index 1074ee411a2..001dba61869 100644 --- 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) { diff --git a/pkg/kubelet/dockertools/securitycontext/BUILD b/pkg/kubelet/dockershim/securitycontext/BUILD similarity index 100% rename from pkg/kubelet/dockertools/securitycontext/BUILD rename to pkg/kubelet/dockershim/securitycontext/BUILD diff --git a/pkg/kubelet/dockertools/securitycontext/doc.go b/pkg/kubelet/dockershim/securitycontext/doc.go similarity index 95% rename from pkg/kubelet/dockertools/securitycontext/doc.go rename to pkg/kubelet/dockershim/securitycontext/doc.go index 72fde215674..dd9a0a2291d 100644 --- a/pkg/kubelet/dockertools/securitycontext/doc.go +++ b/pkg/kubelet/dockershim/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" diff --git a/pkg/kubelet/dockertools/securitycontext/fake.go b/pkg/kubelet/dockershim/securitycontext/fake.go similarity index 100% rename from pkg/kubelet/dockertools/securitycontext/fake.go rename to pkg/kubelet/dockershim/securitycontext/fake.go diff --git a/pkg/kubelet/dockertools/securitycontext/provider.go b/pkg/kubelet/dockershim/securitycontext/provider.go similarity index 100% rename from pkg/kubelet/dockertools/securitycontext/provider.go rename to pkg/kubelet/dockershim/securitycontext/provider.go diff --git a/pkg/kubelet/dockertools/securitycontext/provider_test.go b/pkg/kubelet/dockershim/securitycontext/provider_test.go similarity index 100% rename from pkg/kubelet/dockertools/securitycontext/provider_test.go rename to pkg/kubelet/dockershim/securitycontext/provider_test.go diff --git a/pkg/kubelet/dockertools/securitycontext/types.go b/pkg/kubelet/dockershim/securitycontext/types.go similarity index 100% rename from pkg/kubelet/dockertools/securitycontext/types.go rename to pkg/kubelet/dockershim/securitycontext/types.go diff --git a/pkg/kubelet/dockertools/securitycontext/util.go b/pkg/kubelet/dockershim/securitycontext/util.go similarity index 100% rename from pkg/kubelet/dockertools/securitycontext/util.go rename to pkg/kubelet/dockershim/securitycontext/util.go