adjust to new client

openshift · Nov 27, 2017 · 69b85b9 · 69b85b9
1 parent 510180e
commit 69b85b9
Show file tree

Hide file tree

Showing 23 changed files with 99 additions and 98 deletions.
diff --git a/hack/import-restrictions.json b/hack/import-restrictions.json
@@ -47,60 +47,60 @@
     ]
   },
 
+
   {
     "checkedPackages": [
-      "github.com/openshift/origin/pkg/authorization/apis/authorization",
-      "github.com/openshift/origin/pkg/authorization/apis/authorization/v1"
+      "github.com/openshift/origin/pkg/apps/apis/apps",
+      "github.com/openshift/origin/pkg/apps/apis/apps/v1"
     ],
     "allowedImportPackageRoots": [
       "vendor/k8s.io/apimachinery",
-      "vendor/github.com/gogo/protobuf",
-      "github.com/openshift/origin/pkg/api/apihelpers"
+      "vendor/k8s.io/api",
+      "vendor/github.com/openshift/api"
     ],
     "allowedImportPackages": [
-      "vendor/k8s.io/api/core/v1",
       "vendor/k8s.io/kubernetes/pkg/api",
       "vendor/k8s.io/kubernetes/pkg/api/v1",
-      "vendor/k8s.io/kubernetes/pkg/apis/rbac",
-      "github.com/openshift/origin/pkg/authorization/apis/authorization/internal/serviceaccount"
+      "vendor/k8s.io/kubernetes/pkg/apis/extensions",
+      "github.com/openshift/origin/pkg/image/apis/image"
     ]
   },
 
   {
     "checkedPackages": [
-      "github.com/openshift/origin/pkg/build/apis/build",
-      "github.com/openshift/origin/pkg/build/apis/build/v1"
+      "github.com/openshift/origin/pkg/authorization/apis/authorization",
+      "github.com/openshift/origin/pkg/authorization/apis/authorization/v1"
     ],
     "allowedImportPackageRoots": [
       "vendor/k8s.io/apimachinery",
-      "vendor/github.com/gogo/protobuf",
+      "vendor/k8s.io/api",
+      "vendor/github.com/openshift/api",
       "github.com/openshift/origin/pkg/api/apihelpers"
     ],
     "allowedImportPackages": [
-      "vendor/k8s.io/api/core/v1",
       "vendor/k8s.io/kubernetes/pkg/api",
       "vendor/k8s.io/kubernetes/pkg/api/v1",
-      "github.com/openshift/origin/pkg/image/apis/image",
-      "vendor/github.com/golang/glog"
+      "vendor/k8s.io/kubernetes/pkg/apis/rbac",
+      "github.com/openshift/origin/pkg/authorization/apis/authorization/internal/serviceaccount"
     ]
   },
 
   {
     "checkedPackages": [
-      "github.com/openshift/origin/pkg/apps/apis/apps",
-      "github.com/openshift/origin/pkg/apps/apis/apps/v1"
+      "github.com/openshift/origin/pkg/build/apis/build",
+      "github.com/openshift/origin/pkg/build/apis/build/v1"
     ],
     "allowedImportPackageRoots": [
       "vendor/k8s.io/apimachinery",
-      "vendor/github.com/gogo/protobuf"
+      "vendor/k8s.io/api",
+      "vendor/github.com/openshift/api",
+      "github.com/openshift/origin/pkg/api/apihelpers"
     ],
     "allowedImportPackages": [
-      "vendor/k8s.io/api/core/v1",
-      "vendor/k8s.io/api/extensions/v1beta1",
       "vendor/k8s.io/kubernetes/pkg/api",
       "vendor/k8s.io/kubernetes/pkg/api/v1",
-      "vendor/k8s.io/kubernetes/pkg/apis/extensions",
-      "github.com/openshift/origin/pkg/image/apis/image"
+      "github.com/openshift/origin/pkg/image/apis/image",
+      "vendor/github.com/golang/glog"
     ]
   },
 
