Rename pkg/deploy -> pkg/apps

cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/hack/update-generated-clientsets.sh

@@ -9,7 +9,7 @@ os::util::ensure::built_binary_exists 'client-gen' 'vendor/k8s.io/kubernetes/cmd
 packages=(
   github.com/openshift/origin/pkg/authorization
   github.com/openshift/origin/pkg/build
-  github.com/openshift/origin/pkg/deploy
+  github.com/openshift/origin/pkg/apps
   github.com/openshift/origin/pkg/image
   github.com/openshift/origin/pkg/oauth
   github.com/openshift/origin/pkg/project

cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/hack/update-generated-informers.sh

@@ -9,7 +9,7 @@ os::util::ensure::built_binary_exists 'geninformers'
 packages=(
   github.com/openshift/origin/pkg/authorization
   github.com/openshift/origin/pkg/build
-  github.com/openshift/origin/pkg/deploy
+  github.com/openshift/origin/pkg/apps
   github.com/openshift/origin/pkg/image
   github.com/openshift/origin/pkg/oauth
   github.com/openshift/origin/pkg/project

cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/hack/update-generated-listers.sh

@@ -9,7 +9,7 @@ os::util::ensure::built_binary_exists 'genlisters'
 packages=(
   github.com/openshift/origin/pkg/authorization
   github.com/openshift/origin/pkg/build
-  github.com/openshift/origin/pkg/deploy
+  github.com/openshift/origin/pkg/apps
   github.com/openshift/origin/pkg/image
   github.com/openshift/origin/pkg/oauth
   github.com/openshift/origin/pkg/project

examples/examples_test.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/openshift/origin/pkg/api/validation"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	networkapi "github.com/openshift/origin/pkg/network/apis/network"
 	projectapi "github.com/openshift/origin/pkg/project/apis/project"

hack/import-restrictions.json

@@ -107,8 +107,8 @@
 
   {
     "checkedPackages": [
-      "github.com/openshift/origin/pkg/deploy/apis/apps",
-      "github.com/openshift/origin/pkg/deploy/apis/apps/v1"
+      "github.com/openshift/origin/pkg/apps/apis/apps",
+      "github.com/openshift/origin/pkg/apps/apis/apps/v1"
     ],
     "allowedImportPackageRoots": [
       "vendor/k8s.io/apimachinery",
@@ -121,7 +121,7 @@
       "vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1",
       "vendor/k8s.io/kubernetes/pkg/api/helper",
       "vendor/k8s.io/kubernetes/pkg/api/install",
-      "github.com/openshift/origin/pkg/deploy/apis/apps/install",
+      "github.com/openshift/origin/pkg/apps/apis/apps/install",
       "github.com/openshift/origin/pkg/image/apis/image"
     ]
   },

hack/update-generated-clientsets.sh

@@ -9,7 +9,7 @@ os::util::ensure::built_binary_exists 'client-gen' 'vendor/k8s.io/kubernetes/sta
 packages=(
   github.com/openshift/origin/pkg/authorization/apis/authorization
   github.com/openshift/origin/pkg/build/apis/build
-  github.com/openshift/origin/pkg/deploy/apis/apps
+  github.com/openshift/origin/pkg/apps/apis/apps
   github.com/openshift/origin/pkg/image/apis/image
   github.com/openshift/origin/pkg/oauth/apis/oauth
   github.com/openshift/origin/pkg/project/apis/project

hack/update-generated-informers.sh

@@ -9,7 +9,7 @@ os::util::ensure::built_binary_exists 'informer-gen' 'vendor/k8s.io/kubernetes/s
 packages=(
   github.com/openshift/origin/pkg/authorization/apis/authorization
   github.com/openshift/origin/pkg/build/apis/build
-  github.com/openshift/origin/pkg/deploy/apis/apps
+  github.com/openshift/origin/pkg/apps/apis/apps
   github.com/openshift/origin/pkg/image/apis/image
   github.com/openshift/origin/pkg/oauth/apis/oauth
   github.com/openshift/origin/pkg/project/apis/project

hack/update-generated-listers.sh

@@ -9,7 +9,7 @@ os::util::ensure::built_binary_exists 'lister-gen' 'vendor/k8s.io/kubernetes/sta
 packages=(
   github.com/openshift/origin/pkg/authorization/apis/authorization
   github.com/openshift/origin/pkg/build/apis/build
-  github.com/openshift/origin/pkg/deploy/apis/apps
+  github.com/openshift/origin/pkg/apps/apis/apps
   github.com/openshift/origin/pkg/image/apis/image
   github.com/openshift/origin/pkg/oauth/apis/oauth
   github.com/openshift/origin/pkg/project/apis/project

pkg/api/graph/graphview/dc_pipeline.go

@@ -5,8 +5,8 @@ import (
 
 	osgraph "github.com/openshift/origin/pkg/api/graph"
 	kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"
-	deployedges "github.com/openshift/origin/pkg/deploy/graph"
-	deploygraph "github.com/openshift/origin/pkg/deploy/graph/nodes"
+	deployedges "github.com/openshift/origin/pkg/apps/graph"
+	deploygraph "github.com/openshift/origin/pkg/apps/graph/nodes"
 )
 
 type DeploymentConfigPipeline struct {

pkg/api/graph/graphview/service_group.go

@@ -10,7 +10,7 @@ import (
 	osgraph "github.com/openshift/origin/pkg/api/graph"
 	kubeedges "github.com/openshift/origin/pkg/api/kubegraph"
 	kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"
-	deploygraph "github.com/openshift/origin/pkg/deploy/graph/nodes"
+	deploygraph "github.com/openshift/origin/pkg/apps/graph/nodes"
 	routeedges "github.com/openshift/origin/pkg/route/graph"
 	routegraph "github.com/openshift/origin/pkg/route/graph/nodes"
 )

pkg/api/graph/graphview/veneering_test.go

@@ -17,9 +17,9 @@ import (
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	buildedges "github.com/openshift/origin/pkg/build/graph"
 	buildgraph "github.com/openshift/origin/pkg/build/graph/nodes"
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
-	deployedges "github.com/openshift/origin/pkg/deploy/graph"
-	deploygraph "github.com/openshift/origin/pkg/deploy/graph/nodes"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	deployedges "github.com/openshift/origin/pkg/apps/graph"
+	deploygraph "github.com/openshift/origin/pkg/apps/graph/nodes"
 	imageedges "github.com/openshift/origin/pkg/image/graph"
 )
 

pkg/api/graph/test/runtimeobject_nodebuilder.go

@@ -16,8 +16,8 @@ import (
 	kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	buildgraph "github.com/openshift/origin/pkg/build/graph/nodes"
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
-	deploygraph "github.com/openshift/origin/pkg/deploy/graph/nodes"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	deploygraph "github.com/openshift/origin/pkg/apps/graph/nodes"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	imagegraph "github.com/openshift/origin/pkg/image/graph/nodes"
 	routeapi "github.com/openshift/origin/pkg/route/apis/route"

pkg/api/install/install.go

@@ -22,7 +22,7 @@ import (
 	_ "github.com/openshift/origin/pkg/authorization/apis/authorization/install"
 	_ "github.com/openshift/origin/pkg/build/apis/build/install"
 	_ "github.com/openshift/origin/pkg/cmd/server/api/install"
-	_ "github.com/openshift/origin/pkg/deploy/apis/apps/install"
+	_ "github.com/openshift/origin/pkg/apps/apis/apps/install"
 	_ "github.com/openshift/origin/pkg/image/apis/image/install"
 	_ "github.com/openshift/origin/pkg/network/apis/network/install"
 	_ "github.com/openshift/origin/pkg/oauth/apis/oauth/install"
@@ -39,7 +39,7 @@ import (
 
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	oauthapi "github.com/openshift/origin/pkg/oauth/apis/oauth"
 	projectapi "github.com/openshift/origin/pkg/project/apis/project"
@@ -49,7 +49,7 @@ import (
 
 	authorizationv1 "github.com/openshift/origin/pkg/authorization/apis/authorization/v1"
 	buildv1 "github.com/openshift/origin/pkg/build/apis/build/v1"
-	deployv1 "github.com/openshift/origin/pkg/deploy/apis/apps/v1"
+	deployv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
 	imagev1 "github.com/openshift/origin/pkg/image/apis/image/v1"
 	oauthv1 "github.com/openshift/origin/pkg/oauth/apis/oauth/v1"
 	projectv1 "github.com/openshift/origin/pkg/project/apis/project/v1"

pkg/api/kubegraph/analysis/hpa.go

@@ -15,8 +15,8 @@ import (
 	"github.com/openshift/origin/pkg/api/kubegraph"
 	kubeedges "github.com/openshift/origin/pkg/api/kubegraph"
 	kubenodes "github.com/openshift/origin/pkg/api/kubegraph/nodes"
-	deploygraph "github.com/openshift/origin/pkg/deploy/graph"
-	deploynodes "github.com/openshift/origin/pkg/deploy/graph/nodes"
+	deploygraph "github.com/openshift/origin/pkg/apps/graph"
+	deploynodes "github.com/openshift/origin/pkg/apps/graph/nodes"
 )
 
 const (

pkg/api/kubegraph/analysis/hpa_test.go

@@ -7,7 +7,7 @@ import (
 	osgraph "github.com/openshift/origin/pkg/api/graph"
 	osgraphtest "github.com/openshift/origin/pkg/api/graph/test"
 	"github.com/openshift/origin/pkg/api/kubegraph"
-	deploygraph "github.com/openshift/origin/pkg/deploy/graph"
+	deploygraph "github.com/openshift/origin/pkg/apps/graph"
 )
 
 func TestHPAMissingCPUTargetError(t *testing.T) {

pkg/api/kubegraph/edge_test.go

@@ -16,9 +16,9 @@ import (
 
 	osgraph "github.com/openshift/origin/pkg/api/graph"
 	kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
-	_ "github.com/openshift/origin/pkg/deploy/apis/apps/install"
-	deploygraph "github.com/openshift/origin/pkg/deploy/graph/nodes"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	_ "github.com/openshift/origin/pkg/apps/apis/apps/install"
+	deploygraph "github.com/openshift/origin/pkg/apps/graph/nodes"
 )
 
 type objectifier interface {

pkg/api/kubegraph/edges.go

@@ -14,8 +14,8 @@ import (
 
 	osgraph "github.com/openshift/origin/pkg/api/graph"
 	kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
-	deploygraph "github.com/openshift/origin/pkg/deploy/graph/nodes"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	deploygraph "github.com/openshift/origin/pkg/apps/graph/nodes"
 )
 
 const (

pkg/api/meta/pods.go

@@ -17,8 +17,8 @@ import (
 	"k8s.io/kubernetes/pkg/apis/extensions"
 	extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
-	deployapiv1 "github.com/openshift/origin/pkg/deploy/apis/apps/v1"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	deployapiv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
 	securityapi "github.com/openshift/origin/pkg/security/apis/security"
 	securityapiv1 "github.com/openshift/origin/pkg/security/apis/security/v1"
 )

pkg/api/register.go

@@ -6,7 +6,7 @@ import (
 
 	_ "github.com/openshift/origin/pkg/authorization/apis/authorization"
 	_ "github.com/openshift/origin/pkg/build/apis/build"
-	_ "github.com/openshift/origin/pkg/deploy/apis/apps"
+	_ "github.com/openshift/origin/pkg/apps/apis/apps"
 	_ "github.com/openshift/origin/pkg/image/apis/image"
 	_ "github.com/openshift/origin/pkg/network/apis/network"
 	_ "github.com/openshift/origin/pkg/oauth/apis/oauth"

pkg/api/serialization_test.go

@@ -20,7 +20,7 @@ import (
 	_ "github.com/openshift/origin/pkg/api/latest"
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
 	build "github.com/openshift/origin/pkg/build/apis/build"
-	deploy "github.com/openshift/origin/pkg/deploy/apis/apps"
+	deploy "github.com/openshift/origin/pkg/apps/apis/apps"
 	image "github.com/openshift/origin/pkg/image/apis/image"
 	oauthapi "github.com/openshift/origin/pkg/oauth/apis/oauth"
 	route "github.com/openshift/origin/pkg/route/apis/route"

pkg/api/v1/register.go

@@ -3,7 +3,7 @@ package v1
 import (
 	_ "github.com/openshift/origin/pkg/authorization/apis/authorization/v1"
 	_ "github.com/openshift/origin/pkg/build/apis/build/v1"
-	_ "github.com/openshift/origin/pkg/deploy/apis/apps/v1"
+	_ "github.com/openshift/origin/pkg/apps/apis/apps/v1"
 	_ "github.com/openshift/origin/pkg/image/apis/image/v1"
 	_ "github.com/openshift/origin/pkg/network/apis/network/v1"
 	_ "github.com/openshift/origin/pkg/oauth/apis/oauth/v1"

pkg/api/validation/coverage_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/openshift/origin/pkg/api"
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	quotaapi "github.com/openshift/origin/pkg/quota/apis/quota"
 )

pkg/api/validation/register.go

@@ -3,7 +3,7 @@ package validation
 import (
 	authorizationvalidation "github.com/openshift/origin/pkg/authorization/apis/authorization/validation"
 	buildvalidation "github.com/openshift/origin/pkg/build/apis/build/validation"
-	deployvalidation "github.com/openshift/origin/pkg/deploy/apis/apps/validation"
+	deployvalidation "github.com/openshift/origin/pkg/apps/apis/apps/validation"
 	imagevalidation "github.com/openshift/origin/pkg/image/apis/image/validation"
 	sdnvalidation "github.com/openshift/origin/pkg/network/apis/network/validation"
 	oauthvalidation "github.com/openshift/origin/pkg/oauth/apis/oauth/validation"
@@ -17,7 +17,7 @@ import (
 
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	networkapi "github.com/openshift/origin/pkg/network/apis/network"
 	oauthapi "github.com/openshift/origin/pkg/oauth/apis/oauth"

pkg/deploy/apis/apps/install/apigroup.go → pkg/apps/apis/apps/install/apigroup.go

@@ -6,8 +6,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	kapi "k8s.io/kubernetes/pkg/api"
 
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
-	deployapiv1 "github.com/openshift/origin/pkg/deploy/apis/apps/v1"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	deployapiv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
 )
 
 func installApiGroup() {

pkg/deploy/apis/apps/install/install.go → pkg/apps/apis/apps/install/install.go

@@ -12,11 +12,11 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	kapi "k8s.io/kubernetes/pkg/api"
 
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
-	deployapiv1 "github.com/openshift/origin/pkg/deploy/apis/apps/v1"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	deployapiv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
 )
 
-const importPrefix = "github.com/openshift/origin/pkg/deploy/apis/apps"
+const importPrefix = "github.com/openshift/origin/pkg/apps/apis/apps"
 
 var accessor = meta.NewAccessor()
 

pkg/deploy/apis/apps/test/ok.go → pkg/apps/apis/apps/test/ok.go

@@ -9,8 +9,8 @@ import (
 	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
 
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
-	deployv1 "github.com/openshift/origin/pkg/deploy/apis/apps/v1"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	deployv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 )
 

pkg/deploy/apis/apps/v1/conversion.go → pkg/apps/apis/apps/v1/conversion.go

@@ -7,7 +7,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	newer "github.com/openshift/origin/pkg/deploy/apis/apps"
+	newer "github.com/openshift/origin/pkg/apps/apis/apps"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 )
 

pkg/deploy/apis/apps/v1/conversion_test.go → pkg/apps/apis/apps/v1/conversion_test.go

@@ -9,7 +9,7 @@ import (
 	kapi "k8s.io/kubernetes/pkg/api"
 	kapiv1 "k8s.io/kubernetes/pkg/api/v1"
 
-	newer "github.com/openshift/origin/pkg/deploy/apis/apps"
+	newer "github.com/openshift/origin/pkg/apps/apis/apps"
 )
 
 func TestTriggerRoundTrip(t *testing.T) {

pkg/deploy/apis/apps/v1/defaults.go → pkg/apps/apis/apps/v1/defaults.go

@@ -3,7 +3,7 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
 )
 
 // Applies defaults only for API group "apps.openshift.io" and not for the legacy API.

pkg/deploy/apis/apps/v1/defaults_test.go → pkg/apps/apis/apps/v1/defaults_test.go

@@ -13,9 +13,9 @@ import (
 	_ "k8s.io/kubernetes/pkg/api/install"
 	kapiv1 "k8s.io/kubernetes/pkg/api/v1"
 
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
-	_ "github.com/openshift/origin/pkg/deploy/apis/apps/install"
-	deployv1 "github.com/openshift/origin/pkg/deploy/apis/apps/v1"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	_ "github.com/openshift/origin/pkg/apps/apis/apps/install"
+	deployv1 "github.com/openshift/origin/pkg/apps/apis/apps/v1"
 )
 
 func mkintp(i int64) *int64 {

pkg/deploy/apis/apps/v1/doc.go → pkg/apps/apis/apps/v1/doc.go

@@ -1,5 +1,5 @@
 // +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=github.com/openshift/origin/pkg/deploy/apis/apps
+// +k8s:conversion-gen=github.com/openshift/origin/pkg/apps/apis/apps
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:openapi-gen=true
 

pkg/deploy/apis/apps/v1/zz_generated.conversion.go → pkg/apps/apis/apps/v1/zz_generated.conversion.go

@@ -5,7 +5,7 @@
 package v1
 
 import (
-	apps "github.com/openshift/origin/pkg/deploy/apis/apps"
+	apps "github.com/openshift/origin/pkg/apps/apis/apps"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"

pkg/deploy/apis/apps/validation/validation.go → pkg/apps/apis/apps/validation/validation.go

@@ -15,7 +15,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/validation"
 	kapivalidation "k8s.io/kubernetes/pkg/api/validation"
 
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	imageval "github.com/openshift/origin/pkg/image/apis/image/validation"
 )

pkg/deploy/apis/apps/validation/validation_test.go → pkg/apps/apis/apps/validation/validation_test.go

@@ -8,8 +8,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	kapi "k8s.io/kubernetes/pkg/api"
 
-	deployapi "github.com/openshift/origin/pkg/deploy/apis/apps"
-	"github.com/openshift/origin/pkg/deploy/apis/apps/test"
+	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
+	"github.com/openshift/origin/pkg/apps/apis/apps/test"
 )
 
 // Convenience methods