diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD index 99dadd23c6e..f79a45ca308 100644 --- a/cmd/kubelet/app/BUILD +++ b/cmd/kubelet/app/BUILD @@ -75,7 +75,7 @@ go_library( "//pkg/volume/configmap:go_default_library", "//pkg/volume/csi:go_default_library", "//pkg/volume/downwardapi:go_default_library", - "//pkg/volume/empty_dir:go_default_library", + "//pkg/volume/emptydir:go_default_library", "//pkg/volume/fc:go_default_library", "//pkg/volume/flexvolume:go_default_library", "//pkg/volume/flocker:go_default_library", diff --git a/cmd/kubelet/app/plugins.go b/cmd/kubelet/app/plugins.go index 50df52cd423..5f8ceed7b00 100644 --- a/cmd/kubelet/app/plugins.go +++ b/cmd/kubelet/app/plugins.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/volume/configmap" "k8s.io/kubernetes/pkg/volume/csi" "k8s.io/kubernetes/pkg/volume/downwardapi" - "k8s.io/kubernetes/pkg/volume/empty_dir" + "k8s.io/kubernetes/pkg/volume/emptydir" "k8s.io/kubernetes/pkg/volume/fc" "k8s.io/kubernetes/pkg/volume/flexvolume" "k8s.io/kubernetes/pkg/volume/flocker" @@ -72,7 +72,7 @@ func ProbeVolumePlugins() []volume.VolumePlugin { // Kubelet does not currently need to configure volume plugins. // If/when it does, see kube-controller-manager/app/plugins.go for example of using volume.VolumeConfig allPlugins = append(allPlugins, awsebs.ProbeVolumePlugins()...) - allPlugins = append(allPlugins, empty_dir.ProbeVolumePlugins()...) + allPlugins = append(allPlugins, emptydir.ProbeVolumePlugins()...) allPlugins = append(allPlugins, gcepd.ProbeVolumePlugins()...) allPlugins = append(allPlugins, git_repo.ProbeVolumePlugins()...) allPlugins = append(allPlugins, host_path.ProbeVolumePlugins(volume.VolumeConfig{})...) diff --git a/hack/.golint_failures b/hack/.golint_failures index 453a571666b..c927ee5a201 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -410,7 +410,6 @@ pkg/volume/azure_file pkg/volume/cephfs pkg/volume/configmap pkg/volume/csi/fake -pkg/volume/empty_dir pkg/volume/git_repo pkg/volume/host_path pkg/volume/iscsi diff --git a/pkg/kubemark/BUILD b/pkg/kubemark/BUILD index 4460f873688..40d0f495fba 100644 --- a/pkg/kubemark/BUILD +++ b/pkg/kubemark/BUILD @@ -33,7 +33,7 @@ go_library( "//pkg/util/node:go_default_library", "//pkg/util/oom:go_default_library", "//pkg/util/sysctl:go_default_library", - "//pkg/volume/empty_dir:go_default_library", + "//pkg/volume/emptydir:go_default_library", "//pkg/volume/secret:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/kubemark/hollow_kubelet.go b/pkg/kubemark/hollow_kubelet.go index bd83d93d259..18b2a6095cf 100644 --- a/pkg/kubemark/hollow_kubelet.go +++ b/pkg/kubemark/hollow_kubelet.go @@ -32,7 +32,7 @@ import ( kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/oom" - "k8s.io/kubernetes/pkg/volume/empty_dir" + "k8s.io/kubernetes/pkg/volume/emptydir" "k8s.io/kubernetes/pkg/volume/secret" "k8s.io/kubernetes/test/utils" @@ -62,7 +62,7 @@ func NewHollowKubelet( // ----------------- // Injected objects // ----------------- - volumePlugins := empty_dir.ProbeVolumePlugins() + volumePlugins := emptydir.ProbeVolumePlugins() volumePlugins = append(volumePlugins, secret.ProbeVolumePlugins()...) d := &kubelet.Dependencies{ KubeClient: client, diff --git a/pkg/volume/BUILD b/pkg/volume/BUILD index 4a680c1b1f2..39419f90d35 100644 --- a/pkg/volume/BUILD +++ b/pkg/volume/BUILD @@ -77,7 +77,7 @@ filegroup( "//pkg/volume/configmap:all-srcs", "//pkg/volume/csi:all-srcs", "//pkg/volume/downwardapi:all-srcs", - "//pkg/volume/empty_dir:all-srcs", + "//pkg/volume/emptydir:all-srcs", "//pkg/volume/fc:all-srcs", "//pkg/volume/flexvolume:all-srcs", "//pkg/volume/flocker:all-srcs", diff --git a/pkg/volume/configmap/BUILD b/pkg/volume/configmap/BUILD index a6b4e871f7d..64bfe582e60 100644 --- a/pkg/volume/configmap/BUILD +++ b/pkg/volume/configmap/BUILD @@ -32,7 +32,7 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/volume:go_default_library", - "//pkg/volume/empty_dir:go_default_library", + "//pkg/volume/emptydir:go_default_library", "//pkg/volume/testing:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/volume/configmap/configmap_test.go b/pkg/volume/configmap/configmap_test.go index 4b97550e979..82b57679126 100644 --- a/pkg/volume/configmap/configmap_test.go +++ b/pkg/volume/configmap/configmap_test.go @@ -31,7 +31,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/pkg/volume/empty_dir" + "k8s.io/kubernetes/pkg/volume/emptydir" volumetest "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/kubernetes/pkg/volume/util" ) @@ -297,7 +297,7 @@ func newTestHost(t *testing.T, clientset clientset.Interface) (string, volume.Vo t.Fatalf("can't make a temp rootdir: %v", err) } - return tempDir, volumetest.NewFakeVolumeHost(tempDir, clientset, empty_dir.ProbeVolumePlugins()) + return tempDir, volumetest.NewFakeVolumeHost(tempDir, clientset, emptydir.ProbeVolumePlugins()) } func TestCanSupport(t *testing.T) { diff --git a/pkg/volume/downwardapi/BUILD b/pkg/volume/downwardapi/BUILD index 1e6070fd3b3..deb9cf9b261 100644 --- a/pkg/volume/downwardapi/BUILD +++ b/pkg/volume/downwardapi/BUILD @@ -30,7 +30,7 @@ go_test( deps = [ "//pkg/fieldpath:go_default_library", "//pkg/volume:go_default_library", - "//pkg/volume/empty_dir:go_default_library", + "//pkg/volume/emptydir:go_default_library", "//pkg/volume/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/volume/downwardapi/downwardapi_test.go b/pkg/volume/downwardapi/downwardapi_test.go index 7b22eb9aa58..c1ca32827de 100644 --- a/pkg/volume/downwardapi/downwardapi_test.go +++ b/pkg/volume/downwardapi/downwardapi_test.go @@ -31,7 +31,7 @@ import ( utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/fieldpath" "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/pkg/volume/empty_dir" + "k8s.io/kubernetes/pkg/volume/emptydir" volumetest "k8s.io/kubernetes/pkg/volume/testing" ) @@ -47,7 +47,7 @@ func newTestHost(t *testing.T, clientset clientset.Interface) (string, volume.Vo if err != nil { t.Fatalf("can't make a temp rootdir: %v", err) } - return tempDir, volumetest.NewFakeVolumeHost(tempDir, clientset, empty_dir.ProbeVolumePlugins()) + return tempDir, volumetest.NewFakeVolumeHost(tempDir, clientset, emptydir.ProbeVolumePlugins()) } func TestCanSupport(t *testing.T) { diff --git a/pkg/volume/empty_dir/BUILD b/pkg/volume/emptydir/BUILD similarity index 97% rename from pkg/volume/empty_dir/BUILD rename to pkg/volume/emptydir/BUILD index de802241801..ceeeb1031fd 100644 --- a/pkg/volume/empty_dir/BUILD +++ b/pkg/volume/emptydir/BUILD @@ -14,7 +14,7 @@ go_library( "empty_dir_linux.go", "empty_dir_unsupported.go", ], - importpath = "k8s.io/kubernetes/pkg/volume/empty_dir", + importpath = "k8s.io/kubernetes/pkg/volume/emptydir", deps = [ "//pkg/apis/core/v1/helper:go_default_library", "//pkg/util/mount:go_default_library", diff --git a/pkg/volume/empty_dir/OWNERS b/pkg/volume/emptydir/OWNERS similarity index 100% rename from pkg/volume/empty_dir/OWNERS rename to pkg/volume/emptydir/OWNERS diff --git a/pkg/volume/empty_dir/doc.go b/pkg/volume/emptydir/doc.go similarity index 80% rename from pkg/volume/empty_dir/doc.go rename to pkg/volume/emptydir/doc.go index e790f5588d8..7aeeed1f20b 100644 --- a/pkg/volume/empty_dir/doc.go +++ b/pkg/volume/emptydir/doc.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package empty_dir contains the internal representation of emptyDir +// Package emptydir contains the internal representation of emptyDir // volumes. -package empty_dir // import "k8s.io/kubernetes/pkg/volume/empty_dir" +package emptydir // import "k8s.io/kubernetes/pkg/volume/emptydir" diff --git a/pkg/volume/empty_dir/empty_dir.go b/pkg/volume/emptydir/empty_dir.go similarity index 98% rename from pkg/volume/empty_dir/empty_dir.go rename to pkg/volume/emptydir/empty_dir.go index e0687e4e89d..d01ac4edd55 100644 --- a/pkg/volume/empty_dir/empty_dir.go +++ b/pkg/volume/emptydir/empty_dir.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package empty_dir +package emptydir import ( "fmt" @@ -40,7 +40,7 @@ import ( // http://issue.k8s.io/2630 const perm os.FileMode = 0777 -// This is the primary entrypoint for volume plugins. +// ProbeVolumePlugins is the primary entrypoint for volume plugins. func ProbeVolumePlugins() []volume.VolumePlugin { return []volume.VolumePlugin{ &emptyDirPlugin{nil}, @@ -184,7 +184,7 @@ func (ed *emptyDir) GetAttributes() volume.Attributes { // Checks prior to mount operations to verify that the required components (binaries, etc.) // to mount the volume are available on the underlying node. // If not, it returns an error -func (b *emptyDir) CanMount() error { +func (ed *emptyDir) CanMount() error { return nil } @@ -311,7 +311,7 @@ func getPageSizeMountOptionFromPod(pod *v1.Pod) (string, error) { } if !pageSizeFound { - return "", fmt.Errorf("hugePages storage requested, but there is no resource request for huge pages.") + return "", fmt.Errorf("hugePages storage requested, but there is no resource request for huge pages") } return fmt.Sprintf("%s=%s", hugePagesPageSizeMountOption, pageSize.String()), nil diff --git a/pkg/volume/empty_dir/empty_dir_linux.go b/pkg/volume/emptydir/empty_dir_linux.go similarity index 98% rename from pkg/volume/empty_dir/empty_dir_linux.go rename to pkg/volume/emptydir/empty_dir_linux.go index ba289fee9fb..880c2b37c30 100644 --- a/pkg/volume/empty_dir/empty_dir_linux.go +++ b/pkg/volume/emptydir/empty_dir_linux.go @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package empty_dir +package emptydir import ( "fmt" diff --git a/pkg/volume/empty_dir/empty_dir_test.go b/pkg/volume/emptydir/empty_dir_test.go similarity index 99% rename from pkg/volume/empty_dir/empty_dir_test.go rename to pkg/volume/emptydir/empty_dir_test.go index 767c0a945c8..31d22f36e37 100644 --- a/pkg/volume/empty_dir/empty_dir_test.go +++ b/pkg/volume/emptydir/empty_dir_test.go @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package empty_dir +package emptydir import ( "os" diff --git a/pkg/volume/empty_dir/empty_dir_unsupported.go b/pkg/volume/emptydir/empty_dir_unsupported.go similarity index 98% rename from pkg/volume/empty_dir/empty_dir_unsupported.go rename to pkg/volume/emptydir/empty_dir_unsupported.go index defbfc5e196..caeb6a77182 100644 --- a/pkg/volume/empty_dir/empty_dir_unsupported.go +++ b/pkg/volume/emptydir/empty_dir_unsupported.go @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package empty_dir +package emptydir import ( "k8s.io/api/core/v1" diff --git a/pkg/volume/git_repo/BUILD b/pkg/volume/git_repo/BUILD index 0cca9e06c74..48cfa4308dd 100644 --- a/pkg/volume/git_repo/BUILD +++ b/pkg/volume/git_repo/BUILD @@ -29,7 +29,7 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/volume:go_default_library", - "//pkg/volume/empty_dir:go_default_library", + "//pkg/volume/emptydir:go_default_library", "//pkg/volume/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/volume/git_repo/git_repo_test.go b/pkg/volume/git_repo/git_repo_test.go index 601ce9f664e..d6cf555e566 100644 --- a/pkg/volume/git_repo/git_repo_test.go +++ b/pkg/volume/git_repo/git_repo_test.go @@ -29,7 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/pkg/volume/empty_dir" + "k8s.io/kubernetes/pkg/volume/emptydir" volumetest "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/utils/exec" fakeexec "k8s.io/utils/exec/testing" @@ -40,7 +40,7 @@ func newTestHost(t *testing.T) (string, volume.VolumeHost) { if err != nil { t.Fatalf("can't make a temp rootdir: %v", err) } - return tempDir, volumetest.NewFakeVolumeHost(tempDir, nil, empty_dir.ProbeVolumePlugins()) + return tempDir, volumetest.NewFakeVolumeHost(tempDir, nil, emptydir.ProbeVolumePlugins()) } func TestCanSupport(t *testing.T) { diff --git a/pkg/volume/projected/BUILD b/pkg/volume/projected/BUILD index 79d29aece80..a1f2a07faf7 100644 --- a/pkg/volume/projected/BUILD +++ b/pkg/volume/projected/BUILD @@ -12,7 +12,7 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/volume:go_default_library", - "//pkg/volume/empty_dir:go_default_library", + "//pkg/volume/emptydir:go_default_library", "//pkg/volume/testing:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/volume/projected/projected_test.go b/pkg/volume/projected/projected_test.go index 78f16bf6e03..10c7b14fa5d 100644 --- a/pkg/volume/projected/projected_test.go +++ b/pkg/volume/projected/projected_test.go @@ -31,7 +31,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/pkg/volume/empty_dir" + "k8s.io/kubernetes/pkg/volume/emptydir" volumetest "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/kubernetes/pkg/volume/util" ) @@ -705,7 +705,7 @@ func newTestHost(t *testing.T, clientset clientset.Interface) (string, volume.Vo t.Fatalf("can't make a temp rootdir: %v", err) } - return tempDir, volumetest.NewFakeVolumeHost(tempDir, clientset, empty_dir.ProbeVolumePlugins()) + return tempDir, volumetest.NewFakeVolumeHost(tempDir, clientset, emptydir.ProbeVolumePlugins()) } func TestCanSupport(t *testing.T) { diff --git a/pkg/volume/secret/BUILD b/pkg/volume/secret/BUILD index a23307dfa7c..e07df1456f3 100644 --- a/pkg/volume/secret/BUILD +++ b/pkg/volume/secret/BUILD @@ -32,7 +32,7 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/volume:go_default_library", - "//pkg/volume/empty_dir:go_default_library", + "//pkg/volume/emptydir:go_default_library", "//pkg/volume/testing:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/volume/secret/secret_test.go b/pkg/volume/secret/secret_test.go index 9fb0e4d040a..4e407b46746 100644 --- a/pkg/volume/secret/secret_test.go +++ b/pkg/volume/secret/secret_test.go @@ -32,7 +32,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" "k8s.io/kubernetes/pkg/volume" - "k8s.io/kubernetes/pkg/volume/empty_dir" + "k8s.io/kubernetes/pkg/volume/emptydir" volumetest "k8s.io/kubernetes/pkg/volume/testing" "k8s.io/kubernetes/pkg/volume/util" @@ -268,7 +268,7 @@ func newTestHost(t *testing.T, clientset clientset.Interface) (string, volume.Vo t.Fatalf("can't make a temp rootdir: %v", err) } - return tempDir, volumetest.NewFakeVolumeHost(tempDir, clientset, empty_dir.ProbeVolumePlugins()) + return tempDir, volumetest.NewFakeVolumeHost(tempDir, clientset, emptydir.ProbeVolumePlugins()) } func TestCanSupport(t *testing.T) { diff --git a/test/test_owners.csv b/test/test_owners.csv index 0e98e68d3b1..c8684e2ceca 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -818,7 +818,7 @@ k8s.io/kubernetes/pkg/volume/cephfs,eparis,1, k8s.io/kubernetes/pkg/volume/cinder,jsafrane,1, k8s.io/kubernetes/pkg/volume/configmap,derekwaynecarr,1, k8s.io/kubernetes/pkg/volume/downwardapi,mikedanese,1, -k8s.io/kubernetes/pkg/volume/empty_dir,quinton-hoole,1, +k8s.io/kubernetes/pkg/volume/emptydir,quinton-hoole,1, k8s.io/kubernetes/pkg/volume/fc,rrati,0, k8s.io/kubernetes/pkg/volume/flexvolume,Q-Lee,1, k8s.io/kubernetes/pkg/volume/flocker,jbeda,1,