@@ -284,10 +284,10 @@ Export resources so they can be used elsewhere

   openshift cli export svc,dc -l name=test

   // export all services to a template

-  openshift cli export service --all --as-template=test

+  openshift cli export service --as-template=test

   // export to JSON

-  openshift cli export service --all -o json

+  openshift cli export service -o json

   // convert a file on disk to the latest API version (in YAML, the default)

   openshift cli export -f a_v1beta3_service.json --output-version=v1 --exact

@@ -72,7 +72,7 @@ function cleanup()

 	oc get -n docker builds --output-version=v1beta3 -t '{{ range .items }}{{.metadata.name}}{{ "\n" }}{{end}}' | xargs -r -l oc build-logs -n docker >"${LOG_DIR}/dockerbuild.log"

 	oc get -n custom builds --output-version=v1beta3 -t '{{ range .items }}{{.metadata.name}}{{ "\n" }}{{end}}' | xargs -r -l oc build-logs -n custom >"${LOG_DIR}/custombuild.log"

-	oc export all --all --all-namespaces --raw -o json > ${LOG_DIR}/export_all.json

+	oc export all --all-namespaces --raw -o json > ${LOG_DIR}/export_all.json

 	echo "[INFO] Dumping etcd contents to ${ARTIFACT_DIR}/etcd_dump.json"

 	set_curl_args 0 1

@@ -41,10 +41,10 @@ to generate the API structure for a template to which you can add parameters and

   %[1]s export svc,dc -l name=test

   // export all services to a template

-  %[1]s export service --all --as-template=test

+  %[1]s export service --as-template=test

   // export to JSON

-  %[1]s export service --all -o json

+  %[1]s export service -o json

   // convert a file on disk to the latest API version (in YAML, the default)

   %[1]s export -f a_v1beta3_service.json --output-version=v1 --exact`

@@ -70,16 +70,17 @@ func NewCmdExport(fullName string, f *clientcmd.Factory, in io.Reader, out io.Wr

 	cmd.Flags().Bool("exact", false, "Preserve fields that may be cluster specific, such as service portalIPs or generated names")

 	cmd.Flags().Bool("raw", false, "If true, do not alter the resources in any way after they are loaded.")

 	cmd.Flags().StringP("selector", "l", "", "Selector (label query) to filter on")

-	cmd.Flags().Bool("all", false, "Select all resources in the namespace of the specified resource types")

 	cmd.Flags().Bool("all-namespaces", false, "If present, list the requested object(s) across all namespaces. Namespace in current context is ignored even if specified with --namespace.")

 	cmd.Flags().VarP(&filenames, "filename", "f", "Filename, directory, or URL to file to use to edit the resource.")

+

+	cmd.Flags().Bool("all", true, "Select all resources in the namespace of the specified resource types")

+	cmd.Flags().MarkDeprecated("all", "all is ignored because specifying a resource without a name selects all the instances of that resource")

 	cmdutil.AddPrinterFlags(cmd)

 	return cmd

 }

 func RunExport(f *clientcmd.Factory, exporter Exporter, in io.Reader, out io.Writer, cmd *cobra.Command, args []string, filenames util.StringList) error {

 	selector := cmdutil.GetFlagString(cmd, "selector")

-	all := cmdutil.GetFlagBool(cmd, "all")

 	allNamespaces := cmdutil.GetFlagBool(cmd, "all-namespaces")

 	exact := cmdutil.GetFlagBool(cmd, "exact")

 	asTemplate := cmdutil.GetFlagString(cmd, "as-template")

@@ -104,7 +105,7 @@ func RunExport(f *clientcmd.Factory, exporter Exporter, in io.Reader, out io.Wri

 		NamespaceParam(cmdNamespace).DefaultNamespace().AllNamespaces(allNamespaces).

 		FilenameParam(explicit, filenames...).

 		SelectorParam(selector).

-		ResourceTypeOrNameArgs(all, args...).

+		ResourceTypeOrNameArgs(true, args...).

 		Flatten()

 	one := false

@@ -1181,6 +1181,7 @@ _oc_export()

     flags_completion=()

     flags+=("--all")

+    flags+=("--all-namespaces")

     flags+=("--as-template=")

     flags+=("--exact")

     flags+=("--filename=")

@@ -2724,6 +2724,7 @@ _openshift_cli_export()

     flags_completion=()

     flags+=("--all")

+    flags+=("--all-namespaces")

     flags+=("--as-template=")

     flags+=("--exact")

     flags+=("--filename=")

@@ -8,14 +8,17 @@ set -o pipefail

 oc new-app -f examples/sample-app/application-template-stibuild.json --name=sample

-oc export all --all --all-namespaces --exact

+oc export all --all-namespaces

-[ "$(oc export svc --all -t '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}' | wc -l)" -ne 0 ]

-[ "$(oc export svc --all --as-template=template | grep 'kind: Template')" ]

-[ ! "$(oc export svc --all | grep 'clusterIP')" ]

-[ ! "$(oc export svc --all --exact | grep 'clusterIP: ""')" ]

-[ ! "$(oc export svc --all --raw | grep 'clusterIP: ""')" ]

-[ ! "$(oc export svc --all --raw --exact)" ]

+# make sure the deprecated flag doesn't fail

+oc export all --all

+

+[ "$(oc export svc -t '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}' | wc -l)" -ne 0 ]

+[ "$(oc export svc --as-template=template | grep 'kind: Template')" ]

+[ ! "$(oc export svc | grep 'clusterIP')" ]

+[ ! "$(oc export svc --exact | grep 'clusterIP: ""')" ]

+[ ! "$(oc export svc --raw | grep 'clusterIP: ""')" ]

+[ ! "$(oc export svc --raw --exact)" ]

 [ ! "$(oc export svc -l a=b)" ] # return error if no items match selector

 [ "$(oc export svc -l a=b 2>&1 | grep 'no resources found')" ]

 [ "$(oc export svc -l app=sample)" ]