Merge pull request #18469 from mfojtik/remove-openshift-admin

openshift-merge-robot · web-flow · commit 72136400e9ad · 2018-02-07T06:24:54.000-08:00
Automatic merge from submit-queue. cli: remove traces of openshift admin command Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542332
diff --git a/pkg/cmd/server/admin/create_bootstrappolicy_file.go b/pkg/cmd/server/admin/create_bootstrappolicy_file.go
@@ -25,7 +25,7 @@ import (
 const (
 	DefaultPolicyFile                    = "openshift.local.config/master/policy.json"
 	CreateBootstrapPolicyFileCommand     = "create-bootstrap-policy-file"
-	CreateBootstrapPolicyFileFullCommand = "openshift admin " + CreateBootstrapPolicyFileCommand
+	CreateBootstrapPolicyFileFullCommand = "oc adm " + CreateBootstrapPolicyFileCommand
 )
 
 type CreateBootstrapPolicyFileOptions struct {
diff --git a/pkg/cmd/server/admin/create_nodeconfig_test.go b/pkg/cmd/server/admin/create_nodeconfig_test.go
@@ -107,7 +107,7 @@ func executeNodeConfig(args []string) string {
 		},
 	}
 
-	root.AddCommand(NewCommandNodeConfig("create-node-config", "openshift admin", ioutil.Discard))
+	root.AddCommand(NewCommandNodeConfig("create-node-config", "oc adm", ioutil.Discard))
 	root.SetArgs(argsToUse)
 	root.Execute()
 
diff --git a/pkg/oc/admin/diagnostics/diagnostics/systemd/systemd.go b/pkg/oc/admin/diagnostics/diagnostics/systemd/systemd.go
@@ -49,7 +49,7 @@ ${component} and ${version}; any others will cause this error.
 This could be a typo or you might be intending to hardcode something,
 such as a version which should be specified as e.g. v3.0, not ${v3.0}.
 Note that the --images flag may be supplied via the master, node, or
-"openshift admin registry/router" invocations and should usually
+"oc adm registry/router" invocations and should usually
 be the same for each.`,
 }
 
diff --git a/pkg/oc/admin/node/evacuate.go b/pkg/oc/admin/node/evacuate.go
@@ -80,7 +80,7 @@ func (e *EvacuateOptions) RunEvacuate(node *kapi.Node) error {
 	// we may not be able to recover in some cases to mark the node back to schedulable. To avoid these cases, we recommend
 	// user to explicitly set the node to schedulable/unschedulable.
 	if !node.Spec.Unschedulable {
-		return fmt.Errorf("Node '%s' must be unschedulable to perform evacuation.\nYou can mark the node unschedulable with 'openshift admin manage-node %s --schedulable=false'", node.ObjectMeta.Name, node.ObjectMeta.Name)
+		return fmt.Errorf("Node '%s' must be unschedulable to perform evacuation.\nYou can mark the node unschedulable with 'oc adm manage-node %s --schedulable=false'", node.ObjectMeta.Name, node.ObjectMeta.Name)
 	}
 
 	labelSelector, err := labels.Parse(e.Options.PodSelector)

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`const (`
`26`	`26`	`DefaultPolicyFile = "openshift.local.config/master/policy.json"`
`27`	`27`	`CreateBootstrapPolicyFileCommand = "create-bootstrap-policy-file"`
`28`		`- CreateBootstrapPolicyFileFullCommand = "openshift admin " + CreateBootstrapPolicyFileCommand`
	`28`	`+ CreateBootstrapPolicyFileFullCommand = "oc adm " + CreateBootstrapPolicyFileCommand`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`type CreateBootstrapPolicyFileOptions struct {`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func executeNodeConfig(args []string) string {`
`107`	`107`	`},`
`108`	`108`	`}`
`109`	`109`
`110`		`- root.AddCommand(NewCommandNodeConfig("create-node-config", "openshift admin", ioutil.Discard))`
	`110`	`+ root.AddCommand(NewCommandNodeConfig("create-node-config", "oc adm", ioutil.Discard))`
`111`	`111`	`root.SetArgs(argsToUse)`
`112`	`112`	`root.Execute()`
`113`	`113`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ ${component} and ${version}; any others will cause this error.`
`49`	`49`	`This could be a typo or you might be intending to hardcode something,`
`50`	`50`	`such as a version which should be specified as e.g. v3.0, not ${v3.0}.`
`51`	`51`	`Note that the --images flag may be supplied via the master, node, or`
`52`		`-"openshift admin registry/router" invocations and should usually`
	`52`	`+"oc adm registry/router" invocations and should usually`
`53`	`53`	be the same for each.`,
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func (e EvacuateOptions) RunEvacuate(node kapi.Node) error {`
`80`	`80`	`// we may not be able to recover in some cases to mark the node back to schedulable. To avoid these cases, we recommend`
`81`	`81`	`// user to explicitly set the node to schedulable/unschedulable.`
`82`	`82`	`if !node.Spec.Unschedulable {`
`83`		`- return fmt.Errorf("Node '%s' must be unschedulable to perform evacuation.\nYou can mark the node unschedulable with 'openshift admin manage-node %s --schedulable=false'", node.ObjectMeta.Name, node.ObjectMeta.Name)`
	`83`	`+ return fmt.Errorf("Node '%s' must be unschedulable to perform evacuation.\nYou can mark the node unschedulable with 'oc adm manage-node %s --schedulable=false'", node.ObjectMeta.Name, node.ObjectMeta.Name)`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`labelSelector, err := labels.Parse(e.Options.PodSelector)`