move component installation to cluster add

deads2k · deads2k · commit 04546c7960f1 · 2018-04-06T12:07:57.000-04:00
diff --git a/pkg/oc/bootstrap/clusteradd/cmd.go b/pkg/oc/bootstrap/clusteradd/cmd.go
@@ -7,11 +7,11 @@ import (
 	"path"
 	"strings"
 
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/components/registry"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/components/router"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/components/service-catalog"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/components/template-service-broker"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/components/web-console"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/components/registry"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/components/router"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/components/service-catalog"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/components/template-service-broker"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/components/web-console"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
@@ -20,7 +20,7 @@ import (
 
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/variable"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/componentinstall"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/componentinstall"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/dockerhelper"
 	"github.com/openshift/origin/pkg/version"
diff --git a/pkg/oc/bootstrap/clusteradd/componentinstall/apply_list.go b/pkg/oc/bootstrap/clusteradd/componentinstall/apply_list.go
diff --git a/pkg/oc/bootstrap/clusteradd/componentinstall/apply_template.go b/pkg/oc/bootstrap/clusteradd/componentinstall/apply_template.go
diff --git a/pkg/oc/bootstrap/clusteradd/componentinstall/context.go b/pkg/oc/bootstrap/clusteradd/componentinstall/context.go
diff --git a/pkg/oc/bootstrap/clusteradd/componentinstall/interface.go b/pkg/oc/bootstrap/clusteradd/componentinstall/interface.go
diff --git a/pkg/oc/bootstrap/clusteradd/componentinstall/privileged.go b/pkg/oc/bootstrap/clusteradd/componentinstall/privileged.go
diff --git a/pkg/oc/bootstrap/clusteradd/componentinstall/readiness_apigroup.go b/pkg/oc/bootstrap/clusteradd/componentinstall/readiness_apigroup.go
diff --git a/pkg/oc/bootstrap/clusteradd/components/register-template-service-broker/OWNERS b/pkg/oc/bootstrap/clusteradd/components/register-template-service-broker/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - bparees
+  - jim-minter
+approvers:
+  - bparees
+  - jim-minter
diff --git a/pkg/oc/bootstrap/clusteradd/components/register-template-service-broker/register_tsb.go b/pkg/oc/bootstrap/clusteradd/components/register-template-service-broker/register_tsb.go
@@ -8,7 +8,7 @@ import (
 	"github.com/golang/glog"
 
 	"github.com/openshift/origin/pkg/oc/bootstrap"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/componentinstall"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/componentinstall"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/dockerhelper"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/errors"
 )
diff --git a/pkg/oc/bootstrap/clusteradd/components/registry/OWNERS b/pkg/oc/bootstrap/clusteradd/components/registry/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+  - bparees
+approvers:
+  - bparees
diff --git a/pkg/oc/bootstrap/clusteradd/components/registry/registry_install.go b/pkg/oc/bootstrap/clusteradd/components/registry/registry_install.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"path"
 
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/componentinstall"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/componentinstall"
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/kubeapiserver"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/dockerhelper"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/run"
diff --git a/pkg/oc/bootstrap/clusteradd/components/router/OWNERS b/pkg/oc/bootstrap/clusteradd/components/router/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - danwinship
+  - dcbw
+approvers:
+  - danwinship
+  - dcbw
diff --git a/pkg/oc/bootstrap/clusteradd/components/router/router_install.go b/pkg/oc/bootstrap/clusteradd/components/router/router_install.go
@@ -21,7 +21,7 @@ import (
 	"github.com/openshift/origin/pkg/cmd/server/admin"
 	configapi "github.com/openshift/origin/pkg/cmd/server/apis/config"
 	configapilatest "github.com/openshift/origin/pkg/cmd/server/apis/config/latest"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/componentinstall"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/componentinstall"
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/kubeapiserver"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/dockerhelper"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/run"
diff --git a/pkg/oc/bootstrap/clusteradd/components/service-catalog/OWNERS b/pkg/oc/bootstrap/clusteradd/components/service-catalog/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - jpeeler
+  - pmorie
+approvers:
+  - jpeeler
+  - pmorie
diff --git a/pkg/oc/bootstrap/clusteradd/components/service-catalog/service_catalog.go b/pkg/oc/bootstrap/clusteradd/components/service-catalog/service_catalog.go
@@ -20,8 +20,8 @@ import (
 	configapilatest "github.com/openshift/origin/pkg/cmd/server/apis/config/latest"
 	"github.com/openshift/origin/pkg/cmd/util/variable"
 	"github.com/openshift/origin/pkg/oc/bootstrap"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/componentinstall"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/components/register-template-service-broker"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/componentinstall"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/components/register-template-service-broker"
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/kubeapiserver"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/dockerhelper"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/errors"
diff --git a/pkg/oc/bootstrap/clusteradd/components/template-service-broker/OWNERS b/pkg/oc/bootstrap/clusteradd/components/template-service-broker/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - bparees
+  - jim-minter
+approvers:
+  - bparees
+  - jim-minter
diff --git a/pkg/oc/bootstrap/clusteradd/components/template-service-broker/template_service_broker.go b/pkg/oc/bootstrap/clusteradd/components/template-service-broker/template_service_broker.go
@@ -5,15 +5,15 @@ import (
 	"path"
 
 	"github.com/golang/glog"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/components/register-template-service-broker"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/components/register-template-service-broker"
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/kubeapiserver"
 	"k8s.io/client-go/kubernetes"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/openshift/origin/pkg/cmd/util/variable"
 	"github.com/openshift/origin/pkg/oc/bootstrap"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/componentinstall"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/componentinstall"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/dockerhelper"
 	"github.com/openshift/origin/pkg/oc/errors"
 )
diff --git a/pkg/oc/bootstrap/clusteradd/components/web-console/OWNERS b/pkg/oc/bootstrap/clusteradd/components/web-console/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+  - spadgett
+approvers:
+  - spadgett
diff --git a/pkg/oc/bootstrap/clusteradd/components/web-console/web_console.go b/pkg/oc/bootstrap/clusteradd/components/web-console/web_console.go
@@ -18,7 +18,7 @@ import (
 	configapilatest "github.com/openshift/origin/pkg/cmd/server/apis/config/latest"
 	"github.com/openshift/origin/pkg/cmd/util/variable"
 	"github.com/openshift/origin/pkg/oc/bootstrap"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/componentinstall"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/componentinstall"
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/kubeapiserver"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/dockerhelper"
 	"github.com/openshift/origin/pkg/oc/errors"
diff --git a/pkg/oc/bootstrap/docker/openshift/templateservicebroker.go b/pkg/oc/bootstrap/docker/openshift/templateservicebroker.go
@@ -8,7 +8,7 @@ import (
 	"github.com/golang/glog"
 
 	"github.com/openshift/origin/pkg/oc/bootstrap"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/componentinstall"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/componentinstall"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/errors"
 )
 
diff --git a/pkg/oc/bootstrap/docker/run_self_hosted.go b/pkg/oc/bootstrap/docker/run_self_hosted.go
@@ -25,7 +25,7 @@ import (
 	aggregatorclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
 
 	"github.com/openshift/origin/pkg/oc/bootstrap"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/componentinstall"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/componentinstall"
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/kubeapiserver"
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/kubelet"
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/staticpods"
diff --git a/pkg/oc/bootstrap/docker/up.go b/pkg/oc/bootstrap/docker/up.go
@@ -39,9 +39,9 @@ import (
 	"github.com/openshift/origin/pkg/cmd/util/variable"
 	oauthclientinternal "github.com/openshift/origin/pkg/oauth/generated/internalclientset"
 	"github.com/openshift/origin/pkg/oc/bootstrap"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/componentinstall"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/components/registry"
-	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/components/service-catalog"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/componentinstall"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/components/registry"
+	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/components/service-catalog"
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/kubeapiserver"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/dockerhelper"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/errors"

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/golang/glog"`
`9`	`9`
`10`	`10`	`"github.com/openshift/origin/pkg/oc/bootstrap"`
`11`		`- "github.com/openshift/origin/pkg/oc/bootstrap/clusterup/componentinstall"`
	`11`	`+ "github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/componentinstall"`
`12`	`12`	`"github.com/openshift/origin/pkg/oc/bootstrap/docker/dockerhelper"`
`13`	`13`	`"github.com/openshift/origin/pkg/oc/bootstrap/docker/errors"`
`14`	`14`	`)`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +reviewers:
 +  - bparees
 +approvers:
 +  - bparees