Replace kubernetes mount code with utils

go.mod

@@ -134,7 +134,7 @@ require (
 	k8s.io/klog v0.3.1
 	k8s.io/kubernetes v1.15.3
 	k8s.io/legacy-cloud-providers v0.0.0
-	k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5
+	k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6
 	sigs.k8s.io/controller-runtime v0.2.2
 	sigs.k8s.io/controller-tools v0.2.2-0.20190919191502-76a25b63325a
 	sigs.k8s.io/yaml v1.1.0

go.sum

@@ -662,6 +662,8 @@ k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn
 k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
 k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5 h1:VBM/0P5TWxwk+Nw6Z+lAw3DKgO76g90ETOiA6rfLV1Y=
 k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6 h1:p0Ai3qVtkbCG/Af26dBmU0E1W58NID3hSSh7cMyylpM=
+k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
 modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=

hack/.packages

@@ -155,6 +155,7 @@ k8s.io/kops/protokube/pkg/gossip/gce
 k8s.io/kops/protokube/pkg/gossip/memberlist
 k8s.io/kops/protokube/pkg/gossip/mesh
 k8s.io/kops/protokube/pkg/gossip/openstack
+k8s.io/kops/protokube/pkg/hostmount
 k8s.io/kops/protokube/pkg/protokube
 k8s.io/kops/protokube/tests/integration/build_etcd_manifest
 k8s.io/kops/tests

nodeup/pkg/model/BUILD.bazel

@@ -76,7 +76,8 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
         "//vendor/k8s.io/client-go/util/cert:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
-        "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library",
+        "//vendor/k8s.io/utils/exec:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
     ],
 )
 

nodeup/pkg/model/context.go

