From b1012b2543a46edc3d9f1f8fb8e479b4fa489c71 Mon Sep 17 00:00:00 2001 From: Tim Allclair Date: Mon, 9 Jul 2018 13:35:46 -0700 Subject: [PATCH] Remove unused io util writer & volume host GetWriter() --- cmd/kubelet/app/BUILD | 1 - cmd/kubelet/app/server.go | 4 - pkg/controller/volume/attachdetach/BUILD | 1 - .../attachdetach/attach_detach_controller.go | 5 -- pkg/controller/volume/expand/BUILD | 1 - .../volume/expand/expand_controller.go | 5 -- pkg/controller/volume/persistentvolume/BUILD | 1 - .../volume/persistentvolume/volume_host.go | 5 -- pkg/kubelet/BUILD | 1 - pkg/kubelet/kubelet.go | 6 -- pkg/kubelet/volume_host.go | 5 -- pkg/kubemark/BUILD | 1 - pkg/kubemark/hollow_kubelet.go | 2 - pkg/util/io/BUILD | 9 +- pkg/util/io/writer.go | 87 ------------------- pkg/volume/BUILD | 1 - pkg/volume/configmap/BUILD | 1 - pkg/volume/configmap/configmap.go | 4 - pkg/volume/plugins.go | 4 - pkg/volume/secret/BUILD | 1 - pkg/volume/secret/secret.go | 4 - pkg/volume/testing/BUILD | 1 - pkg/volume/testing/testing.go | 7 -- 23 files changed, 1 insertion(+), 156 deletions(-) delete mode 100644 pkg/util/io/writer.go diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD index 3424c9bfb4c10..c0857155d36d6 100644 --- a/cmd/kubelet/app/BUILD +++ b/cmd/kubelet/app/BUILD @@ -62,7 +62,6 @@ go_library( "//pkg/util/filesystem:go_default_library", "//pkg/util/flag:go_default_library", "//pkg/util/flock:go_default_library", - "//pkg/util/io:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/util/node:go_default_library", "//pkg/util/nsenter:go_default_library", diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 09513772e45be..18f7691124037 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -87,7 +87,6 @@ import ( utilfs "k8s.io/kubernetes/pkg/util/filesystem" utilflag "k8s.io/kubernetes/pkg/util/flag" "k8s.io/kubernetes/pkg/util/flock" - kubeio "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/util/mount" nodeutil "k8s.io/kubernetes/pkg/util/node" "k8s.io/kubernetes/pkg/util/nsenter" @@ -359,7 +358,6 @@ func UnsecuredDependencies(s *options.KubeletServer) (*kubelet.Dependencies, err } mounter := mount.New(s.ExperimentalMounterPath) - var writer kubeio.Writer = &kubeio.StdWriter{} var pluginRunner = exec.New() if s.Containerized { glog.V(2).Info("Running kubelet in containerized mode") @@ -368,7 +366,6 @@ func UnsecuredDependencies(s *options.KubeletServer) (*kubelet.Dependencies, err return nil, err } mounter = mount.NewNsenterMounter(s.RootDirectory, ne) - writer = kubeio.NewNsenterWriter(ne) // an exec interface which can use nsenter for flex plugin calls pluginRunner = nsenter.NewNsenterExecutor(nsenter.DefaultHostRootFsPath, exec.New()) } @@ -395,7 +392,6 @@ func UnsecuredDependencies(s *options.KubeletServer) (*kubelet.Dependencies, err Mounter: mounter, OOMAdjuster: oom.NewOOMAdjuster(), OSInterface: kubecontainer.RealOS{}, - Writer: writer, VolumePlugins: ProbeVolumePlugins(), DynamicPluginProber: GetDynamicPluginProber(s.VolumePluginDir, pluginRunner), TLSOptions: tlsOptions}, nil diff --git a/pkg/controller/volume/attachdetach/BUILD b/pkg/controller/volume/attachdetach/BUILD index 13dbe301cabfd..81ab013258770 100644 --- a/pkg/controller/volume/attachdetach/BUILD +++ b/pkg/controller/volume/attachdetach/BUILD @@ -19,7 +19,6 @@ go_library( "//pkg/controller/volume/attachdetach/reconciler:go_default_library", "//pkg/controller/volume/attachdetach/statusupdater:go_default_library", "//pkg/controller/volume/attachdetach/util:go_default_library", - "//pkg/util/io:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", diff --git a/pkg/controller/volume/attachdetach/attach_detach_controller.go b/pkg/controller/volume/attachdetach/attach_detach_controller.go index 1847d2a2f3930..b108057338af0 100644 --- a/pkg/controller/volume/attachdetach/attach_detach_controller.go +++ b/pkg/controller/volume/attachdetach/attach_detach_controller.go @@ -44,7 +44,6 @@ import ( "k8s.io/kubernetes/pkg/controller/volume/attachdetach/reconciler" "k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater" "k8s.io/kubernetes/pkg/controller/volume/attachdetach/util" - "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" volumeutil "k8s.io/kubernetes/pkg/volume/util" @@ -561,10 +560,6 @@ func (adc *attachDetachController) GetMounter(pluginName string) mount.Interface return nil } -func (adc *attachDetachController) GetWriter() io.Writer { - return nil -} - func (adc *attachDetachController) GetHostName() string { return "" } diff --git a/pkg/controller/volume/expand/BUILD b/pkg/controller/volume/expand/BUILD index 3302472990a15..d475dbc65d77f 100644 --- a/pkg/controller/volume/expand/BUILD +++ b/pkg/controller/volume/expand/BUILD @@ -18,7 +18,6 @@ go_library( "//pkg/controller:go_default_library", "//pkg/controller/volume/expand/cache:go_default_library", "//pkg/util/goroutinemap/exponentialbackoff:go_default_library", - "//pkg/util/io:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", diff --git a/pkg/controller/volume/expand/expand_controller.go b/pkg/controller/volume/expand/expand_controller.go index 9a8e8d3797800..a878d115f935f 100644 --- a/pkg/controller/volume/expand/expand_controller.go +++ b/pkg/controller/volume/expand/expand_controller.go @@ -40,7 +40,6 @@ import ( "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/volume/expand/cache" - "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util/operationexecutor" @@ -268,10 +267,6 @@ func (expc *expandController) GetExec(pluginName string) mount.Exec { return mount.NewOsExec() } -func (expc *expandController) GetWriter() io.Writer { - return nil -} - func (expc *expandController) GetHostName() string { return "" } diff --git a/pkg/controller/volume/persistentvolume/BUILD b/pkg/controller/volume/persistentvolume/BUILD index 2506b537066fa..dd80246dcd3b2 100644 --- a/pkg/controller/volume/persistentvolume/BUILD +++ b/pkg/controller/volume/persistentvolume/BUILD @@ -28,7 +28,6 @@ go_library( "//pkg/features:go_default_library", "//pkg/util/goroutinemap:go_default_library", "//pkg/util/goroutinemap/exponentialbackoff:go_default_library", - "//pkg/util/io:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", diff --git a/pkg/controller/volume/persistentvolume/volume_host.go b/pkg/controller/volume/persistentvolume/volume_host.go index 7fa54790c625b..74adf6d7a7d5d 100644 --- a/pkg/controller/volume/persistentvolume/volume_host.go +++ b/pkg/controller/volume/persistentvolume/volume_host.go @@ -26,7 +26,6 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/cloudprovider" - "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/util/mount" vol "k8s.io/kubernetes/pkg/volume" ) @@ -79,10 +78,6 @@ func (ctrl *PersistentVolumeController) GetMounter(pluginName string) mount.Inte return nil } -func (ctrl *PersistentVolumeController) GetWriter() io.Writer { - return nil -} - func (ctrl *PersistentVolumeController) GetHostName() string { return "" } diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index d2bc991bc89dd..914fccb036fe6 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -97,7 +97,6 @@ go_library( "//pkg/securitycontext:go_default_library", "//pkg/util/dbus:go_default_library", "//pkg/util/file:go_default_library", - "//pkg/util/io:go_default_library", "//pkg/util/iptables:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/util/node:go_default_library", diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 509b80d34ee6f..8f682ac10e496 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -102,7 +102,6 @@ import ( "k8s.io/kubernetes/pkg/security/apparmor" sysctlwhitelist "k8s.io/kubernetes/pkg/security/podsecuritypolicy/sysctl" utildbus "k8s.io/kubernetes/pkg/util/dbus" - kubeio "k8s.io/kubernetes/pkg/util/io" utilipt "k8s.io/kubernetes/pkg/util/iptables" "k8s.io/kubernetes/pkg/util/mount" nodeutil "k8s.io/kubernetes/pkg/util/node" @@ -247,7 +246,6 @@ type Dependencies struct { OSInterface kubecontainer.OSInterface PodConfig *config.PodConfig Recorder record.EventRecorder - Writer kubeio.Writer VolumePlugins []volume.VolumePlugin DynamicPluginProber volume.DynamicPluginProber TLSOptions *server.TLSOptions @@ -522,7 +520,6 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, cgroupsPerQOS: kubeCfg.CgroupsPerQOS, cgroupRoot: kubeCfg.CgroupRoot, mounter: kubeDeps.Mounter, - writer: kubeDeps.Writer, maxPods: int(kubeCfg.MaxPods), podsPerCore: int(kubeCfg.PodsPerCore), syncLoopMonitor: atomic.Value{}, @@ -1062,9 +1059,6 @@ type Kubelet struct { // Mounter to use for volumes. mounter mount.Interface - // Writer interface to use for volumes. - writer kubeio.Writer - // Manager of non-Runtime containers. containerManager cm.ContainerManager diff --git a/pkg/kubelet/volume_host.go b/pkg/kubelet/volume_host.go index 1d8bfcc9f6845..06820bdeaea1e 100644 --- a/pkg/kubelet/volume_host.go +++ b/pkg/kubelet/volume_host.go @@ -36,7 +36,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/mountpod" "k8s.io/kubernetes/pkg/kubelet/secret" "k8s.io/kubernetes/pkg/kubelet/token" - "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/util" @@ -168,10 +167,6 @@ func (kvh *kubeletVolumeHost) GetMounter(pluginName string) mount.Interface { return mount.NewExecMounter(exec, kvh.kubelet.mounter) } -func (kvh *kubeletVolumeHost) GetWriter() io.Writer { - return kvh.kubelet.writer -} - func (kvh *kubeletVolumeHost) GetHostName() string { return kvh.kubelet.hostname } diff --git a/pkg/kubemark/BUILD b/pkg/kubemark/BUILD index 9484dab2c6b49..2c862030c231d 100644 --- a/pkg/kubemark/BUILD +++ b/pkg/kubemark/BUILD @@ -30,7 +30,6 @@ go_library( "//pkg/proxy:go_default_library", "//pkg/proxy/config:go_default_library", "//pkg/proxy/iptables:go_default_library", - "//pkg/util/io:go_default_library", "//pkg/util/iptables:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/util/node:go_default_library", diff --git a/pkg/kubemark/hollow_kubelet.go b/pkg/kubemark/hollow_kubelet.go index 8e79abed32cc3..a7ea23644750a 100644 --- a/pkg/kubemark/hollow_kubelet.go +++ b/pkg/kubemark/hollow_kubelet.go @@ -30,7 +30,6 @@ import ( containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/dockershim" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" - kubeio "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/oom" "k8s.io/kubernetes/pkg/volume/empty_dir" @@ -76,7 +75,6 @@ func NewHollowKubelet( VolumePlugins: volumePlugins, TLSOptions: nil, OOMAdjuster: oom.NewFakeOOMAdjuster(), - Writer: &kubeio.StdWriter{}, Mounter: mount.New("" /* default mount path */), } diff --git a/pkg/util/io/BUILD b/pkg/util/io/BUILD index 93de0dcba4401..92e8f2ae78578 100644 --- a/pkg/util/io/BUILD +++ b/pkg/util/io/BUILD @@ -7,15 +7,8 @@ load( go_library( name = "go_default_library", - srcs = [ - "consistentread.go", - "writer.go", - ], + srcs = ["consistentread.go"], importpath = "k8s.io/kubernetes/pkg/util/io", - deps = [ - "//pkg/util/nsenter:go_default_library", - "//vendor/github.com/golang/glog:go_default_library", - ], ) filegroup( diff --git a/pkg/util/io/writer.go b/pkg/util/io/writer.go deleted file mode 100644 index 7c457d04a7d7e..0000000000000 --- a/pkg/util/io/writer.go +++ /dev/null @@ -1,87 +0,0 @@ -/* -Copyright 2015 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 io - -import ( - "bytes" - "fmt" - "io/ioutil" - "os" - - "k8s.io/kubernetes/pkg/util/nsenter" - - "github.com/golang/glog" -) - -// Writer is an interface which allows to write data to a file. -type Writer interface { - // WriteFile mimics ioutil.WriteFile. - WriteFile(filename string, data []byte, perm os.FileMode) error -} - -// StdWriter implements Writer interface and uses standard libraries -// for writing data to files. -type StdWriter struct { -} - -// WriteFile directly calls ioutil.WriteFile. -func (writer *StdWriter) WriteFile(filename string, data []byte, perm os.FileMode) error { - return ioutil.WriteFile(filename, data, perm) -} - -// NsenterWriter is implementation of Writer interface that allows writing data -// to file using nsenter command. -// If a program (e.g. kubelet) runs in a container it may want to write data to -// a mounted device. Since in Docker, mount propagation mode is set to private, -// it will not see the mounted device in its own namespace. To work around this -// limitation one has to first enter hosts namespace (by using 'nsenter') and -// only then write data. -type NsenterWriter struct { - ne *nsenter.Nsenter -} - -// NewNsenterWriter creates a new Writer that allows writing data to file using -// nsenter command. -func NewNsenterWriter(ne *nsenter.Nsenter) *NsenterWriter { - return &NsenterWriter{ - ne: ne, - } -} - -// WriteFile calls 'nsenter cat - > ' and 'nsenter chmod' to create a -// file on the host. -func (writer *NsenterWriter) WriteFile(filename string, data []byte, perm os.FileMode) error { - echoArgs := []string{"-c", fmt.Sprintf("cat > %s", filename)} - glog.V(5).Infof("nsenter: write data to file %s by nsenter", filename) - command := writer.ne.Exec("sh", echoArgs) - command.SetStdin(bytes.NewBuffer(data)) - outputBytes, err := command.CombinedOutput() - if err != nil { - glog.Errorf("Output from writing to %q: %v", filename, string(outputBytes)) - return err - } - - chmodArgs := []string{fmt.Sprintf("%o", perm), filename} - glog.V(5).Infof("nsenter: change permissions of file %s to %s", filename, chmodArgs[0]) - outputBytes, err = writer.ne.Exec("chmod", chmodArgs).CombinedOutput() - if err != nil { - glog.Errorf("Output from chmod command: %v", string(outputBytes)) - return err - } - - return nil -} diff --git a/pkg/volume/BUILD b/pkg/volume/BUILD index 646a2c3d13190..778cffc85399c 100644 --- a/pkg/volume/BUILD +++ b/pkg/volume/BUILD @@ -18,7 +18,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/cloudprovider:go_default_library", - "//pkg/util/io:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/volume/util/fs:go_default_library", "//pkg/volume/util/recyclerclient:go_default_library", diff --git a/pkg/volume/configmap/BUILD b/pkg/volume/configmap/BUILD index abe5f0a9550c3..a6b4e871f7d70 100644 --- a/pkg/volume/configmap/BUILD +++ b/pkg/volume/configmap/BUILD @@ -14,7 +14,6 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/volume/configmap", deps = [ - "//pkg/util/io:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", diff --git a/pkg/volume/configmap/configmap.go b/pkg/volume/configmap/configmap.go index 2f108bb72cd16..897355af5c9e7 100644 --- a/pkg/volume/configmap/configmap.go +++ b/pkg/volume/configmap/configmap.go @@ -24,7 +24,6 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - ioutil "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" @@ -93,7 +92,6 @@ func (plugin *configMapPlugin) NewMounter(spec *volume.Spec, pod *v1.Pod, opts v pod.UID, plugin, plugin.host.GetMounter(plugin.GetPluginName()), - plugin.host.GetWriter(), volume.MetricsNil{}, }, source: *spec.Volume.ConfigMap, @@ -110,7 +108,6 @@ func (plugin *configMapPlugin) NewUnmounter(volName string, podUID types.UID) (v podUID, plugin, plugin.host.GetMounter(plugin.GetPluginName()), - plugin.host.GetWriter(), volume.MetricsNil{}, }, }, nil @@ -131,7 +128,6 @@ type configMapVolume struct { podUID types.UID plugin *configMapPlugin mounter mount.Interface - writer ioutil.Writer volume.MetricsNil } diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go index b34c7c3e6ea35..e2c7e05bb17c1 100644 --- a/pkg/volume/plugins.go +++ b/pkg/volume/plugins.go @@ -33,7 +33,6 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/cloudprovider" - "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume/util/recyclerclient" ) @@ -319,9 +318,6 @@ type VolumeHost interface { // Get mounter interface. GetMounter(pluginName string) mount.Interface - // Get writer interface for writing data to disk. - GetWriter() io.Writer - // Returns the hostname of the host kubelet is running on GetHostName() string diff --git a/pkg/volume/secret/BUILD b/pkg/volume/secret/BUILD index dcd44ade0f5bb..a23307dfa7c11 100644 --- a/pkg/volume/secret/BUILD +++ b/pkg/volume/secret/BUILD @@ -14,7 +14,6 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/volume/secret", deps = [ - "//pkg/util/io:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", diff --git a/pkg/volume/secret/secret.go b/pkg/volume/secret/secret.go index 3ab27c77c424a..dda1eec335bab 100644 --- a/pkg/volume/secret/secret.go +++ b/pkg/volume/secret/secret.go @@ -24,7 +24,6 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - ioutil "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" @@ -100,7 +99,6 @@ func (plugin *secretPlugin) NewMounter(spec *volume.Spec, pod *v1.Pod, opts volu pod.UID, plugin, plugin.host.GetMounter(plugin.GetPluginName()), - plugin.host.GetWriter(), volume.NewCachedMetrics(volume.NewMetricsDu(getPath(pod.UID, spec.Name(), plugin.host))), }, source: *spec.Volume.Secret, @@ -117,7 +115,6 @@ func (plugin *secretPlugin) NewUnmounter(volName string, podUID types.UID) (volu podUID, plugin, plugin.host.GetMounter(plugin.GetPluginName()), - plugin.host.GetWriter(), volume.NewCachedMetrics(volume.NewMetricsDu(getPath(podUID, volName, plugin.host))), }, }, nil @@ -140,7 +137,6 @@ type secretVolume struct { podUID types.UID plugin *secretPlugin mounter mount.Interface - writer ioutil.Writer volume.MetricsProvider } diff --git a/pkg/volume/testing/BUILD b/pkg/volume/testing/BUILD index 8f6e8d71398b4..5cbf2e57da75d 100644 --- a/pkg/volume/testing/BUILD +++ b/pkg/volume/testing/BUILD @@ -14,7 +14,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/volume/testing", deps = [ "//pkg/cloudprovider:go_default_library", - "//pkg/util/io:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", diff --git a/pkg/volume/testing/testing.go b/pkg/volume/testing/testing.go index 9192dd0e99bd5..c102e551957b3 100644 --- a/pkg/volume/testing/testing.go +++ b/pkg/volume/testing/testing.go @@ -37,7 +37,6 @@ import ( "k8s.io/client-go/tools/record" utiltesting "k8s.io/client-go/util/testing" "k8s.io/kubernetes/pkg/cloudprovider" - "k8s.io/kubernetes/pkg/util/io" "k8s.io/kubernetes/pkg/util/mount" utilstrings "k8s.io/kubernetes/pkg/util/strings" . "k8s.io/kubernetes/pkg/volume" @@ -54,7 +53,6 @@ type fakeVolumeHost struct { cloud cloudprovider.Interface mounter mount.Interface exec mount.Exec - writer io.Writer nodeLabels map[string]string nodeName string } @@ -82,7 +80,6 @@ func NewFakeVolumeHostWithNodeName(rootDir string, kubeClient clientset.Interfac func newFakeVolumeHost(rootDir string, kubeClient clientset.Interface, plugins []VolumePlugin, cloud cloudprovider.Interface) *fakeVolumeHost { host := &fakeVolumeHost{rootDir: rootDir, kubeClient: kubeClient, cloud: cloud} host.mounter = &mount.FakeMounter{} - host.writer = &io.StdWriter{} host.exec = mount.NewFakeExec(nil) host.pluginMgr.InitPlugins(plugins, nil /* prober */, host) return host @@ -124,10 +121,6 @@ func (f *fakeVolumeHost) GetMounter(pluginName string) mount.Interface { return f.mounter } -func (f *fakeVolumeHost) GetWriter() io.Writer { - return f.writer -} - func (f *fakeVolumeHost) NewWrapperMounter(volName string, spec Spec, pod *v1.Pod, opts VolumeOptions) (Mounter, error) { // The name of wrapper volume is set to "wrapped_{wrapped_volume_name}" wrapperVolumeName := "wrapped_" + volName