@@ -113,27 +113,41 @@
     ],
     "allowedImportPackageRoots": [
       "vendor/k8s.io/apimachinery",
-      "vendor/github.com/gogo/protobuf",
       "github.com/openshift/origin/pkg/image/apis/image/internal",
+      "vendor/k8s.io/api",
+      "vendor/github.com/openshift/api",
       "github.com/openshift/origin/pkg/api/apihelpers"
     ],
     "allowedImportPackages": [
-      "vendor/k8s.io/api/core/v1",
       "vendor/k8s.io/kubernetes/pkg/api",
       "vendor/k8s.io/kubernetes/pkg/api/v1",
       "vendor/github.com/golang/glog",
       "vendor/github.com/blang/semver"
     ]
   },
 
+  {
+    "checkedPackages": [
+      "github.com/openshift/origin/pkg/network/apis/network",
+      "github.com/openshift/origin/pkg/network/apis/network/v1"
+    ],
+    "allowedImportPackageRoots": [
+      "vendor/k8s.io/apimachinery",
+      "vendor/k8s.io/api",
+      "vendor/github.com/openshift/api"
+    ],
+    "allowedImportPackages": []
+  },
+
   {
     "checkedPackages": [
       "github.com/openshift/origin/pkg/oauth/apis/oauth",
       "github.com/openshift/origin/pkg/oauth/apis/oauth/v1"
     ],
     "allowedImportPackageRoots": [
       "vendor/k8s.io/apimachinery",
-      "vendor/github.com/gogo/protobuf",
+      "vendor/k8s.io/api",
+      "vendor/github.com/openshift/api",
       "github.com/openshift/origin/pkg/api/apihelpers"
     ],
     "allowedImportPackages": []
@@ -146,11 +160,11 @@
     ],
     "allowedImportPackageRoots": [
       "vendor/k8s.io/apimachinery",
-      "vendor/github.com/gogo/protobuf",
+      "vendor/k8s.io/api",
+      "vendor/github.com/openshift/api",
       "github.com/openshift/origin/pkg/api/apihelpers"
     ],
     "allowedImportPackages": [
-      "vendor/k8s.io/api/core/v1",
       "vendor/k8s.io/kubernetes/pkg/api"
     ]
   },
@@ -162,10 +176,10 @@
     ],
     "allowedImportPackageRoots": [
       "vendor/k8s.io/apimachinery",
-      "vendor/github.com/gogo/protobuf"
+      "vendor/k8s.io/api",
+      "vendor/github.com/openshift/api"
     ],
     "allowedImportPackages": [
-      "vendor/k8s.io/api/core/v1",
       "vendor/k8s.io/kubernetes/pkg/api",
       "vendor/k8s.io/kubernetes/pkg/api/v1"
     ]
@@ -178,11 +192,11 @@
     ],
     "allowedImportPackageRoots": [
       "vendor/k8s.io/apimachinery",
-      "vendor/github.com/gogo/protobuf",
+      "vendor/k8s.io/api",
+      "vendor/github.com/openshift/api",
       "github.com/openshift/origin/pkg/api/apihelpers"
     ],
     "allowedImportPackages": [
-      "vendor/k8s.io/api/core/v1",
       "vendor/k8s.io/kubernetes/pkg/api"
     ]
   },
@@ -200,30 +214,17 @@
     ]
   },
 