@@ -32,7 +32,7 @@ import (
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"
 	"k8s.io/kops/util/pkg/vfs"
-	"k8s.io/kubernetes/pkg/util/mount"
+	"k8s.io/utils/mount"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"

nodeup/pkg/model/volumes.go

@@ -22,7 +22,8 @@ import (
 	"k8s.io/kops/upup/pkg/fi"
 
 	"k8s.io/klog"
-	"k8s.io/kubernetes/pkg/util/mount"
+	utilexec "k8s.io/utils/exec"
+	"k8s.io/utils/mount"
 )
 
 // VolumesBuilder maintains the volume mounting
@@ -49,7 +50,7 @@ func (b *VolumesBuilder) Build(c *fi.ModelBuilderContext) error {
 		}
 
 		m := &mount.SafeFormatAndMount{
-			Exec:      mount.NewOsExec(),
+			Exec:      utilexec.New(),
 			Interface: mount.New(""),
 		}
 

vendor/k8s.io/kubernetes/pkg/volume/util/nsenter/BUILD.bazel → protokube/pkg/hostmount/BUILD.bazel

@@ -3,63 +3,60 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = [
-        "nsenter_mount.go",
-        "nsenter_mount_unsupported.go",
+        "nsenter_linux.go",
+        "nsenter_unsupported.go",
     ],
-    importmap = "k8s.io/kops/vendor/k8s.io/kubernetes/pkg/volume/util/nsenter",
-    importpath = "k8s.io/kubernetes/pkg/volume/util/nsenter",
+    importpath = "k8s.io/kops/protokube/pkg/hostmount",
     visibility = ["//visibility:public"],
     deps = select({
         "@io_bazel_rules_go//go/platform:android": [
             "//vendor/k8s.io/klog:go_default_library",
-            "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
             "//vendor/k8s.io/utils/nsenter:go_default_library",
-            "//vendor/k8s.io/utils/path:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:darwin": [
-            "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
             "//vendor/k8s.io/utils/nsenter:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:dragonfly": [
-            "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
             "//vendor/k8s.io/utils/nsenter:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:freebsd": [
-            "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
             "//vendor/k8s.io/utils/nsenter:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:ios": [
-            "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
             "//vendor/k8s.io/utils/nsenter:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:linux": [
             "//vendor/k8s.io/klog:go_default_library",
-            "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
             "//vendor/k8s.io/utils/nsenter:go_default_library",
-            "//vendor/k8s.io/utils/path:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:nacl": [
-            "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
             "//vendor/k8s.io/utils/nsenter:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:netbsd": [
-            "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
             "//vendor/k8s.io/utils/nsenter:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:openbsd": [
-            "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
             "//vendor/k8s.io/utils/nsenter:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:plan9": [
-            "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
             "//vendor/k8s.io/utils/nsenter:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:solaris": [
-            "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
             "//vendor/k8s.io/utils/nsenter:go_default_library",
         ],
         "@io_bazel_rules_go//go/platform:windows": [
-            "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library",
+            "//vendor/k8s.io/utils/mount:go_default_library",
             "//vendor/k8s.io/utils/nsenter:go_default_library",
         ],
         "//conditions:default": [],

protokube/pkg/hostmount/nsenter_linux.go

@@ -0,0 +1,129 @@
+// +build linux
+
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package hostmount
+
+import (
+	"fmt"
+
+	"k8s.io/klog"
+	"k8s.io/utils/mount"
+	"k8s.io/utils/nsenter"
+)
+
+// Based on code from kubernetes/kubernetes: https://github.com/kubernetes/kubernetes/blob/release-1.15/pkg/volume/util/nsenter/nsenter_mount.go
+
+const (
+	// hostProcMountsPath is the default mount path for rootfs
+	hostProcMountsPath = "/rootfs/proc/1/mounts"
+)
+
+func New(ne *nsenter.Nsenter) *Mounter {
+	return &Mounter{ne: ne}
+}
+
+type Mounter struct {
+	ne *nsenter.Nsenter
+}
+
+var _ mount.Interface = &Mounter{}
+
+// List returns a list of all mounted filesystems in the host's mount namespace.
+func (*Mounter) List() ([]mount.MountPoint, error) {
+	return mount.ListProcMounts(hostProcMountsPath)
+}
+
+// Mount runs mount(8) in the host's root mount namespace.  Aside from this
+// aspect, Mount has the same semantics as the mounter returned by mount.New()
+func (n *Mounter) Mount(source string, target string, fstype string, options []string) error {
+	bind, bindOpts, bindRemountOpts := mount.MakeBindOpts(options)
+
+	if bind {
+		err := n.doNsenterMount(source, target, fstype, bindOpts)
+		if err != nil {
+			return err
+		}
+		return n.doNsenterMount(source, target, fstype, bindRemountOpts)
+	}
+
+	return n.doNsenterMount(source, target, fstype, options)
+}
+
+// doNsenterMount nsenters the host's mount namespace and performs the
+// requested mount.
+func (n *Mounter) doNsenterMount(source, target, fstype string, options []string) error {
+	klog.V(5).Infof("nsenter mount %s %s %s %v", source, target, fstype, options)
+	cmd, args := n.makeNsenterArgs(source, target, fstype, options)
+	outputBytes, err := n.ne.Exec(cmd, args).CombinedOutput()
+	if len(outputBytes) != 0 {
+		klog.V(5).Infof("Output of mounting %s to %s: %v", source, target, string(outputBytes))
+	}
+	return err
+}
+
+// makeNsenterArgs makes a list of argument to nsenter in order to do the
+// requested mount.
+func (n *Mounter) makeNsenterArgs(source, target, fstype string, options []string) (string, []string) {
+	mountCmd := n.ne.AbsHostPath("mount")
+	mountArgs := mount.MakeMountArgs(source, target, fstype, options)
+
+	if systemdRunPath, hasSystemd := n.ne.SupportsSystemd(); hasSystemd {
+		// Complete command line:
+		// nsenter --mount=/rootfs/proc/1/ns/mnt -- /bin/systemd-run --description=... --scope -- /bin/mount -t <type> <what> <where>
+		// Expected flow is:
+		// * nsenter breaks out of container's mount namespace and executes
+		//   host's systemd-run.
+		// * systemd-run creates a transient scope (=~ cgroup) and executes its
+		//   argument (/bin/mount) there.
+		// * mount does its job, forks a fuse daemon if necessary and finishes.
+		//   (systemd-run --scope finishes at this point, returning mount's exit
+		//   code and stdout/stderr - thats one of --scope benefits).
+		// * systemd keeps the fuse daemon running in the scope (i.e. in its own
+		//   cgroup) until the fuse daemon dies (another --scope benefit).
+		//   Kubelet container can be restarted and the fuse daemon survives.
+		// * When the daemon dies (e.g. during unmount) systemd removes the
+		//   scope automatically.
+		mountCmd, mountArgs = mount.AddSystemdScope(systemdRunPath, target, mountCmd, mountArgs)
+	}
+
+	// Fall back to simple mount when the host has no systemd:
+	// Complete command line:
+	// nsenter --mount=/rootfs/proc/1/ns/mnt -- /bin/mount -t <type> <what> <where>
+	// Expected flow is:
+	// * nsenter breaks out of container's mount namespace and executes host's /bin/mount.
+	// * mount does its job, forks a fuse daemon if necessary and finishes.
+	// * Any fuse daemon runs in cgroup of kubelet docker container,
+	//   restart of kubelet container will kill it!
+	// No code here, mountCmd and mountArgs use /bin/mount
+
+	return mountCmd, mountArgs
+}
+
+// We deliberately implement only the functions we need, so we don't have to maintain them...
+
+func (n *Mounter) GetMountRefs(pathname string) ([]string, error) {
+	return nil, fmt.Errorf("GetMountRefs not implemented for containerized mounter")
+}
+
+func (mounter *Mounter) IsLikelyNotMountPoint(file string) (bool, error) {
+	return false, fmt.Errorf("IsLikelyNotMountPoint not implemented for containerized mounter")
+}
+
+func (n *Mounter) Unmount(target string) error {
+	return fmt.Errorf("Unmount not implemented for containerized mounter")
+}

protokube/pkg/hostmount/nsenter_unsupported.go

@@ -0,0 +1,61 @@
+// +build !linux
+
+/*
+Copyright 2014 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package hostmount
+
+import (
+	"errors"
+
+	"k8s.io/utils/mount"
+	"k8s.io/utils/nsenter"
+)
+
+func New(ne *nsenter.Nsenter) *Mounter {
+	return &Mounter{}
+}
+
+// Mounter implements mount.Interface for unsupported platforms
+type Mounter struct {
+}
+
+var errUnsupported = errors.New("util/mount on this platform is not supported")
+
+// Mount always returns an error on unsupported platforms
+func (mounter *Mounter) Mount(source string, target string, fstype string, options []string) error {
+	return errUnsupported
+}
+
+// Unmount always returns an error on unsupported platforms
+func (mounter *Mounter) Unmount(target string) error {
+	return errUnsupported
+}
+
+// List always returns an error on unsupported platforms
+func (mounter *Mounter) List() ([]mount.MountPoint, error) {
+	return []mount.MountPoint{}, errUnsupported
+}
+
+// IsLikelyNotMountPoint always returns an error on unsupported platforms
+func (mounter *Mounter) IsLikelyNotMountPoint(file string) (bool, error) {
+	return true, errUnsupported
+}
+
+// GetMountRefs always returns an error on unsupported platforms
+func (mounter *Mounter) GetMountRefs(pathname string) ([]string, error) {
+	return nil, errUnsupported
+}

protokube/pkg/protokube/BUILD.bazel

@@ -19,7 +19,6 @@ go_library(
         "kube_dns.go",
         "labeler.go",
         "models.go",
-        "nsenter_exec.go",
         "openstack_volume.go",
         "rbac.go",
         "tainter.go",
@@ -43,6 +42,7 @@ go_library(
         "//protokube/pkg/gossip/do:go_default_library",
         "//protokube/pkg/gossip/gce:go_default_library",
         "//protokube/pkg/gossip/openstack:go_default_library",
+        "//protokube/pkg/hostmount:go_default_library",
         "//upup/pkg/fi/cloudup/aliup:go_default_library",
         "//upup/pkg/fi/cloudup/awsup:go_default_library",
         "//upup/pkg/fi/cloudup/gce:go_default_library",
@@ -76,9 +76,8 @@ go_library(
         "//vendor/k8s.io/client-go/kubernetes:go_default_library",
         "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
-        "//vendor/k8s.io/kubernetes/pkg/util/mount:go_default_library",
-        "//vendor/k8s.io/kubernetes/pkg/volume/util/nsenter:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
+        "//vendor/k8s.io/utils/mount:go_default_library",
         "//vendor/k8s.io/utils/nsenter:go_default_library",
     ],
 )