Merge pull request #22907 from mfojtik/tsb-to-staging

staging: move template-service-broker to staging

Author: openshift-merge-robot

cmd/template-service-broker/tsb.go

@@ -4,12 +4,8 @@
       "github.com/openshift/origin/pkg"
     ],
     "ignoredSubTrees": [
-      "github.com/openshift/origin/pkg/templateservicebroker",
       "github.com/openshift/origin/pkg/cmd/server/start"
     ],
-    "forbiddenImportPackageRoots": [
-      "github.com/openshift/origin/pkg/templateservicebroker"
-    ],
     "allowedImportPackageRoots": [
       "vendor",
       ""
@@ -403,38 +399,6 @@
     "allowedImportPackages": []
   },
 
-  {
-    "checkedPackageRoots": [
-      "github.com/openshift/origin/pkg/templateservicebroker"
-    ],
-    "allowedImportPackageRoots": [
-      "vendor/k8s.io/apimachinery",
-      "vendor/k8s.io/apiserver",
-      "vendor/k8s.io/client-go",
-      "vendor/github.com/spf13/cobra",
-      "vendor/golang.org",
-      "vendor/github.com/openshift/api",
-      "vendor/github.com/openshift/client-go",
-      "github.com/openshift/origin/pkg/template/servicebroker"
-    ],
-    "allowedImportPackages": [
-      "vendor/k8s.io/klog",
-      "vendor/k8s.io/api/core/v1",
-      "vendor/k8s.io/api/authorization/v1",
-      "vendor/k8s.io/kubernetes/pkg/apis/core",
-      "vendor/k8s.io/kubernetes/pkg/apis/core/install",
-      "vendor/github.com/emicklei/go-restful",
-      "vendor/github.com/lestrrat/go-jsschema",
-      "vendor/k8s.io/kube-aggregator/pkg/apiserver",
-      "vendor/k8s.io/kubernetes/pkg/controller",
-      "vendor/k8s.io/kubernetes/pkg/kubectl/cmd/util",
-      "github.com/openshift/origin/pkg/api",
-      "github.com/openshift/origin/pkg/template/apis/template",
-      "github.com/openshift/origin/pkg/template/apis/template/validation",
-      "github.com/openshift/origin/pkg/api/legacy"
-    ]
-  },
-
   {
     "checkedPackageRoots": [
       "github.com/openshift/origin/pkg/oauthserver"

hack/import-restrictions.json

@@ -10,6 +10,9 @@ function codegen::join() { local IFS="$1"; shift; echo "$*"; }
 
 # enumerate group versions
 ALL_FQ_APIS=(
+    github.com/openshift/origin/staging/src/github.com/openshift/template-service-broker/apis/config/v1
+    github.com/openshift/origin/staging/src/github.com/openshift/template-service-broker/apis/template/v1
+
     github.com/openshift/origin/pkg/apps/apis/apps/v1
     github.com/openshift/origin/pkg/authorization/apis/authorization/v1
     github.com/openshift/origin/pkg/build/apis/build/v1
@@ -22,7 +25,6 @@ ALL_FQ_APIS=(
     github.com/openshift/origin/pkg/route/apis/route/v1
     github.com/openshift/origin/pkg/security/apis/security/v1
     github.com/openshift/origin/pkg/template/apis/template/v1
-    github.com/openshift/origin/pkg/template/servicebroker/apis/config/v1
     github.com/openshift/origin/pkg/user/apis/user/v1
 )
 

hack/update-generated-conversions.sh

@@ -11,6 +11,11 @@ function codegen::join() { local IFS="$1"; shift; echo "$*"; }
 
 # enumerate group versions
 ALL_FQ_APIS=(
+    github.com/openshift/origin/staging/src/github.com/openshift/template-service-broker/apis/config
+    github.com/openshift/origin/staging/src/github.com/openshift/template-service-broker/apis/config/v1
+    github.com/openshift/origin/staging/src/github.com/openshift/template-service-broker/apis/template
+    github.com/openshift/origin/staging/src/github.com/openshift/template-service-broker/apis/template/v1
+
     github.com/openshift/origin/pkg/autoscaling/admission/apis/clusterresourceoverride
     github.com/openshift/origin/pkg/autoscaling/admission/apis/clusterresourceoverride/v1
     github.com/openshift/origin/pkg/autoscaling/admission/apis/runonceduration
@@ -29,8 +34,6 @@ ALL_FQ_APIS=(
     github.com/openshift/origin/pkg/network/admission/apis/externalipranger/v1
     github.com/openshift/origin/pkg/network/admission/apis/restrictedendpoints
     github.com/openshift/origin/pkg/network/admission/apis/restrictedendpoints/v1
-    github.com/openshift/origin/pkg/template/servicebroker/apis/config
-    github.com/openshift/origin/pkg/template/servicebroker/apis/config/v1
     github.com/openshift/origin/pkg/util/testing
     github.com/openshift/origin/pkg/apps/apis/apps
     github.com/openshift/origin/pkg/authorization/apis/authorization

hack/update-generated-deep-copies.sh

@@ -10,6 +10,7 @@ function codegen::join() { local IFS="$1"; shift; echo "$*"; }
 
 # enumerate group versions
 ALL_FQ_APIS=(
+    github.com/openshift/origin/staging/src/github.com/openshift/template-service-broker/apis/config/v1
     github.com/openshift/origin/pkg/apps/apis/apps/v1
     github.com/openshift/origin/pkg/authorization/apis/authorization/v1
     github.com/openshift/origin/pkg/build/apis/build/v1
@@ -22,7 +23,6 @@ ALL_FQ_APIS=(
     github.com/openshift/origin/pkg/route/apis/route/v1
     github.com/openshift/origin/pkg/security/apis/security/v1
     github.com/openshift/origin/pkg/template/apis/template/v1
-    github.com/openshift/origin/pkg/template/servicebroker/apis/config/v1
     github.com/openshift/origin/pkg/user/apis/user/v1
 )
 

hack/update-generated-defaulters.sh

@@ -20,4 +20,7 @@ os::cmd::expect_success "import-verifier ${OS_ROOT}/hack/import-restrictions.jso
 # quick and dirty check that nothing under vendored kubernetes imports something from origin
 os::cmd::expect_failure "egrep -r '\"github.com/openshift/origin/[^\"]+\"$' vendor/k8s.io/kubernetes"
 
+# quick and dirty check that nothing under origin staging imports from openshift/origin
+os::cmd::expect_failure "go list -deps -test ./staging/src/github.com/openshift/... | grep 'openshift/origin/pkg'"
+
 os::test::junit::declare_suite_end

hack/verify-imports.sh

@@ -1,7 +1,7 @@
 FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
 WORKDIR /go/src/github.com/openshift/origin
 COPY . .
-RUN make build WHAT=cmd/template-service-broker; \
+RUN make build WHAT=vendor/github.com/openshift/template-service-broker/cmd/template-service-broker; \
     mkdir -p /tmp/build; \
     cp /go/src/github.com/openshift/origin/_output/local/bin/linux/$(go env GOARCH)/template-service-broker /tmp/build/template-service-broker
 

images/template-service-broker/Dockerfile.rhel

@@ -0,0 +1,12 @@
+reviewers:
+  - smarterclayton
+  - mfojtik
+  - bparees
+  - soltysh
+  - adambkaplan
+approvers:
+  - smarterclayton
+  - mfojtik
+  - bparees
+  - soltysh
+  - adambkaplan

staging/src/github.com/openshift/template-service-broker/OWNERS

@@ -0,0 +1 @@
+### TODO: ADD README.md here