Skip to content

Commit 41e9a84

Browse files
juanvallejojuanvallejo
committed
move admin template cmds -> pkg/oc/admin
1 parent 6bb3e85 commit 41e9a84

10 files changed

+10
-10
lines changed

‎pkg/oc/admin/admin.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ func NewCommandAdmin(name, fullName string, in io.Reader, out io.Writer, errout
108108
admin.NewCommandCreateKubeConfig(admin.CreateKubeConfigCommandName, fullName+" "+admin.CreateKubeConfigCommandName, out),
109109
admin.NewCommandCreateClient(admin.CreateClientCommandName, fullName+" "+admin.CreateClientCommandName, out),
110110

111-
admin.NewCommandCreateBootstrapProjectTemplate(f, admin.CreateBootstrapProjectTemplateCommand, fullName+" "+admin.CreateBootstrapProjectTemplateCommand, out),
111+
NewCommandCreateBootstrapProjectTemplate(f, CreateBootstrapProjectTemplateCommand, fullName+" "+CreateBootstrapProjectTemplateCommand, out),
112112
admin.NewCommandCreateBootstrapPolicyFile(admin.CreateBootstrapPolicyFileCommand, fullName+" "+admin.CreateBootstrapPolicyFileCommand, out),
113113

114-
admin.NewCommandCreateLoginTemplate(f, admin.CreateLoginTemplateCommand, fullName+" "+admin.CreateLoginTemplateCommand, out),
115-
admin.NewCommandCreateProviderSelectionTemplate(f, admin.CreateProviderSelectionTemplateCommand, fullName+" "+admin.CreateProviderSelectionTemplateCommand, out),
116-
admin.NewCommandCreateErrorTemplate(f, admin.CreateErrorTemplateCommand, fullName+" "+admin.CreateErrorTemplateCommand, out),
114+
NewCommandCreateLoginTemplate(f, CreateLoginTemplateCommand, fullName+" "+CreateLoginTemplateCommand, out),
115+
NewCommandCreateProviderSelectionTemplate(f, CreateProviderSelectionTemplateCommand, fullName+" "+CreateProviderSelectionTemplateCommand, out),
116+
NewCommandCreateErrorTemplate(f, CreateErrorTemplateCommand, fullName+" "+CreateErrorTemplateCommand, out),
117117
},
118118
},
119119
}

‎pkg/cmd/server/admin/create_bootstrap_project_template.go ‎pkg/oc/admin/create_bootstrap_project_template.go

File renamed without changes.

‎pkg/cmd/server/admin/create_error_template.go ‎pkg/oc/admin/create_error_template.go

File renamed without changes.

‎pkg/cmd/server/admin/create_login_template.go ‎pkg/oc/admin/create_login_template.go

File renamed without changes.

‎pkg/cmd/server/admin/create_provider_selection_template.go ‎pkg/oc/admin/create_provider_selection_template.go

File renamed without changes.

‎pkg/oc/experimental/ipfailover/ipfailover.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
cmdutil "github.com/openshift/origin/pkg/cmd/util"
2020
"github.com/openshift/origin/pkg/cmd/util/variable"
2121
configcmd "github.com/openshift/origin/pkg/config/cmd"
22-
"github.com/openshift/origin/pkg/ipfailover"
23-
"github.com/openshift/origin/pkg/ipfailover/keepalived"
2422
"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
23+
"github.com/openshift/origin/pkg/oc/experimental/ipfailover/ipfailover"
24+
"github.com/openshift/origin/pkg/oc/experimental/ipfailover/keepalived"
2525
securityclient "github.com/openshift/origin/pkg/security/generated/internalclientset"
2626
)
2727

‎pkg/oc/experimental/ipfailover/keepalived/generator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
dapi "github.com/openshift/origin/pkg/apps/apis/apps"
1111
"github.com/openshift/origin/pkg/generate/app"
12-
"github.com/openshift/origin/pkg/ipfailover"
12+
"github.com/openshift/origin/pkg/oc/experimental/ipfailover/ipfailover"
1313
)
1414

1515
const defaultInterface = "eth0"

‎pkg/oc/experimental/ipfailover/keepalived/generator_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/openshift/origin/pkg/cmd/util/variable"
88
"github.com/openshift/origin/pkg/generate/app"
9-
"github.com/openshift/origin/pkg/ipfailover"
9+
"github.com/openshift/origin/pkg/oc/experimental/ipfailover/ipfailover"
1010
)
1111

1212
func makeIPFailoverConfigOptions(selector string, replicas int32, serviceAccount string) *ipfailover.IPFailoverConfigCmdOptions {

‎pkg/oc/experimental/ipfailover/keepalived/plugin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212

1313
deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
1414
"github.com/openshift/origin/pkg/generate/app"
15-
"github.com/openshift/origin/pkg/ipfailover"
1615
"github.com/openshift/origin/pkg/oc/cli/util/clientcmd"
16+
"github.com/openshift/origin/pkg/oc/experimental/ipfailover/ipfailover"
1717
)
1818

1919
// KeepalivedPlugin is an IP Failover configurator plugin for keepalived sidecar.

‎pkg/oc/experimental/ipfailover/keepalived/plugin_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package keepalived
33
import (
44
"testing"
55

6-
"github.com/openshift/origin/pkg/ipfailover"
6+
"github.com/openshift/origin/pkg/oc/experimental/ipfailover/ipfailover"
77
)
88

99
func TestNewIPFailoverConfiguratorPlugin(t *testing.T) {

0 commit comments

Comments
 (0)