Merge pull request #154 from stlaz/oauth_api-

Remove the code serving the oauth and user APIs
openshift · Dec 4, 2020 · a3fae4f · a3fae4f
2 parents 5ea157e + 12d650c
commit a3fae4f
Show file tree

Hide file tree

Showing 89 changed files with 137 additions and 8,072 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/openshift/openshift-apiserver
 go 1.13
 
 require (
-	github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
+	github.com/MakeNowJust/heredoc v1.0.0
 	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
 	github.com/containers/image v3.0.2+incompatible
 	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
@@ -25,7 +25,7 @@ require (
 	github.com/opencontainers/go-digest v1.0.0-rc1
 	github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
 	github.com/openshift/api v0.0.0-20201120165435-072a4cd8ca42
-	github.com/openshift/apiserver-library-go v0.0.0-20200901140731-1236dc23c728
+	github.com/openshift/apiserver-library-go v0.0.0-20201204115753-d48a1b462aa6
 	github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab
 	github.com/openshift/client-go v0.0.0-20201123133249-10558821f936
 	github.com/openshift/library-go v0.0.0-20201102091359-c4fa0f5b3a08

diff --git a/go.sum b/go.sum
diff --git a/hack/update-generated-conversions.sh b/hack/update-generated-conversions.sh
@@ -19,14 +19,12 @@ ALL_FQ_APIS=(
     github.com/openshift/openshift-apiserver/pkg/image/apis/image/v1
     github.com/openshift/openshift-apiserver/pkg/image/apis/image/dockerpre012
     github.com/openshift/openshift-apiserver/pkg/image/apis/image/docker10
-    github.com/openshift/openshift-apiserver/pkg/oauth/apis/oauth/v1
     github.com/openshift/openshift-apiserver/pkg/project/apis/project/v1
     github.com/openshift/openshift-apiserver/pkg/project/apiserver/admission/apis/requestlimit/v1
     github.com/openshift/openshift-apiserver/pkg/quota/apis/quota/v1
     github.com/openshift/openshift-apiserver/pkg/route/apis/route/v1
     github.com/openshift/openshift-apiserver/pkg/security/apis/security/v1
     github.com/openshift/openshift-apiserver/pkg/template/apis/template/v1
-    github.com/openshift/openshift-apiserver/pkg/user/apis/user/v1
 )
 
 ALL_PEERS=(

diff --git a/hack/update-generated-deep-copies.sh b/hack/update-generated-deep-copies.sh
@@ -19,13 +19,11 @@ ALL_FQ_APIS=(
     github.com/openshift/openshift-apiserver/pkg/authorization/apis/authorization
     github.com/openshift/openshift-apiserver/pkg/build/apis/build
     github.com/openshift/openshift-apiserver/pkg/image/apis/image
-    github.com/openshift/openshift-apiserver/pkg/oauth/apis/oauth
     github.com/openshift/openshift-apiserver/pkg/project/apis/project
     github.com/openshift/openshift-apiserver/pkg/quota/apis/quota
     github.com/openshift/openshift-apiserver/pkg/route/apis/route
     github.com/openshift/openshift-apiserver/pkg/security/apis/security
     github.com/openshift/openshift-apiserver/pkg/template/apis/template
-    github.com/openshift/openshift-apiserver/pkg/user/apis/user
 )
 
 echo "Generating deepcopy funcs"

diff --git a/hack/update-generated-defaulters.sh b/hack/update-generated-defaulters.sh
@@ -17,13 +17,11 @@ ALL_FQ_APIS=(
     github.com/openshift/openshift-apiserver/pkg/authorization/apis/authorization/v1
     github.com/openshift/openshift-apiserver/pkg/build/apis/build/v1
     github.com/openshift/openshift-apiserver/pkg/image/apis/image/v1
-    github.com/openshift/openshift-apiserver/pkg/oauth/apis/oauth/v1
     github.com/openshift/openshift-apiserver/pkg/project/apis/project/v1
     github.com/openshift/openshift-apiserver/pkg/quota/apis/quota/v1
     github.com/openshift/openshift-apiserver/pkg/route/apis/route/v1
     github.com/openshift/openshift-apiserver/pkg/security/apis/security/v1
     github.com/openshift/openshift-apiserver/pkg/template/apis/template/v1
-    github.com/openshift/openshift-apiserver/pkg/user/apis/user/v1
 )
 
 ALL_PEERS=(

diff --git a/pkg/api/install/install.go b/pkg/api/install/install.go
@@ -28,27 +28,23 @@ import (
 	authz "github.com/openshift/openshift-apiserver/pkg/authorization/apis/authorization/install"
 	build "github.com/openshift/openshift-apiserver/pkg/build/apis/build/install"
 	image "github.com/openshift/openshift-apiserver/pkg/image/apis/image/install"
-	oauth "github.com/openshift/openshift-apiserver/pkg/oauth/apis/oauth/install"
 	project "github.com/openshift/openshift-apiserver/pkg/project/apis/project/install"
 	quota "github.com/openshift/openshift-apiserver/pkg/quota/apis/quota/install"
 	route "github.com/openshift/openshift-apiserver/pkg/route/apis/route/install"
 	security "github.com/openshift/openshift-apiserver/pkg/security/apis/security/install"
 	template "github.com/openshift/openshift-apiserver/pkg/template/apis/template/install"
-	user "github.com/openshift/openshift-apiserver/pkg/user/apis/user/install"
 )
 
 func InstallInternalOpenShift(scheme *runtime.Scheme) {
 	oapps.Install(scheme)
 	authz.Install(scheme)
 	build.Install(scheme)
 	image.Install(scheme)
-	oauth.Install(scheme)
 	project.Install(scheme)
 	quota.Install(scheme)
 	route.Install(scheme)
 	security.Install(scheme)
 	template.Install(scheme)
-	user.Install(scheme)
 }
 
 func InstallInternalKube(scheme *runtime.Scheme) {

diff --git a/pkg/api/legacy/install.go b/pkg/api/legacy/install.go
@@ -31,13 +31,11 @@ func InstallInternalLegacyAll(scheme *runtime.Scheme) {
 	InstallInternalLegacyAuthorization(scheme)
 	InstallInternalLegacyBuild(scheme)
 	InstallInternalLegacyImage(scheme)
-	InstallInternalLegacyOAuth(scheme)
 	InstallInternalLegacyProject(scheme)
 	InstallInternalLegacyQuota(scheme)
 	InstallInternalLegacyRoute(scheme)
 	InstallInternalLegacySecurity(scheme)
 	InstallInternalLegacyTemplate(scheme)
-	InstallInternalLegacyUser(scheme)
 }
 
 func InstallExternalLegacyAll(scheme *runtime.Scheme) {
@@ -46,11 +44,9 @@ func InstallExternalLegacyAll(scheme *runtime.Scheme) {
 	InstallExternalLegacyBuild(scheme)
 	InstallExternalLegacyImage(scheme)
 	InstallExternalLegacyNetwork(scheme)
-	InstallExternalLegacyOAuth(scheme)
 	InstallExternalLegacyProject(scheme)
 	InstallExternalLegacyQuota(scheme)
 	InstallExternalLegacyRoute(scheme)
 	InstallExternalLegacySecurity(scheme)
 	InstallExternalLegacyTemplate(scheme)
-	InstallExternalLegacyUser(scheme)
 }
diff --git a/pkg/api/legacy/oauth.go b/pkg/api/legacy/oauth.go
diff --git a/pkg/api/legacy/oauth_test.go b/pkg/api/legacy/oauth_test.go
diff --git a/pkg/api/legacy/user.go b/pkg/api/legacy/user.go
diff --git a/pkg/api/legacy/user_test.go b/pkg/api/legacy/user_test.go