Workaround flag panic

Add in internal cloud providers for the time being - due to a coupling
upstream on the gce flags

Author: NeilW

hack/main.go.diff

@@ -1,5 +1,5 @@
---- controller-manager.go	2018-08-22 09:31:51.534115225 +0100
-+++ main.go	2018-08-17 15:46:40.860728249 +0100
+--- main.go.orig	2019-04-05 17:32:14.625241793 +0100
++++ main.go	2019-04-05 17:32:38.522397821 +0100
 @@ -1,18 +1,16 @@
 -/*
 -Copyright 2016 The Kubernetes Authors.
@@ -32,31 +32,16 @@
 
  // The external controller manager is responsible for running controller loops that
  // are cloud provider dependent. It uses the API to listen to new events on resources.
-@@ -26,14 +24,13 @@
- 	"os"
- 	"time"
+@@ -28,9 +26,11 @@
+ 	"k8s.io/component-base/logs"
+ 	"k8s.io/kubernetes/cmd/cloud-controller-manager/app"
 
-+	//Pull in the cloud provider
++	// Pull in Brightbox cloud-controller repo
 +	_ "github.com/brightbox/brightbox-cloud-controller-manager/brightbox"
- 	utilflag "k8s.io/apiserver/pkg/util/flag"
- 	"k8s.io/apiserver/pkg/util/logs"
- 	"k8s.io/kubernetes/cmd/cloud-controller-manager/app"
- 	_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
--	// NOTE: Importing all in-tree cloud-providers is not required when
--	// implementing an out-of-tree cloud-provider.
+ 	// NOTE: Importing all in-tree cloud-providers is not required when
+ 	// implementing an out-of-tree cloud-provider.
 -	_ "k8s.io/kubernetes/pkg/cloudprovider/providers"
--	_ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration
-+	_ "k8s.io/kubernetes/pkg/version/prometheus"        // for version metric registration
- 
- 	"github.com/spf13/pflag"
++	// _ "k8s.io/kubernetes/pkg/cloudprovider/providers"
+ 	_ "k8s.io/kubernetes/pkg/util/prometheusclientgo" // load all the prometheus client-go plugins
+ 	_ "k8s.io/kubernetes/pkg/version/prometheus"      // for version metric registration
  )
-@@ -49,6 +46,9 @@
- 	pflag.CommandLine.SetNormalizeFunc(utilflag.WordSepNormalizeFunc)
- 	pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
- 	// utilflag.InitFlags()
-+	// Workaround for this issue:
-+	// https://github.com/kubernetes/kubernetes/issues/17162
-+	goflag.CommandLine.Parse([]string{})
- 	logs.InitLogs()
- 	defer logs.FlushLogs()
- 

main.go

@@ -23,9 +23,14 @@ import (
 	"os"
 	"time"
 
-	_ "github.com/brightbox/brightbox-cloud-controller-manager/brightbox"
 	"k8s.io/component-base/logs"
 	"k8s.io/kubernetes/cmd/cloud-controller-manager/app"
+
+	// Pull in Brightbox cloud-controller repo
+	_ "github.com/brightbox/brightbox-cloud-controller-manager/brightbox"
+	// NOTE: Importing all in-tree cloud-providers is not required when
+	// implementing an out-of-tree cloud-provider.
+	_ "k8s.io/kubernetes/pkg/cloudprovider/providers"
 	_ "k8s.io/kubernetes/pkg/util/prometheusclientgo" // load all the prometheus client-go plugins
 	_ "k8s.io/kubernetes/pkg/version/prometheus"      // for version metric registration
 )
@@ -39,9 +44,6 @@ func main() {
 	// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
 	// normalize func and add the go flag set by hand.
 	// utilflag.InitFlags()
-	// Workaround for this issue:
-	// https://github.com/kubernetes/kubernetes/issues/17162
-	//goflag.CommandLine.Parse([]string{})
 	logs.InitLogs()
 	defer logs.FlushLogs()