Merge pull request #73 from aveshagarwal/master-rebase-kube-1-9

Rebase to kube 1 9
kubernetes-sigs · Jan 9, 2018 · d3c2f25 · d3c2f25
2 parents 7df543d + e858c9e
commit d3c2f25
Show file tree

Hide file tree

Showing 16,627 changed files with 1,917,870 additions and 1,586,819 deletions.
diff --git a/cmd/descheduler/app/options/options.go b/cmd/descheduler/app/options/options.go
@@ -18,7 +18,7 @@ limitations under the License.
 package options
 
 import (
-	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
+	clientset "k8s.io/client-go/kubernetes"
 
 	// install the componentconfig api so we get its defaulting and conversion functions
 	"github.com/kubernetes-incubator/descheduler/pkg/apis/componentconfig"

diff --git a/cmd/descheduler/descheduler.go b/cmd/descheduler/descheduler.go
@@ -17,15 +17,18 @@ limitations under the License.
 package main
 
 import (
+	"flag"
 	"fmt"
-	"github.com/kubernetes-incubator/descheduler/cmd/descheduler/app"
 	"os"
+
+	"github.com/kubernetes-incubator/descheduler/cmd/descheduler/app"
 )
 
 func main() {
 	out := os.Stdout
 	cmd := app.NewDeschedulerCommand(out)
 	cmd.AddCommand(app.NewVersionCommand())
+	flag.CommandLine.Parse([]string{})
 	if err := cmd.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)