move admin template cmds -> pkg/oc/admin

openshift · Nov 30, 2017 · 41e9a84 · 41e9a84
1 parent 6bb3e85
commit 41e9a84
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/pkg/oc/admin/admin.go b/pkg/oc/admin/admin.go
@@ -108,12 +108,12 @@ func NewCommandAdmin(name, fullName string, in io.Reader, out io.Writer, errout
 				admin.NewCommandCreateKubeConfig(admin.CreateKubeConfigCommandName, fullName+" "+admin.CreateKubeConfigCommandName, out),
 				admin.NewCommandCreateClient(admin.CreateClientCommandName, fullName+" "+admin.CreateClientCommandName, out),
 
-				admin.NewCommandCreateBootstrapProjectTemplate(f, admin.CreateBootstrapProjectTemplateCommand, fullName+" "+admin.CreateBootstrapProjectTemplateCommand, out),
+				NewCommandCreateBootstrapProjectTemplate(f, CreateBootstrapProjectTemplateCommand, fullName+" "+CreateBootstrapProjectTemplateCommand, out),
 				admin.NewCommandCreateBootstrapPolicyFile(admin.CreateBootstrapPolicyFileCommand, fullName+" "+admin.CreateBootstrapPolicyFileCommand, out),
 
-				admin.NewCommandCreateLoginTemplate(f, admin.CreateLoginTemplateCommand, fullName+" "+admin.CreateLoginTemplateCommand, out),
-				admin.NewCommandCreateProviderSelectionTemplate(f, admin.CreateProviderSelectionTemplateCommand, fullName+" "+admin.CreateProviderSelectionTemplateCommand, out),
-				admin.NewCommandCreateErrorTemplate(f, admin.CreateErrorTemplateCommand, fullName+" "+admin.CreateErrorTemplateCommand, out),
+				NewCommandCreateLoginTemplate(f, CreateLoginTemplateCommand, fullName+" "+CreateLoginTemplateCommand, out),
+				NewCommandCreateProviderSelectionTemplate(f, CreateProviderSelectionTemplateCommand, fullName+" "+CreateProviderSelectionTemplateCommand, out),
+				NewCommandCreateErrorTemplate(f, CreateErrorTemplateCommand, fullName+" "+CreateErrorTemplateCommand, out),
 			},
 		},
 	}

diff --git a/...dmin/create_bootstrap_project_template.go → ...dmin/create_bootstrap_project_template.go b/...dmin/create_bootstrap_project_template.go → ...dmin/create_bootstrap_project_template.go
diff --git a/...cmd/server/admin/create_error_template.go → pkg/oc/admin/create_error_template.go b/...cmd/server/admin/create_error_template.go → pkg/oc/admin/create_error_template.go
diff --git a/...cmd/server/admin/create_login_template.go → pkg/oc/admin/create_login_template.go b/...cmd/server/admin/create_login_template.go → pkg/oc/admin/create_login_template.go
diff --git a/...min/create_provider_selection_template.go → ...min/create_provider_selection_template.go b/...min/create_provider_selection_template.go → ...min/create_provider_selection_template.go
diff --git a/pkg/oc/experimental/ipfailover/ipfailover.go b/pkg/oc/experimental/ipfailover/ipfailover.go
@@ -19,9 +19,9 @@ import (
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/variable"
 	configcmd "github.com/openshift/origin/pkg/config/cmd"
-	"github.com/openshift/origin/pkg/ipfailover"
-	"github.com/openshift/origin/pkg/ipfailover/keepalived"
 	"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
+	"github.com/openshift/origin/pkg/oc/experimental/ipfailover/ipfailover"
+	"github.com/openshift/origin/pkg/oc/experimental/ipfailover/keepalived"
 	securityclient "github.com/openshift/origin/pkg/security/generated/internalclientset"
 )
 

diff --git a/pkg/oc/experimental/ipfailover/keepalived/generator.go b/pkg/oc/experimental/ipfailover/keepalived/generator.go
@@ -9,7 +9,7 @@ import (
 
 	dapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	"github.com/openshift/origin/pkg/generate/app"
-	"github.com/openshift/origin/pkg/ipfailover"
+	"github.com/openshift/origin/pkg/oc/experimental/ipfailover/ipfailover"
 )
 
 const defaultInterface = "eth0"

diff --git a/pkg/oc/experimental/ipfailover/keepalived/generator_test.go b/pkg/oc/experimental/ipfailover/keepalived/generator_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/openshift/origin/pkg/cmd/util/variable"
 	"github.com/openshift/origin/pkg/generate/app"
-	"github.com/openshift/origin/pkg/ipfailover"
+	"github.com/openshift/origin/pkg/oc/experimental/ipfailover/ipfailover"
 )
 
 func makeIPFailoverConfigOptions(selector string, replicas int32, serviceAccount string) *ipfailover.IPFailoverConfigCmdOptions {

diff --git a/pkg/oc/experimental/ipfailover/keepalived/plugin.go b/pkg/oc/experimental/ipfailover/keepalived/plugin.go
@@ -12,8 +12,8 @@ import (
 
 	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	"github.com/openshift/origin/pkg/generate/app"
-	"github.com/openshift/origin/pkg/ipfailover"
 	"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
+	"github.com/openshift/origin/pkg/oc/experimental/ipfailover/ipfailover"
 )
 
 // KeepalivedPlugin is an IP Failover configurator plugin for keepalived sidecar.

diff --git a/pkg/oc/experimental/ipfailover/keepalived/plugin_test.go b/pkg/oc/experimental/ipfailover/keepalived/plugin_test.go
@@ -3,7 +3,7 @@ package keepalived
 import (
 	"testing"
 
-	"github.com/openshift/origin/pkg/ipfailover"
+	"github.com/openshift/origin/pkg/oc/experimental/ipfailover/ipfailover"
 )
 
 func TestNewIPFailoverConfiguratorPlugin(t *testing.T) {