Merge pull request #15473 from deads2k/oc-01-split

Automatic merge from submit-queue

start pkg/oc

This does a bulk move of low fanout packages to `pkg/oc` so that we can start snipping unnecessary links, clean-up owner/approver files, and start working our way towards a separate `oc`.

This has the biggest impact on @fabianofranz and @juanvallejo, but I think it is a net-win for them.

@bparees @csrwng I moved `pkg/bootstrap` under `pkg/oc` where it gets included, but I kept and tidied the existing owners file.  You won't get bombarded with reviews for general CLI changes.

@smarterclayton we've talked about this direction.  I see this as a first step towards separating `oc` with minimal disruption so far.

Author: openshift-merge-robot

cmd/oc/oc.go

@@ -9,8 +9,8 @@ import (
 
 	"k8s.io/kubernetes/pkg/util/logs"
 
-	"github.com/openshift/origin/pkg/cmd/cli"
 	"github.com/openshift/origin/pkg/cmd/util/serviceability"
+	"github.com/openshift/origin/pkg/oc/cli"
 
 	// install all APIs
 	_ "github.com/openshift/origin/pkg/api/install"

hack/lib/build/binaries.sh

@@ -509,7 +509,7 @@ function os::build::ldflags() {
 
   declare -a ldflags=()
 
-  ldflags+=($(os::build::ldflag "${OS_GO_PACKAGE}/pkg/bootstrap/docker.defaultImageStreams" "${OS_BUILD_LDFLAGS_DEFAULT_IMAGE_STREAMS}"))
+  ldflags+=($(os::build::ldflag "${OS_GO_PACKAGE}/pkg/oc/bootstrap/docker.defaultImageStreams" "${OS_BUILD_LDFLAGS_DEFAULT_IMAGE_STREAMS}"))
   ldflags+=($(os::build::ldflag "${OS_GO_PACKAGE}/pkg/cmd/util/variable.DefaultImagePrefix" "${OS_BUILD_LDFLAGS_IMAGE_PREFIX}"))
   ldflags+=($(os::build::ldflag "${OS_GO_PACKAGE}/pkg/version.majorFromGit" "${OS_GIT_MAJOR}"))
   ldflags+=($(os::build::ldflag "${OS_GO_PACKAGE}/pkg/version.minorFromGit" "${OS_GIT_MINOR}"))

hack/lib/util/misc.sh

@@ -222,7 +222,7 @@ function os::util::list_go_src_files() {
 		-o -wholename './.*' \
 		-o -wholename './pkg/assets/bindata.go' \
 		-o -wholename './pkg/assets/*/bindata.go' \
-		-o -wholename './pkg/bootstrap/bindata.go' \
+		-o -wholename './pkg/oc/bootstrap/bindata.go' \
 		-o -wholename './openshift.local.*' \
 		-o -wholename './test/extended/testdata/bindata.go' \
 		-o -wholename '*/vendor/*' \

hack/update-generated-bindata.sh

@@ -17,7 +17,7 @@ pushd "${OS_ROOT}" > /dev/null
     -nometadata \
     -prefix "bootstrap" \
     -pkg "bootstrap" \
-    -o "${OUTPUT_PARENT}/pkg/bootstrap/bindata.go" \
+    -o "${OUTPUT_PARENT}/pkg/oc/bootstrap/bindata.go" \
     -ignore "OWNERS" \
     -ignore "README.md" \
     -ignore ".*\.go$" \

hack/verify-generated-bindata.sh

@@ -15,7 +15,7 @@ fi
 
 echo "Diffing current bootstrap bindata against freshly generated bindata"
 ret=0
-diff -Naup "${OS_ROOT}/pkg/bootstrap/bindata.go" "${TMP_GENERATED_BOOTSTRAP_DIR}/pkg/bootstrap/bindata.go" || ret=$?
+diff -Naup "${OS_ROOT}/pkg/oc/bootstrap/bindata.go" "${TMP_GENERATED_BOOTSTRAP_DIR}/pkg/oc/bootstrap/bindata.go" || ret=$?
 if [[ $ret -eq 0 ]]
 then
   echo "SUCCESS: Generated bootstrap bindata up to date."

pkg/build/generator/generator.go

@@ -20,9 +20,9 @@ import (
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	buildapiv1 "github.com/openshift/origin/pkg/build/apis/build/v1"
 	buildutil "github.com/openshift/origin/pkg/build/util"
-	"github.com/openshift/origin/pkg/cmd/admin/policy"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
+	"github.com/openshift/origin/pkg/oc/admin/policy"
 	"github.com/openshift/origin/pkg/util/namer"
 )
 

pkg/cmd/infra/builder/builder.go

@@ -8,8 +8,8 @@ import (
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/build/builder/cmd"
-	ocmd "github.com/openshift/origin/pkg/cmd/cli/cmd"
 	"github.com/openshift/origin/pkg/cmd/templates"
+	ocmd "github.com/openshift/origin/pkg/oc/cli/cmd"
 )
 
 var (

pkg/cmd/infra/deployer/deployer.go

@@ -18,14 +18,14 @@ import (
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
 	"github.com/openshift/origin/pkg/client"
-	ocmd "github.com/openshift/origin/pkg/cmd/cli/cmd"
 	"github.com/openshift/origin/pkg/cmd/templates"
 	"github.com/openshift/origin/pkg/cmd/util"
 	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
 	"github.com/openshift/origin/pkg/deploy/strategy"
 	"github.com/openshift/origin/pkg/deploy/strategy/recreate"
 	"github.com/openshift/origin/pkg/deploy/strategy/rolling"
 	deployutil "github.com/openshift/origin/pkg/deploy/util"
+	ocmd "github.com/openshift/origin/pkg/oc/cli/cmd"
 )
 
 var (

pkg/cmd/infra/router/f5.go

@@ -11,10 +11,10 @@ import (
 
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	ocmd "github.com/openshift/origin/pkg/cmd/cli/cmd"
 	"github.com/openshift/origin/pkg/cmd/templates"
 	"github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
+	ocmd "github.com/openshift/origin/pkg/oc/cli/cmd"
 	projectinternalclientset "github.com/openshift/origin/pkg/project/generated/internalclientset"
 	routeapi "github.com/openshift/origin/pkg/route/apis/route"
 	routeinternalclientset "github.com/openshift/origin/pkg/route/generated/internalclientset"

pkg/cmd/infra/router/template.go

@@ -19,10 +19,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	ocmd "github.com/openshift/origin/pkg/cmd/cli/cmd"
 	"github.com/openshift/origin/pkg/cmd/templates"
 	"github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
+	ocmd "github.com/openshift/origin/pkg/oc/cli/cmd"
 	projectinternalclientset "github.com/openshift/origin/pkg/project/generated/internalclientset"
 	routeinternalclientset "github.com/openshift/origin/pkg/route/generated/internalclientset"
 	"github.com/openshift/origin/pkg/router"