From 15d0f5cfd58fab4b78db4ae38b880ff253822513 Mon Sep 17 00:00:00 2001 From: Harry Zhang Date: Tue, 7 Jun 2016 17:24:03 +0800 Subject: [PATCH] Move linedelimiter to it's own pkg Refactoring resource container --- cmd/kube-proxy/app/server.go | 4 ++-- cmd/kubelet/app/server.go | 4 ++-- pkg/kubectl/cmd/cmd_test.go | 4 ++-- pkg/util/{ => resourcecontainer}/resource_container_linux.go | 2 +- .../{ => resourcecontainer}/resource_container_unsupported.go | 2 +- pkg/util/{ => strings}/line_delimiter.go | 2 +- pkg/util/{ => strings}/line_delimiter_test.go | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) rename pkg/util/{ => resourcecontainer}/resource_container_linux.go (98%) rename pkg/util/{ => resourcecontainer}/resource_container_unsupported.go (97%) rename pkg/util/{ => strings}/line_delimiter.go (99%) rename pkg/util/{ => strings}/line_delimiter_test.go (98%) diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index f618c209fd..261181f2ac 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -39,7 +39,6 @@ import ( "k8s.io/kubernetes/pkg/proxy/iptables" "k8s.io/kubernetes/pkg/proxy/userspace" "k8s.io/kubernetes/pkg/types" - "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/configz" utildbus "k8s.io/kubernetes/pkg/util/dbus" "k8s.io/kubernetes/pkg/util/exec" @@ -47,6 +46,7 @@ import ( utilnet "k8s.io/kubernetes/pkg/util/net" nodeutil "k8s.io/kubernetes/pkg/util/node" "k8s.io/kubernetes/pkg/util/oom" + "k8s.io/kubernetes/pkg/util/resourcecontainer" "k8s.io/kubernetes/pkg/util/wait" "github.com/golang/glog" @@ -158,7 +158,7 @@ func NewProxyServerDefault(config *options.ProxyServerConfig) (*ProxyServer, err if config.ResourceContainer != "" { // Run in its own container. - if err := util.RunInResourceContainer(config.ResourceContainer); err != nil { + if err := resourcecontainer.RunInResourceContainer(config.ResourceContainer); err != nil { glog.Warningf("Failed to start in resource-only container %q: %v", config.ResourceContainer, err) } else { glog.V(2).Infof("Running in resource-only container %q", config.ResourceContainer) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index cece862974..b493d9c773 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -62,7 +62,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/network" "k8s.io/kubernetes/pkg/kubelet/server" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" - "k8s.io/kubernetes/pkg/util" utilconfig "k8s.io/kubernetes/pkg/util/config" "k8s.io/kubernetes/pkg/util/configz" "k8s.io/kubernetes/pkg/util/crypto" @@ -71,6 +70,7 @@ import ( "k8s.io/kubernetes/pkg/util/mount" nodeutil "k8s.io/kubernetes/pkg/util/node" "k8s.io/kubernetes/pkg/util/oom" + "k8s.io/kubernetes/pkg/util/resourcecontainer" "k8s.io/kubernetes/pkg/util/runtime" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/version" @@ -688,7 +688,7 @@ func RunKubelet(kcfg *KubeletConfig) error { return fmt.Errorf("failed to create kubelet: %v", err) } - util.ApplyRLimitForSelf(kcfg.MaxOpenFiles) + resourcecontainer.ApplyRLimitForSelf(kcfg.MaxOpenFiles) // TODO(dawnchen): remove this once we deprecated old debian containervm images. // This is a workaround for issue: https://github.com/opencontainers/runc/issues/726 diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go index af5cdad1ee..05b8476eb3 100644 --- a/pkg/kubectl/cmd/cmd_test.go +++ b/pkg/kubectl/cmd/cmd_test.go @@ -41,7 +41,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/serializer" - "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/strings" ) func initTestErrorHandler(t *testing.T) { @@ -801,7 +801,7 @@ func Example_printServiceWithNamespacesAndLabels() { Status: api.ServiceStatus{}, }}, } - ld := util.NewLineDelimiter(os.Stdout, "|") + ld := strings.NewLineDelimiter(os.Stdout, "|") defer ld.Flush() mapper, _ := f.Object(false) diff --git a/pkg/util/resource_container_linux.go b/pkg/util/resourcecontainer/resource_container_linux.go similarity index 98% rename from pkg/util/resource_container_linux.go rename to pkg/util/resourcecontainer/resource_container_linux.go index a844e4c145..6ea75b2eb3 100644 --- a/pkg/util/resource_container_linux.go +++ b/pkg/util/resourcecontainer/resource_container_linux.go @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package util +package resourcecontainer import ( "os" diff --git a/pkg/util/resource_container_unsupported.go b/pkg/util/resourcecontainer/resource_container_unsupported.go similarity index 97% rename from pkg/util/resource_container_unsupported.go rename to pkg/util/resourcecontainer/resource_container_unsupported.go index ba861b0dfe..0bfb79bb59 100644 --- a/pkg/util/resource_container_unsupported.go +++ b/pkg/util/resourcecontainer/resource_container_unsupported.go @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package util +package resourcecontainer import ( "errors" diff --git a/pkg/util/line_delimiter.go b/pkg/util/strings/line_delimiter.go similarity index 99% rename from pkg/util/line_delimiter.go rename to pkg/util/strings/line_delimiter.go index 9f64260c86..56e38302a1 100644 --- a/pkg/util/line_delimiter.go +++ b/pkg/util/strings/line_delimiter.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package util +package strings import ( "bytes" diff --git a/pkg/util/line_delimiter_test.go b/pkg/util/strings/line_delimiter_test.go similarity index 98% rename from pkg/util/line_delimiter_test.go rename to pkg/util/strings/line_delimiter_test.go index a3a036c5c6..15bee165b5 100644 --- a/pkg/util/line_delimiter_test.go +++ b/pkg/util/strings/line_delimiter_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package util +package strings import ( "fmt"