remove openshift cli and friends

deads2k · deads2k · commit 3018938ae1c5 · 2017-11-21T10:58:43.000-05:00
diff --git a/contrib/vagrant/provision-util.sh b/contrib/vagrant/provision-util.sh
@@ -57,7 +57,7 @@ os::provision::install-cmds() {
   local deployed_root=$1
 
   local output_path="$(os::build::get-bin-output-path "${deployed_root}")"
-  cp ${output_path}/{openshift,oc,osadm} /usr/bin
+  cp ${output_path}/{openshift,oc} /usr/bin
 }
 
 os::provision::add-to-hosts-file() {
@@ -102,7 +102,7 @@ os::provision::init-certs() {
   pushd "${config_root}" > /dev/null
 
   # Master certs
-  /usr/bin/openshift admin ca create-master-certs \
+  /usr/bin/oc adm ca create-master-certs \
     --overwrite=false \
     --cert-dir="${cert_dir}" \
     --master="https://${master_ip}:8443" \
@@ -112,7 +112,7 @@ os::provision::init-certs() {
   for (( i=0; i < ${#node_names[@]}; i++ )); do
     local name=${node_names[$i]}
     local ip=${node_ips[$i]}
-    /usr/bin/openshift admin create-node-config \
+    /usr/bin/oc adm create-node-config \
       --node-dir="${server_config_dir}/node-${name}" \
       --node="${name}" \
       --hostnames="${name},${ip}" \
@@ -386,7 +386,7 @@ os::provision::disable-node() {
   os::provision::wait-for-condition "${msg}" "${condition}"
 
   echo "Disabling scheduling for node ${node_name}"
-  "$(OS_ROOT="${origin_root}" os::util::find::built_binary osadm)" --config="${config}" \
+  "$(OS_ROOT="${origin_root}" os::util::find::built_binary oc)" adm --config="${config}" \
       manage-node "${node_name}" --schedulable=false > /dev/null
 }
 
diff --git a/examples/data-population/limits.sh b/examples/data-population/limits.sh
@@ -14,7 +14,7 @@ LIMIT=$(dirname "${BASH_SOURCE}")/limit.yaml
 
 for ((i=1; i <=$NUM_PROJECTS; i++))
 do
-  openshift cli create -f $LIMIT --namespace=${PROJECT_NAME_PREFIX}${i}
+  oc create -f $LIMIT --namespace=${PROJECT_NAME_PREFIX}${i}
 done
 
 echo "Done"
diff --git a/examples/data-population/quotas.sh b/examples/data-population/quotas.sh
@@ -14,7 +14,7 @@ QUOTA=$(dirname "${BASH_SOURCE}")/quota.yaml
 
 for ((i=1; i <=$NUM_PROJECTS; i++))
 do
-  openshift cli create -f $QUOTA --namespace=${PROJECT_NAME_PREFIX}${i}
+  oc create -f $QUOTA --namespace=${PROJECT_NAME_PREFIX}${i}
 done
 
 echo "Done"
diff --git a/examples/data-population/services.sh b/examples/data-population/services.sh
@@ -15,7 +15,7 @@ SERVICE=$(dirname "${BASH_SOURCE}")/service.yaml
 
 for ((i=1; i <=$NUM_PROJECTS; i++))
 do
-  openshift cli create -f $SERVICE --namespace=${PROJECT_NAME_PREFIX}${i}
+  oc create -f $SERVICE --namespace=${PROJECT_NAME_PREFIX}${i}
 done
 
 echo "Done"
diff --git a/examples/data-population/users.sh b/examples/data-population/users.sh
@@ -11,7 +11,7 @@ for ((i=1; i <=$NUM_USERS; i++))
 do  
   USERNAME=${USER_NAME_PREFIX}${i}
   USERCONFIG=/tmp/${USERNAME}.config
-  openshift cli config view --minify --raw -o yaml > ${USERCONFIG}
+  oc config view --minify --raw -o yaml > ${USERCONFIG}
   KUBECONFIG=${USERCONFIG} oc login --username=$USERNAME --password=whocares
 done
 
diff --git a/hack/lib/build/binaries.sh b/hack/lib/build/binaries.sh
@@ -347,12 +347,6 @@ function os::build::place_bins() {
       if [[ $platform == "windows/amd64" ]]; then
         suffix=".exe"
       fi
-      for linkname in "${OPENSHIFT_BINARY_COPY[@]}"; do
-        local src="${release_binpath}/openshift${suffix}"
-        if [[ -f "${src}" ]]; then
-          ln "${release_binpath}/openshift${suffix}" "${release_binpath}/${linkname}${suffix}"
-        fi
-      done
       for linkname in "${OC_BINARY_COPY[@]}"; do
         local src="${release_binpath}/oc${suffix}"
         if [[ -f "${src}" ]]; then
diff --git a/hack/lib/constants.sh b/hack/lib/constants.sh
@@ -72,12 +72,6 @@ readonly OPENSHIFT_BINARY_SYMLINKS=(
   openshift-manage-dockerfile
   openshift-extract-image-content
   origin
-  osc
-  oadm
-  osadm
-)
-readonly OPENSHIFT_BINARY_COPY=(
-  oadm
 )
 readonly OC_BINARY_COPY=(
   kubectl
diff --git a/hack/lib/start.sh b/hack/lib/start.sh
@@ -61,11 +61,9 @@ readonly -f os::start::configure_server
 function os::start::internal::create_master_certs() {
 	local version="${1:-}"
 	local openshift_volumes=( "${MASTER_CONFIG_DIR}" )
-	local openshift_executable
-	openshift_executable="$(os::start::internal::openshift_executable "${version}")"
 
 	os::log::debug "Creating certificates for the OpenShift server"
-	${openshift_executable} admin ca create-master-certs                                \
+	oc adm ca create-master-certs                                \
 	                        --overwrite=false                                           \
 	                        --master="${MASTER_ADDR}"                                   \
 	                        --cert-dir="${MASTER_CONFIG_DIR}"                           \
@@ -89,11 +87,9 @@ readonly -f os::start::internal::create_master_certs
 function os::start::internal::configure_node() {
 	local version="${1:-}"
 	local openshift_volumes=( "${MASTER_CONFIG_DIR}" "${NODE_CONFIG_DIR}" )
-	local openshift_executable
-	openshift_executable="$(os::start::internal::openshift_executable "${version}")"
 
 	os::log::debug "Creating node configuration for the OpenShift server"
-	${openshift_executable} admin create-node-config                                          \
+	oc adm create-node-config                                          \
 	                        --node-dir="${NODE_CONFIG_DIR}"                                   \
 	                        --node="${KUBELET_HOST}"                                          \
 	                        --hostnames="${KUBELET_HOST}"                                     \
@@ -602,9 +598,9 @@ function os::start::router() {
 		cat "${MASTER_CONFIG_DIR}/router.crt" \
 		    "${MASTER_CONFIG_DIR}/router.key" \
 			"${MASTER_CONFIG_DIR}/ca.crt" > "${MASTER_CONFIG_DIR}/router.pem"
-		openshift admin router --config="${ADMIN_KUBECONFIG}" --images="${USE_IMAGES}" --service-account=router --default-cert="${MASTER_CONFIG_DIR}/router.pem"
+		oc adm router --config="${ADMIN_KUBECONFIG}" --images="${USE_IMAGES}" --service-account=router --default-cert="${MASTER_CONFIG_DIR}/router.pem"
 	else
-		openshift admin router --config="${ADMIN_KUBECONFIG}" --images="${USE_IMAGES}" --service-account=router
+		oc adm router --config="${ADMIN_KUBECONFIG}" --images="${USE_IMAGES}" --service-account=router
 	fi
 
 	# Set the SYN eater to make router reloads more robust
@@ -631,7 +627,7 @@ function os::start::registry() {
 	os::log::debug "Installing the registry"
 	# For testing purposes, ensure the quota objects are always up to date in the registry by
 	# disabling project cache.
-	openshift admin registry --config="${ADMIN_KUBECONFIG}" --images="${USE_IMAGES}" --enforce-quota -o json | \
+	oc adm registry --config="${ADMIN_KUBECONFIG}" --images="${USE_IMAGES}" --enforce-quota -o json | \
 		oc env --config="${ADMIN_KUBECONFIG}" -f - --output json "REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_PROJECTCACHETTL=0" | \
 		oc create --config="${ADMIN_KUBECONFIG}" -f -
 }
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/images/dind/master/openshift-disable-master-node.sh b/images/dind/master/openshift-disable-master-node.sh
@@ -22,7 +22,7 @@ function disable-node() {
   os::util::wait-for-condition "${msg}" "${condition}"
 
   echo "Disabling scheduling for node ${node_name}"
-  /usr/local/bin/osadm --config="${config}" manage-node "${node_name}" --schedulable=false > /dev/null
+  /usr/local/bin/oc adm --config="${config}" manage-node "${node_name}" --schedulable=false > /dev/null
 }
 
 disable-node /data/openshift.local.config/master/admin.kubeconfig "$(hostname)-node"
diff --git a/images/dind/master/openshift-generate-master-config.sh b/images/dind/master/openshift-generate-master-config.sh
@@ -22,7 +22,7 @@ function ensure-master-config() {
   local name
   name="$(hostname)"
 
-  /usr/local/bin/openshift admin ca create-master-certs \
+  /usr/local/bin/oc adm ca create-master-certs \
     --overwrite=false \
     --cert-dir="${master_path}" \
     --master="https://${ip_addr}:8443" \
diff --git a/images/dind/master/ovn-kubernetes-master-setup.sh b/images/dind/master/ovn-kubernetes-master-setup.sh
@@ -36,9 +36,9 @@ function ovn-kubernetes-master-setup() {
   # Create the service account for OVN stuff
   if ! /usr/local/bin/oc --config="${kube_config}" get serviceaccount ovn >/dev/null 2>&1; then
     /usr/local/bin/oc --config="${kube_config}" create serviceaccount ovn
-    /usr/local/bin/oadm --config="${kube_config}" policy add-cluster-role-to-user cluster-admin -z ovn
+    /usr/local/bin/oc adm --config="${kube_config}" policy add-cluster-role-to-user cluster-admin -z ovn
     # rhbz#1383707: need to add ovn SA to anyuid SCC to allow pod annotation updates
-    /usr/local/bin/oadm --config="${kube_config}" policy add-scc-to-user anyuid -z ovn
+    /usr/local/bin/oc adm --config="${kube_config}" policy add-scc-to-user anyuid -z ovn
   fi
 
   /usr/local/bin/oc --config="${kube_config}" sa get-token ovn > ${config_dir}/ovn.token
diff --git a/images/dind/node/openshift-generate-node-config.sh b/images/dind/node/openshift-generate-node-config.sh
@@ -46,7 +46,7 @@ function ensure-node-config() {
     # concurrent execution since the file passed to --signer-serial
     # needs to be incremented by each invocation.
     (flock 200;
-     /usr/local/bin/openshift admin create-node-config \
+     /usr/local/bin/oc adm create-node-config \
        --node-dir="${node_config_path}" \
        --node="${host}" \
        --master="${master_host}" \
diff --git a/origin.spec b/origin.spec
@@ -321,7 +321,6 @@ install -d -m 0755 %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 
 for cmd in \
-    oadm \
     openshift-deploy \
     openshift-docker-build \
     openshift-sti-build \
@@ -378,7 +377,7 @@ install -p -m 0644 contrib/systemd/openshift-sdn-ovs.conf %{buildroot}%{_unitdir
 
 # Install bash completions
 install -d -m 755 %{buildroot}%{_sysconfdir}/bash_completion.d/
-for bin in oadm oc openshift
+for bin in oc openshift
 do
   echo "+++ INSTALLING BASH COMPLETIONS FOR ${bin} "
   %{buildroot}%{_bindir}/${bin} completion bash > %{buildroot}%{_sysconfdir}/bash_completion.d/${bin}
@@ -416,7 +415,6 @@ install -p -m 755 contrib/migration/* %{buildroot}%{_datadir}/%{name}/migration/
 %license LICENSE
 %{_bindir}/openshift
 %{_bindir}/hyperkube
-%{_bindir}/oadm
 %{_bindir}/openshift-deploy
 %{_bindir}/openshift-f5-router
 %{_bindir}/openshift-recycle
@@ -428,13 +426,11 @@ install -p -m 755 contrib/migration/* %{buildroot}%{_datadir}/%{name}/migration/
 %{_bindir}/openshift-manage-dockerfile
 %{_bindir}/origin
 %{_sharedstatedir}/origin
-%{_sysconfdir}/bash_completion.d/oadm
 %{_sysconfdir}/bash_completion.d/openshift
 %defattr(-,root,root,0700)
 %dir %config(noreplace) %{_sysconfdir}/origin
 %ghost %dir %config(noreplace) %{_sysconfdir}/origin
 %ghost %config(noreplace) %{_sysconfdir}/origin/.config_managed
-%{_mandir}/man1/oadm*
 %{_mandir}/man1/openshift*
 
 %pre
diff --git a/pkg/cmd/openshift/openshift.go b/pkg/cmd/openshift/openshift.go
@@ -25,7 +25,6 @@ import (
 	diagnostics "github.com/openshift/origin/pkg/oc/admin/diagnostics"
 	sync "github.com/openshift/origin/pkg/oc/admin/groups/sync/cli"
 	"github.com/openshift/origin/pkg/oc/admin/validate"
-	"github.com/openshift/origin/pkg/oc/cli"
 	"github.com/openshift/origin/pkg/oc/cli/cmd"
 	"github.com/openshift/origin/pkg/oc/experimental/buildchain"
 	configcmd "github.com/openshift/origin/pkg/oc/experimental/config"
@@ -48,7 +47,7 @@ var (
 func CommandFor(basename string) *cobra.Command {
 	var cmd *cobra.Command
 
-	in, out, errout := os.Stdin, os.Stdout, os.Stderr
+	out := os.Stdout
 
 	// Make case-insensitive and strip executable suffix if present
 	if runtime.GOOS == "windows" {
@@ -75,10 +74,6 @@ func CommandFor(basename string) *cobra.Command {
 		cmd = builder.NewCommandManageDockerfile(basename)
 	case "openshift-extract-image-content":
 		cmd = builder.NewCommandExtractImageContent(basename)
-	case "oc", "osc":
-		cmd = cli.NewCommandCLI(basename, basename, in, out, errout)
-	case "oadm", "osadm":
-		cmd = admin.NewCommandAdmin(basename, basename, in, out, errout)
 	case "origin":
 		cmd = NewCommandOpenShift(basename)
 	default:
@@ -95,7 +90,7 @@ func CommandFor(basename string) *cobra.Command {
 
 // NewCommandOpenShift creates the standard OpenShift command
 func NewCommandOpenShift(name string) *cobra.Command {
-	in, out, errout := os.Stdin, os.Stdout, os.Stderr
+	out, errout := os.Stdout, os.Stderr
 
 	root := &cobra.Command{
 		Use:   name,
@@ -108,8 +103,6 @@ func NewCommandOpenShift(name string) *cobra.Command {
 
 	startAllInOne, _ := start.NewCommandStartAllInOne(name, out, errout)
 	root.AddCommand(startAllInOne)
-	root.AddCommand(admin.NewCommandAdmin("admin", name+" admin", in, out, errout))
-	root.AddCommand(cli.NewCommandCLI("cli", name+" cli", in, out, errout))
 	root.AddCommand(newExperimentalCommand("ex", name+" ex"))
 	root.AddCommand(newCompletionCommand("completion", name+" completion"))
 	root.AddCommand(cmd.NewCmdVersion(name, f, out, cmd.VersionOptions{PrintEtcdVersion: true, IsServer: true}))
diff --git a/test/cmd/admin.sh b/test/cmd/admin.sh
@@ -45,7 +45,7 @@ os::test::junit::declare_suite_end
 
 os::test::junit::declare_suite_start "cmd/admin/manage-node"
 # Test admin manage-node operations
-os::cmd::expect_success_and_text 'openshift admin manage-node --help' 'Manage nodes'
+os::cmd::expect_success_and_text 'oc adm manage-node --help' 'Manage nodes'
 
 # create a node object to mess with
 os::cmd::expect_success "echo 'apiVersion: v1
diff --git a/test/cmd/basicresources.sh b/test/cmd/basicresources.sh
@@ -42,30 +42,20 @@ os::cmd::expect_success_and_not_text "curl -k '${API_SCHEME}://${API_HOST}:${API
 
 # variants I know I have to worry about
 # 1. oc (kube and openshift resources)
-# 2. oadm and oc adm (kube and openshift resources)
-# 3  openshift cli (kube and openshift resources)
+# 2. oc adm (kube and openshift resources)
 
 # example User-Agent: oc/v1.2.0 (linux/amd64) kubernetes/bc4550d
 os::cmd::expect_success_and_text 'oc get pods --loglevel=7  2>&1 | grep -A4 "pods" | grep User-Agent' "oc/${kube_git_regex} .* kubernetes/"
 # example User-Agent: oc/v1.2.0 (linux/amd64) kubernetes/bc4550d
 os::cmd::expect_success_and_text 'oc get dc --loglevel=7  2>&1 | grep -A4 "deploymentconfig" | grep User-Agent' "oc/${kube_git_regex} .* kubernetes/"
-# this is probably broken and should be `oadm/<oc version>... openshift/...`
-os::cmd::expect_success_and_text 'oadm policy reconcile-sccs --loglevel=7  2>&1 | grep -A4 "securitycontextconstraints" | grep User-Agent' "oadm/${kube_git_regex} .* kubernetes/"
 # example User-Agent: oc/v1.1.3 (linux/amd64) openshift/b348c2f
 os::cmd::expect_success_and_text 'oc adm policy who-can get pods --loglevel=7  2>&1 | grep -A4 "localresourceaccessreviews" | grep User-Agent' "oc/${kube_git_regex} .* kubernetes/"
-# example User-Agent: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d
-# this is probably broken and should be `oc/<oc version>... kubernetes/...`
-os::cmd::expect_success_and_text 'openshift cli get pods --loglevel=7  2>&1 | grep -A4 "pods" | grep User-Agent' "openshift/${kube_git_regex} .* kubernetes/"
-# example User-Agent: openshift/v1.2.0 (linux/amd64) kubernetes/bc4550d
-os::cmd::expect_success_and_text 'openshift cli get dc --loglevel=7  2>&1 | grep -A4 "deploymentconfig" | grep User-Agent' "openshift/${kube_git_regex} .* kubernetes/"
 echo "version reporting: ok"
 os::test::junit::declare_suite_end
 
 os::test::junit::declare_suite_start "cmd/basicresources/status"
-os::cmd::expect_success_and_text 'openshift cli status -h' 'openshift cli describe buildConfig'
 os::cmd::expect_success_and_text 'oc status -h' 'oc describe buildConfig'
 os::cmd::expect_success_and_text 'oc status' 'oc new-app'
-os::cmd::expect_success_and_text 'openshift cli status' 'openshift cli new-app'
 echo "status help output: ok"
 os::test::junit::declare_suite_end
 
diff --git a/test/cmd/completions.sh b/test/cmd/completions.sh
@@ -8,7 +8,6 @@ os::test::junit::declare_suite_start "cmd/completions"
 # test completion command help
 os::cmd::expect_success_and_text "oc completion -h" "prints shell code"
 os::cmd::expect_success_and_text "openshift completion -h" "prints shell code"
-os::cmd::expect_success_and_text "oadm completion -h" "prints shell code"
 # test completion command output
 os::cmd::expect_failure_and_text "oc completion" "Shell not specified."
 os::cmd::expect_success "oc completion bash"
@@ -19,11 +18,6 @@ os::cmd::expect_failure_and_text "openshift completion" "Shell not specified."
 os::cmd::expect_success "openshift completion bash"
 os::cmd::expect_success "openshift completion zsh"
 os::cmd::expect_failure_and_text "openshift completion test_shell" 'Unsupported shell type "test_shell"'
-# test completion command for oadm
-os::cmd::expect_failure_and_text "oadm completion" "Shell not specified."
-os::cmd::expect_success "oadm completion bash"
-os::cmd::expect_success "oadm completion zsh"
-os::cmd::expect_failure_and_text "oadm completion test_shell" 'Unsupported shell type "test_shell"'
 echo "oc completion: ok"
 
 os::test::junit::declare_suite_end
diff --git a/test/cmd/help.sh b/test/cmd/help.sh
diff --git a/test/end-to-end/core.sh b/test/end-to-end/core.sh
diff --git a/test/extended/setup.sh b/test/extended/setup.sh
diff --git a/tools/gendocs/gen_openshift_docs.go b/tools/gendocs/gen_openshift_docs.go
diff --git a/tools/genman/gen_man.go b/tools/genman/gen_man.go
