MFOJTIK: move openshift start etcd to avoid dep from hypershift

openshift · Jun 18, 2018 · 3dd4f26 · 3dd4f26
1 parent 6678a48
commit 3dd4f26
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/cmd/hypershift/main.go b/cmd/hypershift/main.go
@@ -17,9 +17,9 @@ import (
 	"github.com/openshift/library-go/pkg/serviceability"
 	"github.com/openshift/origin/pkg/cmd/openshift-apiserver"
 	"github.com/openshift/origin/pkg/cmd/openshift-controller-manager"
+	"github.com/openshift/origin/pkg/cmd/openshift-etcd"
 	"github.com/openshift/origin/pkg/cmd/openshift-experimental"
 	"github.com/openshift/origin/pkg/cmd/openshift-kube-apiserver"
-	"github.com/openshift/origin/pkg/cmd/server/start"
 	"github.com/openshift/origin/pkg/version"
 )
 
@@ -55,7 +55,7 @@ func NewHyperShiftCommand() *cobra.Command {
 		},
 	}
 
-	startEtcd, _ := start.NewCommandStartEtcdServer(start.RecommendedStartEtcdServerName, "hypershift", os.Stdout, os.Stderr)
+	startEtcd, _ := openshift_etcd.NewCommandStartEtcdServer(openshift_etcd.RecommendedStartEtcdServerName, "hypershift", os.Stdout, os.Stderr)
 	startEtcd.Deprecated = "will be removed in 3.10"
 	startEtcd.Hidden = true
 	cmd.AddCommand(startEtcd)

diff --git a/pkg/cmd/server/start/start_etcd.go → pkg/cmd/openshift-etcd/start_etcd.go b/pkg/cmd/server/start/start_etcd.go → pkg/cmd/openshift-etcd/start_etcd.go
@@ -1,4 +1,4 @@
-package start
+package openshift_etcd
 
 import (
 	"errors"

diff --git a/pkg/cmd/server/start/start_allinone.go b/pkg/cmd/server/start/start_allinone.go
@@ -22,6 +22,7 @@ import (
 	"k8s.io/kubernetes/pkg/master/ports"
 
 	"github.com/openshift/library-go/pkg/crypto"
+	"github.com/openshift/origin/pkg/cmd/openshift-etcd"
 	"github.com/openshift/origin/pkg/cmd/server/admin"
 	configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
 	"github.com/openshift/origin/pkg/cmd/server/origin"
@@ -122,7 +123,7 @@ func NewCommandStartAllInOne(basename string, out, errout io.Writer, stopCh <-ch
 	startMaster, _ := NewCommandStartMaster(basename, out, errout)
 	startNode, _ := NewCommandStartNode(basename, out, errout, stopCh)
 	startNodeNetwork, _ := NewCommandStartNetwork(basename, out, errout)
-	startEtcdServer, _ := NewCommandStartEtcdServer(RecommendedStartEtcdServerName, basename, out, errout)
+	startEtcdServer, _ := openshift_etcd.NewCommandStartEtcdServer(RecommendedStartEtcdServerName, basename, out, errout)
 	startTSBServer := tsbcmd.NewCommandStartTemplateServiceBrokerServer(out, errout, wait.NeverStop)
 	cmds.AddCommand(startMaster)
 	cmds.AddCommand(startNode)