From fe000763416f71397c59552114826ebe5dd284cd Mon Sep 17 00:00:00 2001 From: Jose Donizetti Date: Thu, 25 Jul 2019 23:03:04 -0300 Subject: [PATCH] Revert "Fix flag.Parse error logging" --- cmd/minikube/main.go | 5 ---- pkg/initflag/initflag.go | 27 ---------------------- test/integration/addons_test.go | 2 -- test/integration/cluster_dns_test.go | 2 -- test/integration/cluster_env_test.go | 2 -- test/integration/cluster_status_test.go | 2 -- test/integration/flags.go | 4 ---- test/integration/functional_test.go | 2 -- test/integration/mount_test.go | 2 -- test/integration/persistence_test.go | 2 -- test/integration/proxy_test.go | 2 -- test/integration/pv_test.go | 2 -- test/integration/start_stop_delete_test.go | 2 -- test/integration/tunnel_test.go | 2 -- test/integration/version_upgrade_test.go | 2 -- 15 files changed, 60 deletions(-) delete mode 100644 pkg/initflag/initflag.go diff --git a/cmd/minikube/main.go b/cmd/minikube/main.go index 8c7a34bbab..28ffb50052 100644 --- a/cmd/minikube/main.go +++ b/cmd/minikube/main.go @@ -25,11 +25,6 @@ import ( "github.com/golang/glog" "github.com/pkg/profile" - - // initflag must be imported before any other minikube pkg. - // Fix for https://github.com/kubernetes/minikube/issues/4866 - _ "k8s.io/minikube/pkg/initflag" - "k8s.io/minikube/cmd/minikube/cmd" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/machine" diff --git a/pkg/initflag/initflag.go b/pkg/initflag/initflag.go deleted file mode 100644 index a416e2d656..0000000000 --- a/pkg/initflag/initflag.go +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2019 The Kubernetes Authors All rights reserved. - -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 initflag - -import ( - "flag" -) - -func init() { - // Workaround for "ERROR: logging before flag.Parse" - // See: https://github.com/kubernetes/kubernetes/issues/17162 - _ = flag.CommandLine.Parse([]string{}) -} diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go index 33b61f2321..d6ce47b48b 100644 --- a/test/integration/addons_test.go +++ b/test/integration/addons_test.go @@ -31,8 +31,6 @@ import ( "testing" "time" - _ "k8s.io/minikube/pkg/initflag" - "github.com/docker/machine/libmachine/state" retryablehttp "github.com/hashicorp/go-retryablehttp" "k8s.io/apimachinery/pkg/labels" diff --git a/test/integration/cluster_dns_test.go b/test/integration/cluster_dns_test.go index 3f381214c9..229c009d3f 100644 --- a/test/integration/cluster_dns_test.go +++ b/test/integration/cluster_dns_test.go @@ -24,8 +24,6 @@ import ( "testing" "time" - _ "k8s.io/minikube/pkg/initflag" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" pkgutil "k8s.io/minikube/pkg/util" diff --git a/test/integration/cluster_env_test.go b/test/integration/cluster_env_test.go index 6c7c417353..cf1fb101a5 100644 --- a/test/integration/cluster_env_test.go +++ b/test/integration/cluster_env_test.go @@ -24,8 +24,6 @@ import ( "testing" "time" - _ "k8s.io/minikube/pkg/initflag" - "k8s.io/minikube/test/integration/util" ) diff --git a/test/integration/cluster_status_test.go b/test/integration/cluster_status_test.go index c84ba4f9e0..9af4dd98a8 100644 --- a/test/integration/cluster_status_test.go +++ b/test/integration/cluster_status_test.go @@ -23,8 +23,6 @@ import ( "testing" "time" - _ "k8s.io/minikube/pkg/initflag" - api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/minikube/test/integration/util" ) diff --git a/test/integration/flags.go b/test/integration/flags.go index 4dafed04a5..61f68dc382 100644 --- a/test/integration/flags.go +++ b/test/integration/flags.go @@ -22,10 +22,6 @@ import ( "strings" "testing" - // initflag must be imported before any other minikube pkg. - // Fix for https://github.com/kubernetes/minikube/issues/4866 - _ "k8s.io/minikube/pkg/initflag" - "k8s.io/minikube/test/integration/util" ) diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index 48578287ea..5b7d1ba82b 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -22,8 +22,6 @@ import ( "strings" "testing" - _ "k8s.io/minikube/pkg/initflag" - "github.com/docker/machine/libmachine/state" "k8s.io/minikube/test/integration/util" ) diff --git a/test/integration/mount_test.go b/test/integration/mount_test.go index dba9523bcc..d6459eac90 100644 --- a/test/integration/mount_test.go +++ b/test/integration/mount_test.go @@ -29,8 +29,6 @@ import ( "testing" "time" - _ "k8s.io/minikube/pkg/initflag" - "k8s.io/apimachinery/pkg/labels" pkgutil "k8s.io/minikube/pkg/util" "k8s.io/minikube/test/integration/util" diff --git a/test/integration/persistence_test.go b/test/integration/persistence_test.go index 4430d47ca0..8d5dac9227 100644 --- a/test/integration/persistence_test.go +++ b/test/integration/persistence_test.go @@ -24,8 +24,6 @@ import ( "testing" "time" - _ "k8s.io/minikube/pkg/initflag" - "github.com/docker/machine/libmachine/state" "k8s.io/minikube/test/integration/util" ) diff --git a/test/integration/proxy_test.go b/test/integration/proxy_test.go index f838db8490..3241d80b56 100644 --- a/test/integration/proxy_test.go +++ b/test/integration/proxy_test.go @@ -30,8 +30,6 @@ import ( "net/http" "net/url" - _ "k8s.io/minikube/pkg/initflag" - "github.com/elazarl/goproxy" retryablehttp "github.com/hashicorp/go-retryablehttp" "github.com/phayes/freeport" diff --git a/test/integration/pv_test.go b/test/integration/pv_test.go index 9ae450f5df..f648f79db7 100644 --- a/test/integration/pv_test.go +++ b/test/integration/pv_test.go @@ -26,8 +26,6 @@ import ( "github.com/pkg/errors" - _ "k8s.io/minikube/pkg/initflag" - core "k8s.io/api/core/v1" storage "k8s.io/api/storage/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index a387eb41da..5810919359 100644 --- a/test/integration/start_stop_delete_test.go +++ b/test/integration/start_stop_delete_test.go @@ -25,8 +25,6 @@ import ( "testing" "time" - _ "k8s.io/minikube/pkg/initflag" - "github.com/docker/machine/libmachine/state" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/test/integration/util" diff --git a/test/integration/tunnel_test.go b/test/integration/tunnel_test.go index 865b723fd3..c0b2c15ddb 100644 --- a/test/integration/tunnel_test.go +++ b/test/integration/tunnel_test.go @@ -28,8 +28,6 @@ import ( "testing" "time" - _ "k8s.io/minikube/pkg/initflag" - "k8s.io/apimachinery/pkg/util/wait" "github.com/pkg/errors" diff --git a/test/integration/version_upgrade_test.go b/test/integration/version_upgrade_test.go index e17c58f59e..8b92f259cd 100644 --- a/test/integration/version_upgrade_test.go +++ b/test/integration/version_upgrade_test.go @@ -25,8 +25,6 @@ import ( "strings" "testing" - _ "k8s.io/minikube/pkg/initflag" - "github.com/docker/machine/libmachine/state" retryablehttp "github.com/hashicorp/go-retryablehttp" "github.com/pkg/errors"