fix hyperkube to run from goland. (#1984)

* fix hyperkube to run from goland.

* Explain the magic, comment.

cmd/service-catalog/main.go

@@ -22,6 +22,7 @@ package main
 import (
 	"os"
 
+	"github.com/kubernetes-incubator/service-catalog/cmd/service-catalog/server"
 	"github.com/kubernetes-incubator/service-catalog/pkg/hyperkube"
 )
 
@@ -31,8 +32,8 @@ func main() {
 		Long: "This is an all-in-one binary that can run any of the various Kubernetes service-catalog servers.",
 	}
 
-	hk.AddServer(NewAPIServer())
-	hk.AddServer(NewControllerManager())
+	hk.AddServer(server.NewAPIServer())
+	hk.AddServer(server.NewControllerManager())
 
 	hk.RunToExit(os.Args)
 }

cmd/service-catalog/apiserver.go → cmd/service-catalog/server/apiserver.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package server
 
 import (
 	"github.com/kubernetes-incubator/service-catalog/cmd/apiserver/app/server"

cmd/service-catalog/controller-manager.go → cmd/service-catalog/server/controller-manager.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package server
 
 import (
 	"github.com/kubernetes-incubator/service-catalog/cmd/controller-manager/app"

pkg/hyperkube/hyperkube.go

@@ -126,6 +126,7 @@ func (hk *HyperKube) Printf(format string, i ...interface{}) {
 func (hk *HyperKube) Run(args []string, stopCh <-chan struct{}) error {
 	// If we are called directly, parse all flags up to the first real
 	// argument.  That should be the server to run.
+RunAgain:
 	command := args[0]
 	serverName := path.Base(command)
 	args = args[1:]
@@ -164,6 +165,9 @@ func (hk *HyperKube) Run(args []string, stopCh <-chan struct{}) error {
 
 	s, err := hk.FindServer(serverName)
 	if err != nil {
+		if len(args) > 0 {
+			goto RunAgain // the first args was popped off at start of Run, try again with new args
+		}
 		hk.Printf("Error: %v\n\n", err)
 		hk.Usage()
 		return err