remove openshift infra command

cmd/openshift-diagnostics/main.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	"math/rand"
+	"os"
+	"runtime"
+	"time"
+
+	"k8s.io/apiserver/pkg/util/logs"
+
+	"github.com/openshift/origin/pkg/cmd/util/serviceability"
+	"github.com/openshift/origin/pkg/oc/admin/diagnostics"
+	"github.com/spf13/cobra"
+
+	// install all APIs
+	_ "github.com/openshift/origin/pkg/api/install"
+	_ "k8s.io/kubernetes/pkg/api/install"
+	_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
+	_ "k8s.io/kubernetes/pkg/apis/batch/install"
+	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
+)
+
+func main() {
+	logs.InitLogs()
+	defer logs.FlushLogs()
+	defer serviceability.BehaviorOnPanic(os.Getenv("OPENSHIFT_ON_PANIC"))()
+	defer serviceability.Profile(os.Getenv("OPENSHIFT_PROFILE")).Stop()
+
+	rand.Seed(time.Now().UTC().UnixNano())
+	if len(os.Getenv("GOMAXPROCS")) == 0 {
+		runtime.GOMAXPROCS(runtime.NumCPU())
+	}
+
+	cmd := &cobra.Command{
+		Use:   "openshift-diagnostics",
+		Short: "Diagnose OpenShift clusters",
+	}
+	cmd.AddCommand(
+		diagnostics.NewCommandPodDiagnostics("diagnostic-pod", os.Stdout),
+		diagnostics.NewCommandNetworkPodDiagnostics("network-diagnostic-pod", os.Stdout),
+	)
+
+	if err := cmd.Execute(); err != nil {
+		os.Exit(1)
+	}
+}

hack/lib/constants.sh

@@ -43,6 +43,7 @@ readonly OS_CROSS_COMPILE_TARGETS=(
   cmd/openshift
   cmd/oc
   cmd/kubefed
+  cmd/openshift-diagnostics
   cmd/template-service-broker
   vendor/k8s.io/kubernetes/cmd/hyperkube
 )

pkg/cmd/openshift/openshift.go

@@ -106,25 +106,6 @@ func NewCommandOpenShift(name string) *cobra.Command {
 	root.AddCommand(newExperimentalCommand("ex", name+" ex"))
 	root.AddCommand(newCompletionCommand("completion", name+" completion"))
 	root.AddCommand(cmd.NewCmdVersion(name, f, out, cmd.VersionOptions{PrintEtcdVersion: true, IsServer: true}))
-
-	// infra commands are those that are bundled with the binary but not displayed to end users
-	// directly
-	infra := &cobra.Command{
-		Use: "infra", // Because this command exposes no description, it will not be shown in help
-	}
-
-	infra.AddCommand(
-		irouter.NewCommandTemplateRouter("router"),
-		irouter.NewCommandF5Router("f5-router"),
-		deployer.NewCommandDeployer("deploy"),
-		recycle.NewCommandRecycle("recycle", out),
-		builder.NewCommandS2IBuilder("sti-build"),
-		builder.NewCommandDockerBuilder("docker-build"),
-		diagnostics.NewCommandPodDiagnostics("diagnostic-pod", out),
-		diagnostics.NewCommandNetworkPodDiagnostics("network-diagnostic-pod", out),
-	)
-	root.AddCommand(infra)
-
 	root.AddCommand(cmd.NewCmdOptions(out))
 
 	// TODO: add groups