From c0795782e027aad91bb273d5b2fd6829946af529 Mon Sep 17 00:00:00 2001
From: Kenichi Omichi <ken-oomichi@wx.jp.nec.com>
Date: Wed, 14 Oct 2020 17:47:04 +0000
Subject: [PATCH] Move dirExists() to kubelet_test

dirExists() is called from kubelet_test only.
This moves the function to kubelet_test for cleanup.
---
 pkg/kubelet/BUILD           |  1 -
 pkg/kubelet/kubelet_test.go |  9 +++++++++
 pkg/kubelet/util.go         | 30 ------------------------------
 3 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 pkg/kubelet/util.go

diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD
index 437d99d2d70..96db61237c9 100644
--- a/pkg/kubelet/BUILD
+++ b/pkg/kubelet/BUILD
@@ -31,7 +31,6 @@ go_library(
         "runonce.go",
         "runtime.go",
         "time_cache.go",
-        "util.go",
         "volume_host.go",
     ],
     importpath = "k8s.io/kubernetes/pkg/kubelet",
diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go
index 47a5350809d..e08454a254f 100644
--- a/pkg/kubelet/kubelet_test.go
+++ b/pkg/kubelet/kubelet_test.go
@@ -2043,6 +2043,15 @@ func runVolumeManager(kubelet *Kubelet) chan struct{} {
 	return stopCh
 }
 
+// dirExists returns true if the path exists and represents a directory.
+func dirExists(path string) bool {
+	s, err := os.Stat(path)
+	if err != nil {
+		return false
+	}
+	return s.IsDir()
+}
+
 // Sort pods by UID.
 type podsByUID []*v1.Pod
 
diff --git a/pkg/kubelet/util.go b/pkg/kubelet/util.go
deleted file mode 100644
index ca2ea508be5..00000000000
--- a/pkg/kubelet/util.go
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2016 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 kubelet
-
-import (
-	"os"
-)
-
-// dirExists returns true if the path exists and represents a directory.
-func dirExists(path string) bool {
-	s, err := os.Stat(path)
-	if err != nil {
-		return false
-	}
-	return s.IsDir()
-}