diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 58c9a069b2..0c963bc137 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -55,7 +55,6 @@ import ( "k8s.io/kubernetes/pkg/controller/job" namespacecontroller "k8s.io/kubernetes/pkg/controller/namespace" nodecontroller "k8s.io/kubernetes/pkg/controller/node" - persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/persistentvolume" petset "k8s.io/kubernetes/pkg/controller/petset" "k8s.io/kubernetes/pkg/controller/podautoscaler" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" @@ -66,7 +65,8 @@ import ( routecontroller "k8s.io/kubernetes/pkg/controller/route" servicecontroller "k8s.io/kubernetes/pkg/controller/service" serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount" - "k8s.io/kubernetes/pkg/controller/volume" + "k8s.io/kubernetes/pkg/controller/volume/attachdetach" + persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/volume/persistentvolume" "k8s.io/kubernetes/pkg/healthz" quotainstall "k8s.io/kubernetes/pkg/quota/install" "k8s.io/kubernetes/pkg/serviceaccount" @@ -405,7 +405,7 @@ func StartControllers(s *options.CMServer, kubeClient *client.Client, kubeconfig time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter)) attachDetachController, attachDetachControllerErr := - volume.NewAttachDetachController( + attachdetach.NewAttachDetachController( clientset.NewForConfigOrDie(restclient.AddUserAgent(kubeconfig, "attachdetach-controller")), podInformer, nodeInformer, diff --git a/contrib/mesos/pkg/controllermanager/controllermanager.go b/contrib/mesos/pkg/controllermanager/controllermanager.go index f52bfd88ad..07d09e6c50 100644 --- a/contrib/mesos/pkg/controllermanager/controllermanager.go +++ b/contrib/mesos/pkg/controllermanager/controllermanager.go @@ -45,7 +45,6 @@ import ( "k8s.io/kubernetes/pkg/controller/job" namespacecontroller "k8s.io/kubernetes/pkg/controller/namespace" nodecontroller "k8s.io/kubernetes/pkg/controller/node" - persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/persistentvolume" "k8s.io/kubernetes/pkg/controller/podautoscaler" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" "k8s.io/kubernetes/pkg/controller/podgc" @@ -55,6 +54,7 @@ import ( routecontroller "k8s.io/kubernetes/pkg/controller/route" servicecontroller "k8s.io/kubernetes/pkg/controller/service" serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount" + persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/volume/persistentvolume" "k8s.io/kubernetes/pkg/healthz" quotainstall "k8s.io/kubernetes/pkg/quota/install" "k8s.io/kubernetes/pkg/serviceaccount" diff --git a/pkg/controller/volume/attachdetach/OWNERS b/pkg/controller/volume/attachdetach/OWNERS new file mode 100644 index 0000000000..73ab6a21c9 --- /dev/null +++ b/pkg/controller/volume/attachdetach/OWNERS @@ -0,0 +1,2 @@ +assignees: + - saad-ali diff --git a/pkg/controller/volume/attach_detach_controller.go b/pkg/controller/volume/attachdetach/attach_detach_controller.go similarity index 98% rename from pkg/controller/volume/attach_detach_controller.go rename to pkg/controller/volume/attachdetach/attach_detach_controller.go index 9a07437276..6799c1bdb6 100644 --- a/pkg/controller/volume/attach_detach_controller.go +++ b/pkg/controller/volume/attachdetach/attach_detach_controller.go @@ -16,7 +16,7 @@ limitations under the License. // Package volume implements a controller to manage volume attach and detach // operations. -package volume +package attachdetach import ( "fmt" @@ -28,10 +28,10 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/controller/volume/cache" - "k8s.io/kubernetes/pkg/controller/volume/populator" - "k8s.io/kubernetes/pkg/controller/volume/reconciler" - "k8s.io/kubernetes/pkg/controller/volume/statusupdater" + "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache" + "k8s.io/kubernetes/pkg/controller/volume/attachdetach/populator" + "k8s.io/kubernetes/pkg/controller/volume/attachdetach/reconciler" + "k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/util/mount" diff --git a/pkg/controller/volume/attach_detach_controller_test.go b/pkg/controller/volume/attachdetach/attach_detach_controller_test.go similarity index 97% rename from pkg/controller/volume/attach_detach_controller_test.go rename to pkg/controller/volume/attachdetach/attach_detach_controller_test.go index 3741c56bcd..dcf68470e4 100644 --- a/pkg/controller/volume/attach_detach_controller_test.go +++ b/pkg/controller/volume/attachdetach/attach_detach_controller_test.go @@ -14,14 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -package volume +package attachdetach import ( "testing" "time" "k8s.io/kubernetes/pkg/controller/framework/informers" - controllervolumetesting "k8s.io/kubernetes/pkg/controller/volume/testing" + controllervolumetesting "k8s.io/kubernetes/pkg/controller/volume/attachdetach/testing" ) func Test_NewAttachDetachController_Positive(t *testing.T) { diff --git a/pkg/controller/volume/cache/actual_state_of_world.go b/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go similarity index 100% rename from pkg/controller/volume/cache/actual_state_of_world.go rename to pkg/controller/volume/attachdetach/cache/actual_state_of_world.go diff --git a/pkg/controller/volume/cache/actual_state_of_world_test.go b/pkg/controller/volume/attachdetach/cache/actual_state_of_world_test.go similarity index 99% rename from pkg/controller/volume/cache/actual_state_of_world_test.go rename to pkg/controller/volume/attachdetach/cache/actual_state_of_world_test.go index ede15ee013..acd503b229 100644 --- a/pkg/controller/volume/cache/actual_state_of_world_test.go +++ b/pkg/controller/volume/attachdetach/cache/actual_state_of_world_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - controllervolumetesting "k8s.io/kubernetes/pkg/controller/volume/testing" + controllervolumetesting "k8s.io/kubernetes/pkg/controller/volume/attachdetach/testing" volumetesting "k8s.io/kubernetes/pkg/volume/testing" ) diff --git a/pkg/controller/volume/cache/desired_state_of_world.go b/pkg/controller/volume/attachdetach/cache/desired_state_of_world.go similarity index 100% rename from pkg/controller/volume/cache/desired_state_of_world.go rename to pkg/controller/volume/attachdetach/cache/desired_state_of_world.go diff --git a/pkg/controller/volume/cache/desired_state_of_world_test.go b/pkg/controller/volume/attachdetach/cache/desired_state_of_world_test.go similarity index 99% rename from pkg/controller/volume/cache/desired_state_of_world_test.go rename to pkg/controller/volume/attachdetach/cache/desired_state_of_world_test.go index b2de80f6cd..ccb98b2061 100644 --- a/pkg/controller/volume/cache/desired_state_of_world_test.go +++ b/pkg/controller/volume/attachdetach/cache/desired_state_of_world_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - controllervolumetesting "k8s.io/kubernetes/pkg/controller/volume/testing" + controllervolumetesting "k8s.io/kubernetes/pkg/controller/volume/attachdetach/testing" volumetesting "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/kubernetes/pkg/volume/util/types" ) diff --git a/pkg/controller/volume/populator/desired_state_of_world_populator.go b/pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go similarity index 98% rename from pkg/controller/volume/populator/desired_state_of_world_populator.go rename to pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go index 371edb59fa..819e04be22 100644 --- a/pkg/controller/volume/populator/desired_state_of_world_populator.go +++ b/pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" kcache "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/controller/volume/cache" + "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/volume/util/volumehelper" ) diff --git a/pkg/controller/volume/reconciler/reconciler.go b/pkg/controller/volume/attachdetach/reconciler/reconciler.go similarity index 98% rename from pkg/controller/volume/reconciler/reconciler.go rename to pkg/controller/volume/attachdetach/reconciler/reconciler.go index 60914004bb..0d7316ff1c 100644 --- a/pkg/controller/volume/reconciler/reconciler.go +++ b/pkg/controller/volume/attachdetach/reconciler/reconciler.go @@ -23,8 +23,8 @@ import ( "time" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/controller/volume/cache" - "k8s.io/kubernetes/pkg/controller/volume/statusupdater" + "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache" + "k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater" "k8s.io/kubernetes/pkg/util/goroutinemap" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/volume/util/operationexecutor" diff --git a/pkg/controller/volume/reconciler/reconciler_test.go b/pkg/controller/volume/attachdetach/reconciler/reconciler_test.go similarity index 99% rename from pkg/controller/volume/reconciler/reconciler_test.go rename to pkg/controller/volume/attachdetach/reconciler/reconciler_test.go index 91d173f5d4..a1dce7d01f 100644 --- a/pkg/controller/volume/reconciler/reconciler_test.go +++ b/pkg/controller/volume/attachdetach/reconciler/reconciler_test.go @@ -22,9 +22,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/controller/framework/informers" - "k8s.io/kubernetes/pkg/controller/volume/cache" - "k8s.io/kubernetes/pkg/controller/volume/statusupdater" - controllervolumetesting "k8s.io/kubernetes/pkg/controller/volume/testing" + "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache" + "k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater" + controllervolumetesting "k8s.io/kubernetes/pkg/controller/volume/attachdetach/testing" "k8s.io/kubernetes/pkg/util/wait" volumetesting "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/kubernetes/pkg/volume/util/operationexecutor" diff --git a/pkg/controller/volume/statusupdater/fake_node_status_updater.go b/pkg/controller/volume/attachdetach/statusupdater/fake_node_status_updater.go similarity index 100% rename from pkg/controller/volume/statusupdater/fake_node_status_updater.go rename to pkg/controller/volume/attachdetach/statusupdater/fake_node_status_updater.go diff --git a/pkg/controller/volume/statusupdater/node_status_updater.go b/pkg/controller/volume/attachdetach/statusupdater/node_status_updater.go similarity index 98% rename from pkg/controller/volume/statusupdater/node_status_updater.go rename to pkg/controller/volume/attachdetach/statusupdater/node_status_updater.go index 463062297e..591f0275fa 100644 --- a/pkg/controller/volume/statusupdater/node_status_updater.go +++ b/pkg/controller/volume/attachdetach/statusupdater/node_status_updater.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/controller/volume/cache" + "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache" "k8s.io/kubernetes/pkg/util/strategicpatch" ) diff --git a/pkg/controller/volume/testing/testvolumespec.go b/pkg/controller/volume/attachdetach/testing/testvolumespec.go similarity index 100% rename from pkg/controller/volume/testing/testvolumespec.go rename to pkg/controller/volume/attachdetach/testing/testvolumespec.go diff --git a/pkg/controller/persistentvolume/OWNERS b/pkg/controller/volume/persistentvolume/OWNERS similarity index 73% rename from pkg/controller/persistentvolume/OWNERS rename to pkg/controller/volume/persistentvolume/OWNERS index b9e1568abd..1cdda19f30 100644 --- a/pkg/controller/persistentvolume/OWNERS +++ b/pkg/controller/volume/persistentvolume/OWNERS @@ -1,3 +1,4 @@ assignees: + - jsafrane - saad-ali - thockin diff --git a/pkg/controller/persistentvolume/binder_test.go b/pkg/controller/volume/persistentvolume/binder_test.go similarity index 100% rename from pkg/controller/persistentvolume/binder_test.go rename to pkg/controller/volume/persistentvolume/binder_test.go diff --git a/pkg/controller/persistentvolume/controller.go b/pkg/controller/volume/persistentvolume/controller.go similarity index 100% rename from pkg/controller/persistentvolume/controller.go rename to pkg/controller/volume/persistentvolume/controller.go diff --git a/pkg/controller/persistentvolume/controller_base.go b/pkg/controller/volume/persistentvolume/controller_base.go similarity index 100% rename from pkg/controller/persistentvolume/controller_base.go rename to pkg/controller/volume/persistentvolume/controller_base.go diff --git a/pkg/controller/persistentvolume/controller_test.go b/pkg/controller/volume/persistentvolume/controller_test.go similarity index 100% rename from pkg/controller/persistentvolume/controller_test.go rename to pkg/controller/volume/persistentvolume/controller_test.go diff --git a/pkg/controller/persistentvolume/delete_test.go b/pkg/controller/volume/persistentvolume/delete_test.go similarity index 100% rename from pkg/controller/persistentvolume/delete_test.go rename to pkg/controller/volume/persistentvolume/delete_test.go diff --git a/pkg/controller/persistentvolume/framework_test.go b/pkg/controller/volume/persistentvolume/framework_test.go similarity index 100% rename from pkg/controller/persistentvolume/framework_test.go rename to pkg/controller/volume/persistentvolume/framework_test.go diff --git a/pkg/controller/persistentvolume/index.go b/pkg/controller/volume/persistentvolume/index.go similarity index 100% rename from pkg/controller/persistentvolume/index.go rename to pkg/controller/volume/persistentvolume/index.go diff --git a/pkg/controller/persistentvolume/index_test.go b/pkg/controller/volume/persistentvolume/index_test.go similarity index 100% rename from pkg/controller/persistentvolume/index_test.go rename to pkg/controller/volume/persistentvolume/index_test.go diff --git a/pkg/controller/persistentvolume/options/options.go b/pkg/controller/volume/persistentvolume/options/options.go similarity index 100% rename from pkg/controller/persistentvolume/options/options.go rename to pkg/controller/volume/persistentvolume/options/options.go diff --git a/pkg/controller/persistentvolume/provision_test.go b/pkg/controller/volume/persistentvolume/provision_test.go similarity index 100% rename from pkg/controller/persistentvolume/provision_test.go rename to pkg/controller/volume/persistentvolume/provision_test.go diff --git a/pkg/controller/persistentvolume/recycle_test.go b/pkg/controller/volume/persistentvolume/recycle_test.go similarity index 100% rename from pkg/controller/persistentvolume/recycle_test.go rename to pkg/controller/volume/persistentvolume/recycle_test.go diff --git a/pkg/controller/persistentvolume/volume_host.go b/pkg/controller/volume/persistentvolume/volume_host.go similarity index 100% rename from pkg/controller/persistentvolume/volume_host.go rename to pkg/controller/volume/persistentvolume/volume_host.go diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 95dbcb86d1..d6f79a5d9c 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -71,7 +71,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/util/format" "k8s.io/kubernetes/pkg/kubelet/util/ioutils" "k8s.io/kubernetes/pkg/kubelet/util/queue" - kubeletvolume "k8s.io/kubernetes/pkg/kubelet/volume" + "k8s.io/kubernetes/pkg/kubelet/volumemanager" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/securitycontext" "k8s.io/kubernetes/pkg/types" @@ -501,7 +501,7 @@ func NewMainKubelet( return nil, err } - klet.volumeManager, err = kubeletvolume.NewVolumeManager( + klet.volumeManager, err = volumemanager.NewVolumeManager( enableControllerAttachDetach, hostname, klet.podManager, @@ -687,7 +687,7 @@ type Kubelet struct { // VolumeManager runs a set of asynchronous loops that figure out which // volumes need to be attached/mounted/unmounted/detached based on the pods // scheduled on this node and makes it so. - volumeManager kubeletvolume.VolumeManager + volumeManager volumemanager.VolumeManager // Cloud provider interface. cloud cloudprovider.Interface diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index bf7bad4464..85a4512ae9 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -63,7 +63,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/status" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util/queue" - kubeletvolume "k8s.io/kubernetes/pkg/kubelet/volume" + kubeletvolume "k8s.io/kubernetes/pkg/kubelet/volumemanager" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/kubelet/runonce_test.go b/pkg/kubelet/runonce_test.go index ffe96f8036..7684e33f8c 100644 --- a/pkg/kubelet/runonce_test.go +++ b/pkg/kubelet/runonce_test.go @@ -38,7 +38,7 @@ import ( podtest "k8s.io/kubernetes/pkg/kubelet/pod/testing" "k8s.io/kubernetes/pkg/kubelet/server/stats" "k8s.io/kubernetes/pkg/kubelet/status" - kubeletvolume "k8s.io/kubernetes/pkg/kubelet/volume" + "k8s.io/kubernetes/pkg/kubelet/volumemanager" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" utiltesting "k8s.io/kubernetes/pkg/util/testing" @@ -92,7 +92,7 @@ func TestRunOnce(t *testing.T) { if err != nil { t.Fatalf("failed to initialize VolumePluginMgr: %v", err) } - kb.volumeManager, err = kubeletvolume.NewVolumeManager( + kb.volumeManager, err = volumemanager.NewVolumeManager( true, kb.hostname, kb.podManager, diff --git a/pkg/kubelet/volumemanager/OWNERS b/pkg/kubelet/volumemanager/OWNERS new file mode 100644 index 0000000000..73ab6a21c9 --- /dev/null +++ b/pkg/kubelet/volumemanager/OWNERS @@ -0,0 +1,2 @@ +assignees: + - saad-ali diff --git a/pkg/kubelet/volume/cache/actual_state_of_world.go b/pkg/kubelet/volumemanager/cache/actual_state_of_world.go similarity index 100% rename from pkg/kubelet/volume/cache/actual_state_of_world.go rename to pkg/kubelet/volumemanager/cache/actual_state_of_world.go diff --git a/pkg/kubelet/volume/cache/actual_state_of_world_test.go b/pkg/kubelet/volumemanager/cache/actual_state_of_world_test.go similarity index 100% rename from pkg/kubelet/volume/cache/actual_state_of_world_test.go rename to pkg/kubelet/volumemanager/cache/actual_state_of_world_test.go diff --git a/pkg/kubelet/volume/cache/desired_state_of_world.go b/pkg/kubelet/volumemanager/cache/desired_state_of_world.go similarity index 100% rename from pkg/kubelet/volume/cache/desired_state_of_world.go rename to pkg/kubelet/volumemanager/cache/desired_state_of_world.go diff --git a/pkg/kubelet/volume/cache/desired_state_of_world_test.go b/pkg/kubelet/volumemanager/cache/desired_state_of_world_test.go similarity index 100% rename from pkg/kubelet/volume/cache/desired_state_of_world_test.go rename to pkg/kubelet/volumemanager/cache/desired_state_of_world_test.go diff --git a/pkg/kubelet/volume/populator/desired_state_of_world_populator.go b/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go similarity index 99% rename from pkg/kubelet/volume/populator/desired_state_of_world_populator.go rename to pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go index 4ef7788a8a..66ce288cc6 100644 --- a/pkg/kubelet/volume/populator/desired_state_of_world_populator.go +++ b/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go @@ -32,7 +32,7 @@ import ( kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/pod" "k8s.io/kubernetes/pkg/kubelet/util/format" - "k8s.io/kubernetes/pkg/kubelet/volume/cache" + "k8s.io/kubernetes/pkg/kubelet/volumemanager/cache" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/kubelet/volume/reconciler/reconciler.go b/pkg/kubelet/volumemanager/reconciler/reconciler.go similarity index 99% rename from pkg/kubelet/volume/reconciler/reconciler.go rename to pkg/kubelet/volumemanager/reconciler/reconciler.go index 0df8c6a861..92b8afd45e 100644 --- a/pkg/kubelet/volume/reconciler/reconciler.go +++ b/pkg/kubelet/volumemanager/reconciler/reconciler.go @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/kubelet/volume/cache" + "k8s.io/kubernetes/pkg/kubelet/volumemanager/cache" "k8s.io/kubernetes/pkg/util/goroutinemap" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/volume/util/operationexecutor" diff --git a/pkg/kubelet/volume/reconciler/reconciler_test.go b/pkg/kubelet/volumemanager/reconciler/reconciler_test.go similarity index 99% rename from pkg/kubelet/volume/reconciler/reconciler_test.go rename to pkg/kubelet/volumemanager/reconciler/reconciler_test.go index 356bd95c58..53fad688bd 100644 --- a/pkg/kubelet/volume/reconciler/reconciler_test.go +++ b/pkg/kubelet/volumemanager/reconciler/reconciler_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" "k8s.io/kubernetes/pkg/client/testing/core" - "k8s.io/kubernetes/pkg/kubelet/volume/cache" + "k8s.io/kubernetes/pkg/kubelet/volumemanager/cache" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/kubelet/volume/volume_manager.go b/pkg/kubelet/volumemanager/volume_manager.go similarity index 98% rename from pkg/kubelet/volume/volume_manager.go rename to pkg/kubelet/volumemanager/volume_manager.go index d1864df0f8..54906491c0 100644 --- a/pkg/kubelet/volume/volume_manager.go +++ b/pkg/kubelet/volumemanager/volume_manager.go @@ -28,9 +28,9 @@ import ( kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/pod" "k8s.io/kubernetes/pkg/kubelet/util/format" - "k8s.io/kubernetes/pkg/kubelet/volume/cache" - "k8s.io/kubernetes/pkg/kubelet/volume/populator" - "k8s.io/kubernetes/pkg/kubelet/volume/reconciler" + "k8s.io/kubernetes/pkg/kubelet/volumemanager/cache" + "k8s.io/kubernetes/pkg/kubelet/volumemanager/populator" + "k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler" "k8s.io/kubernetes/pkg/util/runtime" "k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/wait" diff --git a/pkg/util/goroutinemap/OWNERS b/pkg/util/goroutinemap/OWNERS new file mode 100644 index 0000000000..73ab6a21c9 --- /dev/null +++ b/pkg/util/goroutinemap/OWNERS @@ -0,0 +1,2 @@ +assignees: + - saad-ali diff --git a/pkg/volume/util/operationexecutor/OWNERS b/pkg/volume/util/operationexecutor/OWNERS new file mode 100644 index 0000000000..73ab6a21c9 --- /dev/null +++ b/pkg/volume/util/operationexecutor/OWNERS @@ -0,0 +1,2 @@ +assignees: + - saad-ali diff --git a/test/integration/persistent_volumes_test.go b/test/integration/persistent_volumes_test.go index a5cda99143..e55a3cc901 100644 --- a/test/integration/persistent_volumes_test.go +++ b/test/integration/persistent_volumes_test.go @@ -36,7 +36,7 @@ import ( clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" fake_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" - persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/persistentvolume" + persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/volume/persistentvolume" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing"