Merge pull request #22915 from deads2k/move-01

move easy packages
openshift · May 28, 2019 · d9bc220 · d9bc220
2 parents 9e7fb52 + 81004ce
commit d9bc220
Show file tree

Hide file tree

Showing 74 changed files with 62 additions and 789 deletions.
diff --git a/hack/find-leaves.sh b/hack/find-leaves.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# this is all the dependencies we have
+#go list -f '{{.Deps}}'  github.com/openshift/origin/pkg/cmd/openshift-apiserver | xargs -n 1 echo | grep 'github.com/openshift/origin' | grep -v 'github.com/openshift/origin/vendor' | sort
+all_packages=$(go list -f '{{.Deps}}' $1 | xargs -n 1 echo | grep 'github.com/openshift/origin' | grep -v 'github.com/openshift/origin/vendor' | sort)
+
+for package in ${all_packages}
+do
+    curr_packages=$(go list -f '{{.Deps}}'  ${package} | xargs -n 1 echo | grep 'github.com/openshift/origin' | grep -v 'github.com/openshift/origin/vendor' | sort)
+    if [ -z "${curr_packages}" ]
+    then
+        echo "${package} should move"
+    else
+        echo "${package} has deps"
+    fi
+done
diff --git a/hack/import-restrictions.json b/hack/import-restrictions.json
@@ -431,7 +431,6 @@
       "github.com/openshift/origin/pkg/cmd/server/apis/config/install",
       "github.com/openshift/origin/pkg/cmd/server/apis/config/latest",
       "github.com/openshift/origin/pkg/serviceaccounts/oauthclient",
-      "github.com/openshift/origin/pkg/util/http/links",
       "github.com/openshift/origin/pkg/util/httprequest"
     ]
   },
@@ -566,13 +565,9 @@
       "github.com/openshift/origin/pkg/unidling/util",
       "github.com/openshift/origin/pkg/user/apis/user/install",
       "github.com/openshift/origin/pkg/util",
-      "github.com/openshift/origin/pkg/util/docker/dockerfile",
-      "github.com/openshift/origin/pkg/util/dot",
       "github.com/openshift/origin/pkg/util/errors",
-      "github.com/openshift/origin/pkg/util/fsnotification",
       "github.com/openshift/origin/pkg/util/netutils",
       "github.com/openshift/origin/pkg/util/parallel",
-      "github.com/openshift/origin/pkg/util/portutils",
       "github.com/openshift/origin/pkg/version",
 
       "vendor/github.com/openshift/library-go/pkg/image/reference",
@@ -586,6 +581,7 @@
       "vendor/k8s.io/kubernetes/pkg/controller",
       "vendor/k8s.io/kubernetes/pkg/controller/deployment/util",
       "vendor/k8s.io/kubernetes/pkg/credentialprovider",
+      "vendor/github.com/pkg/errors",
 
       "vendor/github.com/openshift/library-go/pkg/git"
     ]

diff --git a/pkg/util/rankedset/rankedset.go → ...thentication/oauth/rankedset/rankedset.go b/pkg/util/rankedset/rankedset.go → ...thentication/oauth/rankedset/rankedset.go
diff --git a/pkg/util/rankedset/rankedset_test.go → ...ication/oauth/rankedset/rankedset_test.go b/pkg/util/rankedset/rankedset_test.go → ...ication/oauth/rankedset/rankedset_test.go
diff --git a/pkg/apiserver/authentication/oauth/timeoutvalidator.go b/pkg/apiserver/authentication/oauth/timeoutvalidator.go
@@ -15,7 +15,7 @@ import (
 	userv1 "github.com/openshift/api/user/v1"
 	oauthclient "github.com/openshift/client-go/oauth/clientset/versioned/typed/oauth/v1"
 	oauthclientlister "github.com/openshift/client-go/oauth/listers/oauth/v1"
-	"github.com/openshift/origin/pkg/util/rankedset"
+	"github.com/openshift/origin/pkg/apiserver/authentication/oauth/rankedset"
 )
 
 var errTimedout = errors.New("token timed out")

diff --git a/pkg/apps/apiserver/registry/deploylog/rest.go b/pkg/apps/apiserver/registry/deploylog/rest.go
@@ -29,7 +29,7 @@ import (
 	"github.com/openshift/api/apps"
 	appsv1 "github.com/openshift/api/apps/v1"
 	appsclient "github.com/openshift/client-go/apps/clientset/versioned/typed/apps/v1"
-	apiserverrest "github.com/openshift/origin/pkg/apiserver/rest"
+	apiserverrest "github.com/openshift/openshift-apiserver/pkg/apiserver/rest"
 	appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	"github.com/openshift/origin/pkg/apps/apis/apps/validation"
 	appsutil "github.com/openshift/origin/pkg/apps/util"

diff --git a/pkg/authorization/apiserver/registry/clusterrole/proxy.go b/pkg/authorization/apiserver/registry/clusterrole/proxy.go
@@ -12,11 +12,11 @@ import (
 	"k8s.io/kubernetes/pkg/printers"
 	printerstorage "k8s.io/kubernetes/pkg/printers/storage"
 
+	authclient "github.com/openshift/openshift-apiserver/pkg/client/impersonatingclient"
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
+	utilregistry "github.com/openshift/origin/pkg/authorization/apiserver/registry/registry"
 	"github.com/openshift/origin/pkg/authorization/apiserver/registry/util"
-	authclient "github.com/openshift/origin/pkg/client/impersonatingclient"
 	printersinternal "github.com/openshift/origin/pkg/printers/internalversion"
-	utilregistry "github.com/openshift/origin/pkg/util/registry"
 )
 
 type REST struct {

diff --git a/pkg/authorization/apiserver/registry/clusterrolebinding/proxy.go b/pkg/authorization/apiserver/registry/clusterrolebinding/proxy.go
@@ -12,11 +12,11 @@ import (
 	"k8s.io/kubernetes/pkg/printers"
 	printerstorage "k8s.io/kubernetes/pkg/printers/storage"
 
+	authclient "github.com/openshift/openshift-apiserver/pkg/client/impersonatingclient"
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
+	utilregistry "github.com/openshift/origin/pkg/authorization/apiserver/registry/registry"
 	"github.com/openshift/origin/pkg/authorization/apiserver/registry/util"
-	authclient "github.com/openshift/origin/pkg/client/impersonatingclient"
 	printersinternal "github.com/openshift/origin/pkg/printers/internalversion"
-	utilregistry "github.com/openshift/origin/pkg/util/registry"
 )
 
 type REST struct {

diff --git a/pkg/util/registry/wrapper.go → ...on/apiserver/registry/registry/wrapper.go b/pkg/util/registry/wrapper.go → ...on/apiserver/registry/registry/wrapper.go
diff --git a/pkg/authorization/apiserver/registry/role/proxy.go b/pkg/authorization/apiserver/registry/role/proxy.go
@@ -14,11 +14,11 @@ import (
 	"k8s.io/kubernetes/pkg/printers"
 	printerstorage "k8s.io/kubernetes/pkg/printers/storage"
 
+	authclient "github.com/openshift/openshift-apiserver/pkg/client/impersonatingclient"
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
+	utilregistry "github.com/openshift/origin/pkg/authorization/apiserver/registry/registry"
 	"github.com/openshift/origin/pkg/authorization/apiserver/registry/util"
-	authclient "github.com/openshift/origin/pkg/client/impersonatingclient"
 	printersinternal "github.com/openshift/origin/pkg/printers/internalversion"
-	utilregistry "github.com/openshift/origin/pkg/util/registry"
 )
 
 type REST struct {

diff --git a/pkg/authorization/apiserver/registry/rolebinding/proxy.go b/pkg/authorization/apiserver/registry/rolebinding/proxy.go
@@ -14,11 +14,11 @@ import (
 	"k8s.io/kubernetes/pkg/printers"
 	printerstorage "k8s.io/kubernetes/pkg/printers/storage"
 
+	authclient "github.com/openshift/openshift-apiserver/pkg/client/impersonatingclient"
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
+	utilregistry "github.com/openshift/origin/pkg/authorization/apiserver/registry/registry"
 	"github.com/openshift/origin/pkg/authorization/apiserver/registry/util"
-	authclient "github.com/openshift/origin/pkg/client/impersonatingclient"
 	printersinternal "github.com/openshift/origin/pkg/printers/internalversion"
-	utilregistry "github.com/openshift/origin/pkg/util/registry"
 )
 
 type REST struct {

diff --git a/pkg/build/apiserver/admission/secretinjector/admission.go b/pkg/build/apiserver/admission/secretinjector/admission.go
@@ -14,10 +14,9 @@ import (
 	restclient "k8s.io/client-go/rest"
 	api "k8s.io/kubernetes/pkg/apis/core"
 
+	authclient "github.com/openshift/openshift-apiserver/pkg/client/impersonatingclient"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
-	authclient "github.com/openshift/origin/pkg/client/impersonatingclient"
 	oadmission "github.com/openshift/origin/pkg/cmd/server/admission"
-	"github.com/openshift/origin/pkg/util/urlpattern"
 )
 
 func Register(plugins *admission.Plugins) {
@@ -76,7 +75,7 @@ func (si *secretInjector) admit(attr admission.Attributes, mutationAllowed bool)
 		return nil
 	}
 
-	patterns := []*urlpattern.URLPattern{}
+	patterns := []*URLPattern{}
 	for _, secret := range secrets.Items {
 		if secret.Type == corev1.SecretTypeBasicAuth && url.Scheme == "ssh" ||
 			secret.Type == corev1.SecretTypeSSHAuth && url.Scheme != "ssh" {
@@ -90,7 +89,7 @@ func (si *secretInjector) admit(attr admission.Attributes, mutationAllowed bool)
 					continue
 				}
 
-				pattern, err := urlpattern.NewURLPattern(v)
+				pattern, err := NewURLPattern(v)
 				if err != nil {
 					klog.V(2).Infof(`secretinjector: buildconfig "%s/%s": unparseable annotation %q: %v`, namespace, bc.GetName(), k, err)
 					continue
@@ -102,7 +101,7 @@ func (si *secretInjector) admit(attr admission.Attributes, mutationAllowed bool)
 		}
 	}
 
-	if match := urlpattern.Match(patterns, url); match != nil {
+	if match := Match(patterns, url); match != nil {
 		secretName := match.Cookie.(string)
 		klog.V(4).Infof(`secretinjector: matched secret "%s/%s" to buildconfig "%s"`, namespace, secretName, bc.GetName())
 		if mutationAllowed {

diff --git a/pkg/util/urlpattern/urlpattern.go → ...er/admission/secretinjector/urlpattern.go b/pkg/util/urlpattern/urlpattern.go → ...er/admission/secretinjector/urlpattern.go
@@ -1,4 +1,4 @@
-package urlpattern
+package secretinjector
 
 import (
 	"errors"

diff --git a/pkg/util/urlpattern/urlpattern_test.go → ...mission/secretinjector/urlpattern_test.go b/pkg/util/urlpattern/urlpattern_test.go → ...mission/secretinjector/urlpattern_test.go
@@ -1,4 +1,4 @@
-package urlpattern
+package secretinjector
 
 import (
 	"net/url"

diff --git a/pkg/build/apiserver/registry/buildlog/rest.go b/pkg/build/apiserver/registry/buildlog/rest.go
@@ -24,7 +24,7 @@ import (
 	"github.com/openshift/api/build"
 	buildv1 "github.com/openshift/api/build/v1"
 	buildtypedclient "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
-	apiserverrest "github.com/openshift/origin/pkg/apiserver/rest"
+	apiserverrest "github.com/openshift/openshift-apiserver/pkg/apiserver/rest"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	buildinternalhelpers "github.com/openshift/origin/pkg/build/apis/build/internal_helpers"
 	"github.com/openshift/origin/pkg/build/apis/build/validation"

diff --git a/pkg/image/apis/image/validation/whitelist/whitelister.go b/pkg/image/apis/image/validation/whitelist/whitelister.go
@@ -13,7 +13,6 @@ import (
 
 	openshiftcontrolplanev1 "github.com/openshift/api/openshiftcontrolplane/v1"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
-	stringsutil "github.com/openshift/origin/pkg/util/strings"
 )
 
 // WhitelistTransport says whether the associated registry host shall be treated as secure or insecure.
@@ -157,7 +156,7 @@ func (rw *registryWhitelister) AdmitDockerImageReference(ref *imageapi.DockerIma
 
 	matchHost := func(h string) bool {
 		for _, hp := range rw.whitelist {
-			if stringsutil.IsWildcardMatch(h, hp.host) {
+			if IsWildcardMatch(h, hp.host) {
 				if len(port) == 0 {
 					switch hp.port {
 					case "80", "443", "*":
@@ -166,7 +165,7 @@ func (rw *registryWhitelister) AdmitDockerImageReference(ref *imageapi.DockerIma
 						continue
 					}
 				}
-				if stringsutil.IsWildcardMatch(port, hp.port) {
+				if IsWildcardMatch(port, hp.port) {
 					return true
 				}
 			}

diff --git a/pkg/util/strings/wildcard.go → ...is/image/validation/whitelist/wildcard.go b/pkg/util/strings/wildcard.go → ...is/image/validation/whitelist/wildcard.go
@@ -1,4 +1,4 @@
-package strings
+package whitelist
 
 // IsWildcardMatch matches the given input string against the provided pattern. The
 // pattern might contain '?' and '*' wildcards.

diff --git a/pkg/util/strings/wildcard_test.go → ...age/validation/whitelist/wildcard_test.go b/pkg/util/strings/wildcard_test.go → ...age/validation/whitelist/wildcard_test.go
@@ -1,4 +1,4 @@
-package strings
+package whitelist
 
 import "testing"
 

diff --git a/pkg/network/node/healthcheck.go b/pkg/network/node/healthcheck.go
@@ -4,12 +4,11 @@ import (
 	"fmt"
 	"time"
 
-	"k8s.io/klog"
-
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	utilwait "k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/klog"
 
-	"github.com/openshift/origin/pkg/util/ovs/ovsclient"
+	"github.com/openshift/origin/pkg/network/node/ovs/ovsclient"
 )
 
 const (

diff --git a/pkg/network/node/metrics.go b/pkg/network/node/metrics.go
@@ -12,10 +12,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/openshift/origin/pkg/util/ovs"
 	"github.com/prometheus/client_golang/prometheus"
 
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+
+	"github.com/openshift/origin/pkg/network/node/ovs"
 )
 
 const (

diff --git a/pkg/network/node/node.go b/pkg/network/node/node.go
@@ -40,8 +40,8 @@ import (
 	"github.com/openshift/origin/pkg/network"
 	"github.com/openshift/origin/pkg/network/common"
 	"github.com/openshift/origin/pkg/network/node/cniserver"
+	"github.com/openshift/origin/pkg/network/node/ovs"
 	"github.com/openshift/origin/pkg/util/netutils"
-	"github.com/openshift/origin/pkg/util/ovs"
 )
 
 const hostLocalDataDir = "/var/lib/cni/networks"

diff --git a/pkg/util/ovs/OWNERS → pkg/network/node/ovs/OWNERS b/pkg/util/ovs/OWNERS → pkg/network/node/ovs/OWNERS
diff --git a/pkg/util/ovs/doc.go → pkg/network/node/ovs/doc.go b/pkg/util/ovs/doc.go → pkg/network/node/ovs/doc.go
diff --git a/pkg/util/ovs/fake_ovs.go → pkg/network/node/ovs/fake_ovs.go b/pkg/util/ovs/fake_ovs.go → pkg/network/node/ovs/fake_ovs.go
diff --git a/pkg/util/ovs/fake_ovs_test.go → pkg/network/node/ovs/fake_ovs_test.go b/pkg/util/ovs/fake_ovs_test.go → pkg/network/node/ovs/fake_ovs_test.go
diff --git a/pkg/util/ovs/ovs.go → pkg/network/node/ovs/ovs.go b/pkg/util/ovs/ovs.go → pkg/network/node/ovs/ovs.go
diff --git a/pkg/util/ovs/ovs_test.go → pkg/network/node/ovs/ovs_test.go b/pkg/util/ovs/ovs_test.go → pkg/network/node/ovs/ovs_test.go
diff --git a/pkg/util/ovs/ovsclient/ovsclient.go → pkg/network/node/ovs/ovsclient/ovsclient.go b/pkg/util/ovs/ovsclient/ovsclient.go → pkg/network/node/ovs/ovsclient/ovsclient.go
diff --git a/pkg/util/ovs/parse.go → pkg/network/node/ovs/parse.go b/pkg/util/ovs/parse.go → pkg/network/node/ovs/parse.go
diff --git a/pkg/util/ovs/parse_test.go → pkg/network/node/ovs/parse_test.go b/pkg/util/ovs/parse_test.go → pkg/network/node/ovs/parse_test.go
diff --git a/pkg/network/node/ovscontroller.go b/pkg/network/node/ovscontroller.go
@@ -14,7 +14,7 @@ import (
 
 	networkapi "github.com/openshift/api/network/v1"
 	"github.com/openshift/origin/pkg/network/common"
-	"github.com/openshift/origin/pkg/util/ovs"
+	"github.com/openshift/origin/pkg/network/node/ovs"
 
 	corev1 "k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"

diff --git a/pkg/network/node/ovscontroller_test.go b/pkg/network/node/ovscontroller_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	networkapi "github.com/openshift/api/network/v1"
-	"github.com/openshift/origin/pkg/util/ovs"
+	"github.com/openshift/origin/pkg/network/node/ovs"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/network/node/vxlan_monitor.go b/pkg/network/node/vxlan_monitor.go
@@ -15,7 +15,7 @@ import (
 	utilwait "k8s.io/apimachinery/pkg/util/wait"
 
 	"github.com/openshift/origin/pkg/network/common"
-	"github.com/openshift/origin/pkg/util/ovs"
+	"github.com/openshift/origin/pkg/network/node/ovs"
 )
 
 // egressVXLANMonitor monitors the health of automatic egress IPs by periodically checking

diff --git a/pkg/network/node/vxlan_monitor_test.go b/pkg/network/node/vxlan_monitor_test.go
@@ -5,7 +5,7 @@ package node
 import (
 	"testing"
 
-	"github.com/openshift/origin/pkg/util/ovs"
+	"github.com/openshift/origin/pkg/network/node/ovs"
 )
 
 func packetsIn(ovsif ovs.Interface, counts map[string]int, nodeIP string) {

diff --git a/pkg/oauthserver/oauth/external/github/github.go b/pkg/oauthserver/oauth/external/github/github.go
@@ -14,7 +14,7 @@ import (
 
 	authapi "github.com/openshift/origin/pkg/oauthserver/api"
 	"github.com/openshift/origin/pkg/oauthserver/oauth/external"
-	"github.com/openshift/origin/pkg/util/http/links"
+	"github.com/openshift/origin/pkg/oauthserver/oauth/external/github/links"
 )
 
 const (

diff --git a/pkg/util/http/links/links.go → ...rver/oauth/external/github/links/links.go b/pkg/util/http/links/links.go → ...rver/oauth/external/github/links/links.go
diff --git a/pkg/util/http/links/links_test.go → ...oauth/external/github/links/links_test.go b/pkg/util/http/links/links_test.go → ...oauth/external/github/links/links_test.go
diff --git a/pkg/util/fsnotification/doc.go → pkg/oc/cli/rsync/fsnotification/doc.go b/pkg/util/fsnotification/doc.go → pkg/oc/cli/rsync/fsnotification/doc.go
diff --git a/pkg/util/fsnotification/fsnotification.go → ...li/rsync/fsnotification/fsnotification.go b/pkg/util/fsnotification/fsnotification.go → ...li/rsync/fsnotification/fsnotification.go
diff --git a/pkg/oc/cli/rsync/rsync.go b/pkg/oc/cli/rsync/rsync.go
@@ -17,7 +17,7 @@ import (
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/util/templates"
 
-	"github.com/openshift/origin/pkg/util/fsnotification"
+	"github.com/openshift/origin/pkg/oc/cli/rsync/fsnotification"
 )
 
 const (

diff --git a/pkg/oc/cli/status/status.go b/pkg/oc/cli/status/status.go
@@ -20,7 +20,7 @@ import (
 	routev1client "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
 	loginutil "github.com/openshift/oc/pkg/helpers/project"
 	"github.com/openshift/origin/pkg/oc/lib/describe"
-	dotutil "github.com/openshift/origin/pkg/util/dot"
+	dotutil "github.com/openshift/origin/pkg/oc/lib/dot"
 )
 
 // StatusRecommendedName is the recommended command name.

diff --git a/pkg/oc/lib/describe/chaindescriber.go b/pkg/oc/lib/describe/chaindescriber.go
@@ -15,12 +15,12 @@ import (
 
 	imagev1 "github.com/openshift/api/image/v1"
 	buildv1client "github.com/openshift/client-go/build/clientset/versioned/typed/build/v1"
+	dotutil "github.com/openshift/origin/pkg/oc/lib/dot"
 	buildedges "github.com/openshift/origin/pkg/oc/lib/graph/buildgraph"
 	buildanalysis "github.com/openshift/origin/pkg/oc/lib/graph/buildgraph/analysis"
 	buildgraph "github.com/openshift/origin/pkg/oc/lib/graph/buildgraph/nodes"
 	osgraph "github.com/openshift/origin/pkg/oc/lib/graph/genericgraph"
 	imagegraph "github.com/openshift/origin/pkg/oc/lib/graph/imagegraph/nodes"
-	dotutil "github.com/openshift/origin/pkg/util/dot"
 	"github.com/openshift/origin/pkg/util/parallel"
 )
 

diff --git a/pkg/util/dot/dot.go → pkg/oc/lib/dot/dot.go b/pkg/util/dot/dot.go → pkg/oc/lib/dot/dot.go
diff --git a/pkg/util/dot/dot_test.go → pkg/oc/lib/dot/dot_test.go b/pkg/util/dot/dot_test.go → pkg/oc/lib/dot/dot_test.go
diff --git a/pkg/oc/lib/newapp/app/imageref.go b/pkg/oc/lib/newapp/app/imageref.go
@@ -20,8 +20,8 @@ import (
 	"github.com/openshift/origin/pkg/api/apihelpers"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	imageutil "github.com/openshift/origin/pkg/image/util"
-	"github.com/openshift/origin/pkg/util/docker/dockerfile"
-	"github.com/openshift/origin/pkg/util/portutils"
+	"github.com/openshift/origin/pkg/oc/lib/newapp/docker/dockerfile"
+	"github.com/openshift/origin/pkg/oc/lib/newapp/portutils"
 )
 
 // ImageRefGenerator is an interface for generating ImageRefs

diff --git a/pkg/oc/lib/newapp/app/pipeline.go b/pkg/oc/lib/newapp/app/pipeline.go
@@ -29,8 +29,8 @@ import (
 	"github.com/openshift/origin/pkg/api/legacy"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	"github.com/openshift/origin/pkg/oc/lib/newapp"
+	"github.com/openshift/origin/pkg/oc/lib/newapp/docker/dockerfile"
 	routeapi "github.com/openshift/origin/pkg/route/apis/route"
-	"github.com/openshift/origin/pkg/util/docker/dockerfile"
 )
 
 // A PipelineBuilder creates Pipeline instances.

diff --git a/pkg/oc/lib/newapp/appjson/appjson.go b/pkg/oc/lib/newapp/appjson/appjson.go
@@ -21,7 +21,7 @@ import (
 	templatev1 "github.com/openshift/api/template/v1"
 	"github.com/openshift/origin/pkg/oc/lib/newapp"
 	"github.com/openshift/origin/pkg/oc/lib/newapp/app"
-	"github.com/openshift/origin/pkg/util/docker/dockerfile"
+	"github.com/openshift/origin/pkg/oc/lib/newapp/docker/dockerfile"
 )
 
 type EnvVarOrString struct {

diff --git a/pkg/oc/lib/newapp/cmd/describe.go b/pkg/oc/lib/newapp/cmd/describe.go
@@ -17,7 +17,7 @@ import (
 	"github.com/openshift/origin/pkg/oc/lib/describe"
 	"github.com/openshift/origin/pkg/oc/lib/newapp"
 	"github.com/openshift/origin/pkg/oc/lib/newapp/app"
-	"github.com/openshift/origin/pkg/util/portutils"
+	"github.com/openshift/origin/pkg/oc/lib/newapp/portutils"
 )
 
 func displayName(meta metav1.ObjectMeta) string {

diff --git a/pkg/oc/lib/newapp/cmd/resolve.go b/pkg/oc/lib/newapp/cmd/resolve.go
@@ -11,7 +11,7 @@ import (
 	"github.com/openshift/library-go/pkg/git"
 	"github.com/openshift/origin/pkg/oc/lib/newapp"
 	"github.com/openshift/origin/pkg/oc/lib/newapp/app"
-	dockerfileutil "github.com/openshift/origin/pkg/util/docker/dockerfile"
+	dockerfileutil "github.com/openshift/origin/pkg/oc/lib/newapp/docker/dockerfile"
 )
 
 // Resolvers are used to identify source repositories, images, or templates in different contexts

diff --git a/pkg/util/docker/doc.go → pkg/oc/lib/newapp/docker/doc.go b/pkg/util/docker/doc.go → pkg/oc/lib/newapp/docker/doc.go
diff --git a/pkg/util/docker/dockerfile/doc.go → pkg/oc/lib/newapp/docker/dockerfile/doc.go b/pkg/util/docker/dockerfile/doc.go → pkg/oc/lib/newapp/docker/dockerfile/doc.go
diff --git a/pkg/util/docker/dockerfile/dockerfile.go → ...ib/newapp/docker/dockerfile/dockerfile.go b/pkg/util/docker/dockerfile/dockerfile.go → ...ib/newapp/docker/dockerfile/dockerfile.go
diff --git a/...util/docker/dockerfile/dockerfile_test.go → ...wapp/docker/dockerfile/dockerfile_test.go b/...util/docker/dockerfile/dockerfile_test.go → ...wapp/docker/dockerfile/dockerfile_test.go
diff --git a/pkg/util/docker/dockerfile/instructions.go → .../newapp/docker/dockerfile/instructions.go b/pkg/util/docker/dockerfile/instructions.go → .../newapp/docker/dockerfile/instructions.go
diff --git a/...il/docker/dockerfile/instructions_test.go → ...pp/docker/dockerfile/instructions_test.go b/...il/docker/dockerfile/instructions_test.go → ...pp/docker/dockerfile/instructions_test.go
diff --git a/pkg/util/docker/dockerfile/shell_parser.go → .../newapp/docker/dockerfile/shell_parser.go b/pkg/util/docker/dockerfile/shell_parser.go → .../newapp/docker/dockerfile/shell_parser.go
diff --git a/pkg/util/portutils/common.go → pkg/oc/lib/newapp/portutils/common.go b/pkg/util/portutils/common.go → pkg/oc/lib/newapp/portutils/common.go
diff --git a/pkg/util/portutils/common_test.go → pkg/oc/lib/newapp/portutils/common_test.go b/pkg/util/portutils/common_test.go → pkg/oc/lib/newapp/portutils/common_test.go
diff --git a/pkg/util/stringreplace/object.go → pkg/template/templateprocessing/object.go b/pkg/util/stringreplace/object.go → pkg/template/templateprocessing/object.go
@@ -1,4 +1,4 @@
-package stringreplace
+package templateprocessing
 
 import (
 	"encoding/json"

diff --git a/pkg/util/stringreplace/object_test.go → ...emplate/templateprocessing/object_test.go b/pkg/util/stringreplace/object_test.go → ...emplate/templateprocessing/object_test.go
@@ -1,4 +1,4 @@
-package stringreplace
+package templateprocessing
 
 import (
 	"fmt"