Operator restructure

.gitignore

@@ -1 +1,2 @@
-/machine-approver
+/machine-approver
+*.idea*

Dockerfile

@@ -1,8 +1,12 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
-COPY . /go/src/github.com/openshift/cluster-machine-appover
-RUN cd /go/src/github.com/openshift/cluster-machine-appover && go build -o machine-approver .
+#
+# The standard name for this image is openshift/origin-cluster-machine-approver
+#
+FROM openshift/origin-release:golang-1.10
+COPY . /go/src/github.com/openshift/cluster-machine-approver
+RUN cd /go/src/github.com/openshift/cluster-machine-approver && go build ./cmd/machine-approver
+
+FROM centos:7
+COPY --from=0 /go/src/github.com/openshift/cluster-machine-approver/machine-approver /usr/bin/machine-approver
 
-FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
-COPY --from=builder /go/src/github.com/openshift/cluster-machine-appover/machine-approver /usr/bin/machine-approver
 COPY manifests /manifests
 LABEL io.openshift.release.operator true

cmd/machine-approver/main.go

@@ -0,0 +1,48 @@
+package main
+
+import (
+	goflag "flag"
+	"fmt"
+	"math/rand"
+	"os"
+	"time"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+
+	utilflag "k8s.io/apiserver/pkg/util/flag"
+	"k8s.io/apiserver/pkg/util/logs"
+
+	"github.com/openshift/cluster-machine-approver/pkg/cmd/operator"
+)
+
+func main() {
+	rand.Seed(time.Now().UTC().UnixNano())
+
+	pflag.CommandLine.SetNormalizeFunc(utilflag.WordSepNormalizeFunc)
+	pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
+
+	logs.InitLogs()
+	defer logs.FlushLogs()
+
+	command := NewMachineApproverOperatorCommand()
+	if err := command.Execute(); err != nil {
+		fmt.Fprintf(os.Stderr, "%v\n", err)
+		os.Exit(1)
+	}
+}
+
+func NewMachineApproverOperatorCommand() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "machine-approver",
+		Short: "OpenShift osin OAuth server operator",
+		Run: func(cmd *cobra.Command, args []string) {
+			cmd.Help()
+			os.Exit(1)
+		},
+	}
+
+	cmd.AddCommand(operator.NewOperator())
+
+	return cmd
+}