stop creating oadm docs

openshift · Nov 21, 2017 · 998434f · 998434f
1 parent 0c244c6
commit 998434f
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 12 deletions.
diff --git a/hack/lib/util/docs.sh b/hack/lib/util/docs.sh
@@ -102,15 +102,13 @@ function os::util::gen-docs() {
 	generate_documentation "${OUTPUT_DIR}"
 	generate_manual_pages "${MAN_OUTPUT_DIR}" "oc"
 	generate_manual_pages "${MAN_OUTPUT_DIR}" "openshift"
-	generate_manual_pages "${MAN_OUTPUT_DIR}" "oadm"
 }
 readonly -f os::util::gen-docs
 
 # os::util::set-man-placeholder puts a placeholder for every generated manpage.
 function os::util::set-man-placeholder() {
 	MAN_OUTPUT_DIR="$1"
-	declare -a generated_files=( "${1}/.files_generated_oadm=${1}/.files_generated_oadm"
-                                 "${1}/.files_generated_oc=${1}/.files_generated_oc"
+	declare -a generated_files=( "${1}/.files_generated_oc=${1}/.files_generated_oc"
                                  "${1}/.files_generated_openshift=${1}/.files_generated_openshift" )
 
 	# remove all of the old manpages; we don't want to check them in.

diff --git a/hack/update-generated-completions.sh b/hack/update-generated-completions.sh
@@ -16,7 +16,6 @@ function os::build::gen-completions() {
   # generate the new files
   ${OS_OUTPUT_BINPATH}/${platform}/oc completion ${shell} > $tmpdir/oc
   ${OS_OUTPUT_BINPATH}/${platform}/openshift completion ${shell} > $tmpdir/openshift
-  ${OS_OUTPUT_BINPATH}/${platform}/oadm completion ${shell} > $tmpdir/oadm
   # create the list of generated files
   ls "${tmpdir}" | LC_ALL=C sort > "${tmpdir}/.files_generated"
 

diff --git a/tools/gendocs/gen_openshift_docs.go b/tools/gendocs/gen_openshift_docs.go
@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 
 	"github.com/openshift/origin/pkg/cmd/util/gendocs"
-	"github.com/openshift/origin/pkg/oc/admin"
 	"github.com/openshift/origin/pkg/oc/cli"
 )
 
@@ -49,8 +48,4 @@ func main() {
 	out := os.Stdout
 	cmd := cli.NewCommandCLI("oc", "oc", &bytes.Buffer{}, out, ioutil.Discard)
 	gendocs.GenDocs(cmd, outFile)
-
-	outFile = outDir + "oadm_by_example_content.adoc"
-	cmd = admin.NewCommandAdmin("oadm", "oadm", &bytes.Buffer{}, ioutil.Discard, ioutil.Discard)
-	gendocs.GenDocs(cmd, outFile)
 }
diff --git a/tools/genman/gen_man.go b/tools/genman/gen_man.go
@@ -8,7 +8,6 @@ import (
 	"strings"
 
 	"github.com/openshift/origin/pkg/cmd/openshift"
-	"github.com/openshift/origin/pkg/oc/admin"
 	"github.com/openshift/origin/pkg/oc/cli"
 	mangen "github.com/openshift/origin/tools/genman/md2man"
 	"github.com/spf13/cobra"
@@ -26,8 +25,6 @@ func main() {
 		genCmdMan("oc", cli.NewCommandCLI("oc", "oc", &bytes.Buffer{}, os.Stdout, ioutil.Discard))
 	} else if strings.HasSuffix(os.Args[2], "openshift") {
 		genCmdMan("openshift", openshift.NewCommandOpenShift("openshift"))
-	} else if strings.HasSuffix(os.Args[2], "oadm") {
-		genCmdMan("oadm", admin.NewCommandAdmin("oadm", "oadm", &bytes.Buffer{}, os.Stdout, ioutil.Discard))
 	} else {
 		fmt.Fprintf(os.Stderr, "Root command not specified (oc | oadm | openshift).")
 		os.Exit(1)