Merge pull request #20734 from deads2k/cli-03-install

use upstream install function
openshift · Aug 24, 2018 · 8ccc7e1 · 8ccc7e1
2 parents 81f26a4 + c28d97c
commit 8ccc7e1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/cmd/oc/oc.go b/cmd/oc/oc.go
@@ -11,8 +11,6 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/scheme"
 
 	"github.com/openshift/api"
-	"github.com/openshift/api/authorization"
-	"github.com/openshift/api/quota"
 	"github.com/openshift/library-go/pkg/serviceability"
 	"github.com/openshift/origin/pkg/api/install"
 	"github.com/openshift/origin/pkg/api/legacy"
@@ -35,9 +33,6 @@ func main() {
 	// the kubectl scheme expects to have all the recognizable external types it needs to consume.  Install those here.
 	api.Install(scheme.Scheme)
 	legacy.InstallExternalLegacyAll(scheme.Scheme)
-	// TODO fix up the install for the "all types"
-	authorization.Install(scheme.Scheme)
-	quota.Install(scheme.Scheme)
 
 	// the legacyscheme is used in kubectl and expects to have the internal types registered.  Explicitly wire our types here.
 	// this does

diff --git a/glide.lock b/glide.lock
diff --git a/vendor/github.com/openshift/api/install.go b/vendor/github.com/openshift/api/install.go
diff --git a/vendor/github.com/openshift/api/template/v1/consts.go b/vendor/github.com/openshift/api/template/v1/consts.go