Merge pull request #30802 from MHBauer/ensure-mounter

Automatic merge from submit-queue ensure pkg/util/mount compiles & crosses  **What this PR does / why we need it**: osx doesn't build **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #30795 **Special notes for your reviewer**: **Release note**: ```release-note-none ``` - move compile time check from linux code to generic code - remove duplication of #30724 and #30666 to resolve #30795

Merge pull request #30802 from MHBauer/ensure-mounter
54ca3890 · Kubernetes Submit Queue · GitHub · 9de9405b · 92a043e8 · 54ca3890
Commit 54ca3890 authored Aug 22, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

mount.go pkg/util/mount/mount.go +4 -0

mount_linux.go pkg/util/mount/mount_linux.go +0 -2

No files found.
--- a/pkg/util/mount/mount.go
+++ b/pkg/util/mount/mount.go
@@ -51,6 +51,10 @@ type Interface interface {
 	GetDeviceNameFromMount(mountPath, pluginDir string) (string, error)
 }

+// Compile-time check to ensure all Mounter implementations satisfy
+// the mount interface
+var _ Interface = &Mounter{}
+
 // This represents a single line in /proc/mounts or /etc/fstab.
 type MountPoint struct {
 	Device string

--- a/pkg/util/mount/mount_linux.go
+++ b/pkg/util/mount/mount_linux.go
@@ -54,8 +54,6 @@ const (
 // kubelet is running in the host's root mount namespace.
 type Mounter struct{}

-var _ = Interface(&Mounter{})
-
 // Mount mounts source to target as fstype with given options. 'source' and 'fstype' must
 // be an emtpy string in case it's not required, e.g. for remount, or for auto filesystem
 // type, where kernel handles fs type for you. The mount 'options' is a list of options,