-  {
-    "checkedPackages": [
-      "github.com/openshift/origin/pkg/network/apis/network",
-      "github.com/openshift/origin/pkg/network/apis/network/v1"
-    ],
-    "allowedImportPackageRoots": [
-      "vendor/k8s.io/apimachinery",
-      "vendor/github.com/gogo/protobuf"
-    ],
-    "allowedImportPackages": []
-  },
-
   {
     "checkedPackages": [
       "github.com/openshift/origin/pkg/template/apis/template",
       "github.com/openshift/origin/pkg/template/apis/template/v1"
     ],
     "allowedImportPackageRoots": [
       "vendor/k8s.io/apimachinery",
-      "vendor/github.com/gogo/protobuf",
-      "github.com/openshift/origin/pkg/api/apihelpers"
+      "vendor/k8s.io/api",
+      "vendor/github.com/openshift/api"
     ],
     "allowedImportPackages": [
-      "vendor/k8s.io/api/core/v1",
       "vendor/k8s.io/kubernetes/pkg/api",
       "vendor/k8s.io/kubernetes/pkg/api/v1"
     ]
@@ -236,11 +237,11 @@
     ],
     "allowedImportPackageRoots": [
       "vendor/k8s.io/apimachinery",
-      "vendor/github.com/gogo/protobuf",
+      "vendor/k8s.io/api",
+      "vendor/github.com/openshift/api",
       "github.com/openshift/origin/pkg/api/apihelpers"
     ],
     "allowedImportPackages": [
-      "vendor/k8s.io/api/core/v1",
       "vendor/k8s.io/kubernetes/pkg/api",
       "vendor/k8s.io/kubernetes/pkg/api/v1"
     ]
@@ -267,8 +268,9 @@
       "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/config/cmd",
-      "github.com/openshift/origin/pkg/template/generated",
       "github.com/openshift/origin/pkg/template/servicebroker",
       "github.com/openshift/origin/pkg/util/rest"
     ],
@@ -284,7 +286,6 @@
       "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/v1",
       "github.com/openshift/origin/pkg/template/apis/template/validation",
       "github.com/openshift/origin/pkg/route/apis/route"
     ]

diff --git a/pkg/apps/client/v1/scale.go b/pkg/apps/client/v1/scale.go
@@ -5,7 +5,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kextensionsclient "k8s.io/client-go/kubernetes/typed/extensions/v1beta1"
 
