From 41e9a841427b1737adb09ea0608a3ce953a015bd Mon Sep 17 00:00:00 2001 From: juanvallejo Date: Thu, 16 Nov 2017 18:18:22 -0500 Subject: [PATCH] move admin template cmds -> pkg/oc/admin --- pkg/oc/admin/admin.go | 8 ++++---- .../admin/create_bootstrap_project_template.go | 0 pkg/{cmd/server => oc}/admin/create_error_template.go | 0 pkg/{cmd/server => oc}/admin/create_login_template.go | 0 .../admin/create_provider_selection_template.go | 0 pkg/oc/experimental/ipfailover/ipfailover.go | 4 ++-- pkg/oc/experimental/ipfailover/keepalived/generator.go | 2 +- .../experimental/ipfailover/keepalived/generator_test.go | 2 +- pkg/oc/experimental/ipfailover/keepalived/plugin.go | 2 +- pkg/oc/experimental/ipfailover/keepalived/plugin_test.go | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename pkg/{cmd/server => oc}/admin/create_bootstrap_project_template.go (100%) rename pkg/{cmd/server => oc}/admin/create_error_template.go (100%) rename pkg/{cmd/server => oc}/admin/create_login_template.go (100%) rename pkg/{cmd/server => oc}/admin/create_provider_selection_template.go (100%) diff --git a/pkg/oc/admin/admin.go b/pkg/oc/admin/admin.go index 264db56cfab3..68bbd892d6e0 100644 --- 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/pkg/cmd/server/admin/create_bootstrap_project_template.go b/pkg/oc/admin/create_bootstrap_project_template.go similarity index 100% rename from pkg/cmd/server/admin/create_bootstrap_project_template.go rename to pkg/oc/admin/create_bootstrap_project_template.go diff --git a/pkg/cmd/server/admin/create_error_template.go b/pkg/oc/admin/create_error_template.go similarity index 100% rename from pkg/cmd/server/admin/create_error_template.go rename to pkg/oc/admin/create_error_template.go diff --git a/pkg/cmd/server/admin/create_login_template.go b/pkg/oc/admin/create_login_template.go similarity index 100% rename from pkg/cmd/server/admin/create_login_template.go rename to pkg/oc/admin/create_login_template.go diff --git a/pkg/cmd/server/admin/create_provider_selection_template.go b/pkg/oc/admin/create_provider_selection_template.go similarity index 100% rename from pkg/cmd/server/admin/create_provider_selection_template.go rename to pkg/oc/admin/create_provider_selection_template.go diff --git a/pkg/oc/experimental/ipfailover/ipfailover.go b/pkg/oc/experimental/ipfailover/ipfailover.go index 4a65dc3feaba..72083376094a 100644 --- 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 index af24e665ff60..881a2716a6eb 100644 --- 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 index f92e05d1e1d9..67fb6034e488 100644 --- 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 index e907a3905dc5..0b3e123e97eb 100644 --- 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 index f35d53c307de..4470ee4ac002 100644 --- 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) {