-	appstypedclient "github.com/openshift/origin/pkg/apps/generated/clientset/typed/apps/v1"
+	appstypedclient "github.com/openshift/client-go/apps/clientset/versioned/typed/apps/v1"
 )
 
 type delegatingScaleInterface struct {

diff --git a/pkg/authorization/admission/restrictusers/restrictusers.go b/pkg/authorization/admission/restrictusers/restrictusers.go
@@ -15,12 +15,12 @@ import (
 	kadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission"
 
 	userapi "github.com/openshift/api/user/v1"
-	authorizationclient "github.com/openshift/origin/pkg/authorization/generated/clientset"
-	authorizationtypedclient "github.com/openshift/origin/pkg/authorization/generated/clientset/typed/authorization/v1"
+	authorizationclient "github.com/openshift/client-go/authorization/clientset/versioned"
+	authorizationtypedclient "github.com/openshift/client-go/authorization/clientset/versioned/typed/authorization/v1"
+	userclient "github.com/openshift/client-go/user/clientset/versioned"
+	userinformer "github.com/openshift/client-go/user/informers/externalversions"
 	oadmission "github.com/openshift/origin/pkg/cmd/server/admission"
 	usercache "github.com/openshift/origin/pkg/user/cache"
-	userclient "github.com/openshift/origin/pkg/user/generated/clientset"
-	userinformer "github.com/openshift/origin/pkg/user/generated/informers/externalversions"
 )
 
 func Register(plugins *admission.Plugins) {

diff --git a/pkg/authorization/admission/restrictusers/restrictusers_test.go b/pkg/authorization/admission/restrictusers/restrictusers_test.go
@@ -17,9 +17,9 @@ import (
 
 	authorizationapi "github.com/openshift/api/authorization/v1"
 	userapi "github.com/openshift/api/user/v1"
-	fakeauthorizationclient "github.com/openshift/origin/pkg/authorization/generated/clientset/fake"
+	fakeauthorizationclient "github.com/openshift/client-go/authorization/clientset/versioned/fake"
+	fakeuserclient "github.com/openshift/client-go/user/clientset/versioned/fake"
 	oadmission "github.com/openshift/origin/pkg/cmd/server/admission"
-	fakeuserclient "github.com/openshift/origin/pkg/user/generated/clientset/fake"
 )
 
 func TestAdmission(t *testing.T) {

diff --git a/pkg/authorization/admission/restrictusers/subjectchecker.go b/pkg/authorization/admission/restrictusers/subjectchecker.go
@@ -11,7 +11,7 @@ import (
 
 	authorizationapi "github.com/openshift/api/authorization/v1"
 	userapi "github.com/openshift/api/user/v1"
-	userclient "github.com/openshift/origin/pkg/user/generated/clientset/typed/user/v1"
+	userclient "github.com/openshift/client-go/user/clientset/versioned/typed/user/v1"
 )
 
 // SubjectChecker determines whether rolebindings on a subject (user, group, or

diff --git a/pkg/authorization/admission/restrictusers/subjectchecker_test.go b/pkg/authorization/admission/restrictusers/subjectchecker_test.go
@@ -12,7 +12,7 @@ import (
 
 	authorizationapi "github.com/openshift/api/authorization/v1"
 	userapi "github.com/openshift/api/user/v1"
-	fakeuserclient "github.com/openshift/origin/pkg/user/generated/clientset/fake"
+	fakeuserclient "github.com/openshift/client-go/user/clientset/versioned/fake"
 )
 
 func mustNewSubjectChecker(t *testing.T, spec *authorizationapi.RoleBindingRestrictionSpec) SubjectChecker {

diff --git a/pkg/build/admission/strategyrestrictions/admission.go b/pkg/build/admission/strategyrestrictions/admission.go
@@ -15,10 +15,10 @@ import (
 	kubeadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission"
 	rbacregistry "k8s.io/kubernetes/pkg/registry/rbac"
 
+	buildclient "github.com/openshift/client-go/build/clientset/versioned"
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
 	"github.com/openshift/origin/pkg/authorization/util"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
-	buildclient "github.com/openshift/origin/pkg/build/generated/clientset"
 	oadmission "github.com/openshift/origin/pkg/cmd/server/admission"
 	"k8s.io/kubernetes/pkg/apis/authorization"
 )

diff --git a/pkg/build/admission/strategyrestrictions/admission_test.go b/pkg/build/admission/strategyrestrictions/admission_test.go
@@ -17,8 +17,8 @@ import (
 	kubeadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission"
 
 	buildapiv1 "github.com/openshift/api/build/v1"
+	fakebuildclient "github.com/openshift/client-go/build/clientset/versioned/fake"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
-	fakebuildclient "github.com/openshift/origin/pkg/build/generated/clientset/fake"
 	oadmission "github.com/openshift/origin/pkg/cmd/server/admission"
 
 	_ "github.com/openshift/origin/pkg/build/apis/build/install"

diff --git a/pkg/cmd/server/admission/init.go b/pkg/cmd/server/admission/init.go
@@ -8,8 +8,10 @@ import (
 	kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission"
 	"k8s.io/kubernetes/pkg/quota"
 
-	authorizationclient "github.com/openshift/origin/pkg/authorization/generated/clientset"
-	buildclient "github.com/openshift/origin/pkg/build/generated/clientset"
+	authorizationclient "github.com/openshift/client-go/authorization/clientset/versioned"
+	buildclient "github.com/openshift/client-go/build/clientset/versioned"
+	userclient "github.com/openshift/client-go/user/clientset/versioned"
+	userinformer "github.com/openshift/client-go/user/informers/externalversions"
 	configapi "github.com/openshift/origin/pkg/cmd/server/api"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset"
@@ -19,8 +21,6 @@ import (
 	quotaclient "github.com/openshift/origin/pkg/quota/generated/internalclientset"
 	securityinformer "github.com/openshift/origin/pkg/security/generated/informers/internalversion"
 	templateclient "github.com/openshift/origin/pkg/template/generated/internalclientset"
-	userclient "github.com/openshift/origin/pkg/user/generated/clientset"
-	userinformer "github.com/openshift/origin/pkg/user/generated/informers/externalversions"
 )
 
 type PluginInitializer struct {

diff --git a/pkg/cmd/server/admission/types.go b/pkg/cmd/server/admission/types.go
@@ -7,8 +7,10 @@ import (
 	kinternalinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion"
 	"k8s.io/kubernetes/pkg/quota"
 
-	authorizationclient "github.com/openshift/origin/pkg/authorization/generated/clientset"
-	buildclient "github.com/openshift/origin/pkg/build/generated/clientset"
+	authorizationclient "github.com/openshift/client-go/authorization/clientset/versioned"
+	buildclient "github.com/openshift/client-go/build/clientset/versioned"
+	userclient "github.com/openshift/client-go/user/clientset/versioned"
+	userinformer "github.com/openshift/client-go/user/informers/externalversions"
 	configapi "github.com/openshift/origin/pkg/cmd/server/api"
 	imageclient "github.com/openshift/origin/pkg/image/generated/internalclientset"
 	"github.com/openshift/origin/pkg/project/cache"
@@ -17,8 +19,6 @@ import (
 	quotaclient "github.com/openshift/origin/pkg/quota/generated/internalclientset"
 	securityinformer "github.com/openshift/origin/pkg/security/generated/informers/internalversion"
 	templateclient "github.com/openshift/origin/pkg/template/generated/internalclientset"
-	userclient "github.com/openshift/origin/pkg/user/generated/clientset"
-	userinformer "github.com/openshift/origin/pkg/user/generated/informers/externalversions"
 )
 
 type WantsOpenshiftInternalAuthorizationClient interface {

diff --git a/pkg/cmd/server/origin/admission/plugin_initializer.go b/pkg/cmd/server/origin/admission/plugin_initializer.go
@@ -6,8 +6,10 @@ import (
 	"os"
 	"time"
 
-	authorizationclient "github.com/openshift/origin/pkg/authorization/generated/clientset"
-	buildclient "github.com/openshift/origin/pkg/build/generated/clientset"
+	authorizationclient "github.com/openshift/client-go/authorization/clientset/versioned"
+	buildclient "github.com/openshift/client-go/build/clientset/versioned"
+	userclient "github.com/openshift/client-go/user/clientset/versioned"
+	userinformer "github.com/openshift/client-go/user/informers/externalversions"
 	oadmission "github.com/openshift/origin/pkg/cmd/server/admission"
 	configapi "github.com/openshift/origin/pkg/cmd/server/api"
 	kubernetes "github.com/openshift/origin/pkg/cmd/server/kubernetes/master"
@@ -22,8 +24,6 @@ import (
 	securityinformer "github.com/openshift/origin/pkg/security/generated/informers/internalversion"
 	"github.com/openshift/origin/pkg/service"
 	templateclient "github.com/openshift/origin/pkg/template/generated/internalclientset"
-	userclient "github.com/openshift/origin/pkg/user/generated/clientset"
-	userinformer "github.com/openshift/origin/pkg/user/generated/informers/externalversions"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"

diff --git a/pkg/cmd/server/origin/controller/autoscaling.go b/pkg/cmd/server/origin/controller/autoscaling.go
@@ -6,8 +6,8 @@ import (
 	hpacontroller "k8s.io/kubernetes/pkg/controller/podautoscaler"
 	hpametrics "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
 
+	appstypedclient "github.com/openshift/client-go/apps/clientset/versioned/typed/apps/v1"
 	appsv1client "github.com/openshift/origin/pkg/apps/client/v1"
-	appstypedclient "github.com/openshift/origin/pkg/apps/generated/clientset/typed/apps/v1"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 )
 

diff --git a/pkg/cmd/server/origin/controller/unidling.go b/pkg/cmd/server/origin/controller/unidling.go
@@ -3,8 +3,8 @@ package controller
 import (
 	"time"
 
+	appstypedclient "github.com/openshift/client-go/apps/clientset/versioned/typed/apps/v1"
 	appsv1client "github.com/openshift/origin/pkg/apps/client/v1"
-	appstypedclient "github.com/openshift/origin/pkg/apps/generated/clientset/typed/apps/v1"
 	deployclient "github.com/openshift/origin/pkg/apps/generated/internalclientset/typed/apps/internalversion"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 	unidlingcontroller "github.com/openshift/origin/pkg/unidling/controller"