Merge pull request openshift#22492 from deads2k/client-signature

switch to non-deprecated client
FyreNet · Apr 7, 2019 · 2899b45 · 2899b45
2 parents d216153 + 1f707e3
commit 2899b45
Show file tree

Hide file tree

Showing 177 changed files with 545 additions and 544 deletions.
diff --git a/pkg/apiserver/authentication/oauth/expirationvalidator_test.go b/pkg/apiserver/authentication/oauth/expirationvalidator_test.go
@@ -30,7 +30,7 @@ func TestAuthenticateTokenExpired(t *testing.T) {
 	)
 	fakeUserClient := userfake.NewSimpleClientset(&userapi.User{ObjectMeta: metav1.ObjectMeta{Name: "foo", UID: "bar"}})
 
-	tokenAuthenticator := NewTokenAuthenticator(fakeOAuthClient.Oauth().OAuthAccessTokens(), fakeUserClient.UserV1().Users(), NoopGroupMapper{}, NewExpirationValidator())
+	tokenAuthenticator := NewTokenAuthenticator(fakeOAuthClient.OauthV1().OAuthAccessTokens(), fakeUserClient.UserV1().Users(), NoopGroupMapper{}, NewExpirationValidator())
 
 	for _, tokenName := range []string{"token1", "token2"} {
 		userInfo, found, err := tokenAuthenticator.AuthenticateToken(context.TODO(), tokenName)
@@ -57,7 +57,7 @@ func TestAuthenticateTokenValidated(t *testing.T) {
 	)
 	fakeUserClient := userfake.NewSimpleClientset(&userapi.User{ObjectMeta: metav1.ObjectMeta{Name: "foo", UID: "bar"}})
 
-	tokenAuthenticator := NewTokenAuthenticator(fakeOAuthClient.Oauth().OAuthAccessTokens(), fakeUserClient.UserV1().Users(), NoopGroupMapper{}, NewExpirationValidator(), NewUIDValidator())
+	tokenAuthenticator := NewTokenAuthenticator(fakeOAuthClient.OauthV1().OAuthAccessTokens(), fakeUserClient.UserV1().Users(), NoopGroupMapper{}, NewExpirationValidator(), NewUIDValidator())
 
 	userInfo, found, err := tokenAuthenticator.AuthenticateToken(context.TODO(), "token")
 	if !found {

diff --git a/pkg/apiserver/authentication/oauth/tokenauthenticator_test.go b/pkg/apiserver/authentication/oauth/tokenauthenticator_test.go
@@ -31,7 +31,7 @@ func TestAuthenticateTokenInvalidUID(t *testing.T) {
 	)
 	fakeUserClient := userfake.NewSimpleClientset(&userapi.User{ObjectMeta: metav1.ObjectMeta{Name: "foo", UID: "bar2"}})
 
-	tokenAuthenticator := NewTokenAuthenticator(fakeOAuthClient.Oauth().OAuthAccessTokens(), fakeUserClient.UserV1().Users(), NoopGroupMapper{}, NewUIDValidator())
+	tokenAuthenticator := NewTokenAuthenticator(fakeOAuthClient.OauthV1().OAuthAccessTokens(), fakeUserClient.UserV1().Users(), NoopGroupMapper{}, NewUIDValidator())
 
 	userInfo, found, err := tokenAuthenticator.AuthenticateToken(context.TODO(), "token")
 	if found {
@@ -48,7 +48,7 @@ func TestAuthenticateTokenInvalidUID(t *testing.T) {
 func TestAuthenticateTokenNotFoundSuppressed(t *testing.T) {
 	fakeOAuthClient := oauthfake.NewSimpleClientset()
 	fakeUserClient := userfake.NewSimpleClientset()
-	tokenAuthenticator := NewTokenAuthenticator(fakeOAuthClient.Oauth().OAuthAccessTokens(), fakeUserClient.UserV1().Users(), NoopGroupMapper{})
+	tokenAuthenticator := NewTokenAuthenticator(fakeOAuthClient.OauthV1().OAuthAccessTokens(), fakeUserClient.UserV1().Users(), NoopGroupMapper{})
 
 	userInfo, found, err := tokenAuthenticator.AuthenticateToken(context.TODO(), "token")
 	if found {
@@ -68,7 +68,7 @@ func TestAuthenticateTokenOtherGetErrorSuppressed(t *testing.T) {
 		return true, nil, errors.New("get error")
 	})
 	fakeUserClient := userfake.NewSimpleClientset()
-	tokenAuthenticator := NewTokenAuthenticator(fakeOAuthClient.Oauth().OAuthAccessTokens(), fakeUserClient.UserV1().Users(), NoopGroupMapper{})
+	tokenAuthenticator := NewTokenAuthenticator(fakeOAuthClient.OauthV1().OAuthAccessTokens(), fakeUserClient.UserV1().Users(), NoopGroupMapper{})
 
 	userInfo, found, err := tokenAuthenticator.AuthenticateToken(context.TODO(), "token")
 	if found {
@@ -137,8 +137,8 @@ func TestAuthenticateTokenTimeout(t *testing.T) {
 	}
 	fakeOAuthClient := oauthfake.NewSimpleClientset(&testToken, &quickToken, &slowToken, &emergToken, &testClient, &quickClient, &slowClient)
 	fakeUserClient := userfake.NewSimpleClientset(&userapi.User{ObjectMeta: metav1.ObjectMeta{Name: "foo", UID: "bar"}})
-	accessTokenGetter := fakeOAuthClient.Oauth().OAuthAccessTokens()
-	oauthClients := fakeOAuthClient.Oauth().OAuthClients()
+	accessTokenGetter := fakeOAuthClient.OauthV1().OAuthAccessTokens()
+	oauthClients := fakeOAuthClient.OauthV1().OAuthClients()
 	lister := &fakeOAuthClientLister{
 		clients: oauthClients,
 	}

diff --git a/pkg/apps/apiserver/registry/deploylog/rest_test.go b/pkg/apps/apiserver/registry/deploylog/rest_test.go
@@ -97,7 +97,7 @@ func mockREST(version, desired int64, status appsv1.DeploymentStatus) *REST {
 	// Used for testing validation errors prior to getting replication controllers.
 	if desired > version {
 		return &REST{
-			dcClient: fakeDn.Apps(),
+			dcClient: fakeDn.AppsV1(),
 			timeout:  defaultTimeout,
 		}
 	}
@@ -151,9 +151,9 @@ func mockREST(version, desired int64, status appsv1.DeploymentStatus) *REST {
 	}
 
 	return &REST{
-		dcClient:  fakeDn.Apps(),
-		rcClient:  fakeRn.Core(),
-		podClient: fakePn.Core(),
+		dcClient:  fakeDn.AppsV1(),
+		rcClient:  fakeRn.CoreV1(),
+		podClient: fakePn.CoreV1(),
 		timeout:   defaultTimeout,
 	}
 }

diff --git a/pkg/apps/apiserver/registry/deploylog/wait_test.go b/pkg/apps/apiserver/registry/deploylog/wait_test.go
@@ -27,7 +27,7 @@ func TestWaitForRunningDeploymentSuccess(t *testing.T) {
 
 	go func() {
 		defer close(stopChan)
-		rc, ok, err := WaitForRunningDeployment(kubeclient.Core(), fakeController, 10*time.Second)
+		rc, ok, err := WaitForRunningDeployment(kubeclient.CoreV1(), fakeController, 10*time.Second)
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}
@@ -67,7 +67,7 @@ func TestWaitForRunningDeploymentRestartWatch(t *testing.T) {
 	stopChan := make(chan struct{})
 	go func() {
 		defer close(stopChan)
-		rc, ok, err := WaitForRunningDeployment(kubeclient.Core(), fakeController, 10*time.Second)
+		rc, ok, err := WaitForRunningDeployment(kubeclient.CoreV1(), fakeController, 10*time.Second)
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}

diff --git a/pkg/apps/apiserver/registry/instantiate/rest.go b/pkg/apps/apiserver/registry/instantiate/rest.go
@@ -35,7 +35,7 @@ import (
 // NewREST provides new REST storage for the apps API group.
 func NewREST(store registry.Store, imagesclient imageclientinternal.Interface, kc kubernetes.Interface, admission admission.Interface) *REST {
 	store.UpdateStrategy = Strategy
-	return &REST{store: &store, is: imagesclient.Image(), rn: kc.Core(), admit: admission}
+	return &REST{store: &store, is: imagesclient.Image(), rn: kc.CoreV1(), admit: admission}
 }
 
 // REST implements the Creater interface.

diff --git a/pkg/apps/apiserver/registry/instantiate/rest_test.go b/pkg/apps/apiserver/registry/instantiate/rest_test.go
@@ -713,7 +713,7 @@ func TestCanTrigger(t *testing.T) {
 
 		test.config = appstest.RoundTripConfig(t, test.config)
 
-		got, gotCauses, err := canTrigger(test.config, client.Core(), test.force)
+		got, gotCauses, err := canTrigger(test.config, client.CoreV1(), test.force)
 		if err != nil && !test.expectedErr {
 			t.Errorf("unexpected error: %v", err)
 			continue

diff --git a/pkg/apps/apiserver/registry/rollback/rest.go b/pkg/apps/apiserver/registry/rollback/rest.go
@@ -36,7 +36,7 @@ func NewREST(appsclient appsclient.Interface, kc kubernetes.Interface) *REST {
 	return &REST{
 		generator: NewRollbackGenerator(),
 		dn:        appsclient.AppsV1(),
-		rn:        kc.Core(),
+		rn:        kc.CoreV1(),
 	}
 }
 

diff --git a/pkg/apps/apiserver/registry/rollback/rest_test.go b/pkg/apps/apiserver/registry/rollback/rest_test.go
@@ -129,8 +129,8 @@ func TestCreateGeneratorError(t *testing.T) {
 
 	rest := REST{
 		generator: &terribleGenerator{},
-		dn:        oc.Apps(),
-		rn:        kc.Core(),
+		dn:        oc.AppsV1(),
+		rn:        kc.CoreV1(),
 	}
 
 	_, err := rest.Create(apirequest.NewDefaultContext(), &appsapi.DeploymentConfigRollback{

diff --git a/pkg/apps/controller/deploymentconfig/deploymentconfig_controller_test.go b/pkg/apps/controller/deploymentconfig/deploymentconfig_controller_test.go
@@ -371,10 +371,10 @@ func TestHandleScenarios(t *testing.T) {
 			informer: cache.NewSharedIndexInformer(
 				&cache.ListWatch{
 					ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
-						return oc.Apps().DeploymentConfigs(metav1.NamespaceAll).List(options)
+						return oc.AppsV1().DeploymentConfigs(metav1.NamespaceAll).List(options)
 					},
 					WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
-						return oc.Apps().DeploymentConfigs(metav1.NamespaceAll).Watch(options)
+						return oc.AppsV1().DeploymentConfigs(metav1.NamespaceAll).Watch(options)
 					},
 				},
 				&appsv1.DeploymentConfig{},

diff --git a/pkg/apps/strategy/recreate/recreate_test.go b/pkg/apps/strategy/recreate/recreate_test.go
@@ -75,7 +75,7 @@ type fakeControllerClient struct {
 }
 
 func (c *fakeControllerClient) ReplicationControllers(ns string) kcoreclient.ReplicationControllerInterface {
-	return c.fakeClient.Core().ReplicationControllers(ns)
+	return c.fakeClient.CoreV1().ReplicationControllers(ns)
 }
 
 func (c *fakeControllerClient) scaledOnce() bool {
@@ -132,7 +132,7 @@ func TestRecreate_initialDeployment(t *testing.T) {
 		out:               &bytes.Buffer{},
 		errOut:            &bytes.Buffer{},
 		getUpdateAcceptor: getUpdateAcceptor,
-		eventClient:       fake.NewSimpleClientset().Core(),
+		eventClient:       fake.NewSimpleClientset().CoreV1(),
 	}
 
 	config := appstest.OkDeploymentConfig(1)
@@ -165,7 +165,7 @@ func TestRecreate_deploymentPreHookSuccess(t *testing.T) {
 		out:               &bytes.Buffer{},
 		errOut:            &bytes.Buffer{},
 		getUpdateAcceptor: getUpdateAcceptor,
-		eventClient:       fake.NewSimpleClientset().Core(),
+		eventClient:       fake.NewSimpleClientset().CoreV1(),
 		rcClient:          controllerClient,
 		scaleClient:       controllerClient.fakeScaleClient(),
 		hookExecutor: &hookExecutorImpl{
@@ -196,7 +196,7 @@ func TestRecreate_deploymentPreHookFail(t *testing.T) {
 		out:               &bytes.Buffer{},
 		errOut:            &bytes.Buffer{},
 		getUpdateAcceptor: getUpdateAcceptor,
-		eventClient:       fake.NewSimpleClientset().Core(),
+		eventClient:       fake.NewSimpleClientset().CoreV1(),
 		rcClient:          controllerClient,
 		scaleClient:       controllerClient.fakeScaleClient(),
 		hookExecutor: &hookExecutorImpl{
@@ -228,7 +228,7 @@ func TestRecreate_deploymentMidHookSuccess(t *testing.T) {
 		errOut:            &bytes.Buffer{},
 		rcClient:          controllerClient,
 		scaleClient:       controllerClient.fakeScaleClient(),
-		eventClient:       fake.NewSimpleClientset().Core(),
+		eventClient:       fake.NewSimpleClientset().CoreV1(),
 		getUpdateAcceptor: getUpdateAcceptor,
 		hookExecutor: &hookExecutorImpl{
 			executeFunc: func(hook *appsv1.LifecycleHook, deployment *corev1.ReplicationController, suffix, label string) error {
@@ -260,7 +260,7 @@ func TestRecreate_deploymentPostHookSuccess(t *testing.T) {
 		errOut:            &bytes.Buffer{},
 		rcClient:          controllerClient,
 		scaleClient:       controllerClient.fakeScaleClient(),
-		eventClient:       fake.NewSimpleClientset().Core(),
+		eventClient:       fake.NewSimpleClientset().CoreV1(),
 		getUpdateAcceptor: getUpdateAcceptor,
 		hookExecutor: &hookExecutorImpl{
 			executeFunc: func(hook *appsv1.LifecycleHook, deployment *corev1.ReplicationController, suffix, label string) error {
@@ -292,7 +292,7 @@ func TestRecreate_deploymentPostHookFail(t *testing.T) {
 		errOut:            &bytes.Buffer{},
 		rcClient:          controllerClient,
 		scaleClient:       controllerClient.fakeScaleClient(),
-		eventClient:       fake.NewSimpleClientset().Core(),
+		eventClient:       fake.NewSimpleClientset().CoreV1(),
 		getUpdateAcceptor: getUpdateAcceptor,
 		hookExecutor: &hookExecutorImpl{
 			executeFunc: func(hook *appsv1.LifecycleHook, deployment *corev1.ReplicationController, suffix, label string) error {
@@ -361,7 +361,7 @@ func TestRecreate_acceptorSuccessWithColdCaches(t *testing.T) {
 	strategy := &RecreateDeploymentStrategy{
 		out:         &bytes.Buffer{},
 		errOut:      &bytes.Buffer{},
-		eventClient: fake.NewSimpleClientset().Core(),
+		eventClient: fake.NewSimpleClientset().CoreV1(),
 	}
 
 	acceptorCalled := false
@@ -406,7 +406,7 @@ func TestRecreate_acceptorFail(t *testing.T) {
 	strategy := &RecreateDeploymentStrategy{
 		out:         &bytes.Buffer{},
 		errOut:      &bytes.Buffer{},
-		eventClient: fake.NewSimpleClientset().Core(),
+		eventClient: fake.NewSimpleClientset().CoreV1(),
 	}
 
 	acceptor := &testAcceptor{

diff --git a/pkg/apps/strategy/rolling/rolling_test.go b/pkg/apps/strategy/rolling/rolling_test.go
@@ -23,8 +23,8 @@ func TestRolling_deployInitial(t *testing.T) {
 	initialStrategyInvoked := false
 
 	strategy := &RollingDeploymentStrategy{
-		rcClient:    fake.NewSimpleClientset().Core(),
-		eventClient: fake.NewSimpleClientset().Core(),
+		rcClient:    fake.NewSimpleClientset().CoreV1(),
+		eventClient: fake.NewSimpleClientset().CoreV1(),
 		initialStrategy: &testStrategy{
 			deployFn: func(from *corev1.ReplicationController, to *corev1.ReplicationController, desiredReplicas int, updateAcceptor strat.UpdateAcceptor) error {
 				initialStrategyInvoked = true
@@ -80,8 +80,8 @@ func TestRolling_deployRolling(t *testing.T) {
 
 	var rollingConfig *RollingUpdaterConfig
 	strategy := &RollingDeploymentStrategy{
-		rcClient:    client.Core(),
-		eventClient: fake.NewSimpleClientset().Core(),
+		rcClient:    client.CoreV1(),
+		eventClient: fake.NewSimpleClientset().CoreV1(),
 		initialStrategy: &testStrategy{
 			deployFn: func(from *corev1.ReplicationController, to *corev1.ReplicationController, desiredReplicas int, updateAcceptor strat.UpdateAcceptor) error {
 				t.Fatalf("unexpected call to initial strategy")
@@ -169,8 +169,8 @@ func TestRolling_deployRollingHooks(t *testing.T) {
 	})
 
 	strategy := &RollingDeploymentStrategy{
-		rcClient:    client.Core(),
-		eventClient: fake.NewSimpleClientset().Core(),
+		rcClient:    client.CoreV1(),
+		eventClient: fake.NewSimpleClientset().CoreV1(),
 		initialStrategy: &testStrategy{
 			deployFn: func(from *corev1.ReplicationController, to *corev1.ReplicationController, desiredReplicas int, updateAcceptor strat.UpdateAcceptor) error {
 				t.Fatalf("unexpected call to initial strategy")
@@ -230,8 +230,8 @@ func TestRolling_deployInitialHooks(t *testing.T) {
 	var hookError error
 
 	strategy := &RollingDeploymentStrategy{
-		rcClient:    fake.NewSimpleClientset().Core(),
-		eventClient: fake.NewSimpleClientset().Core(),
+		rcClient:    fake.NewSimpleClientset().CoreV1(),
+		eventClient: fake.NewSimpleClientset().CoreV1(),
 		initialStrategy: &testStrategy{
 			deployFn: func(from *corev1.ReplicationController, to *corev1.ReplicationController, desiredReplicas int,
 				updateAcceptor strat.UpdateAcceptor) error {

diff --git a/pkg/apps/strategy/support/lifecycle_test.go b/pkg/apps/strategy/support/lifecycle_test.go
@@ -66,7 +66,7 @@ func TestHookExecutor_executeExecNewCreatePodFailure(t *testing.T) {
 		return true, nil, errors.New("could not create the pod")
 	})
 	executor := &hookExecutor{
-		pods: client.Core(),
+		pods: client.CoreV1(),
 	}
 
 	if err := executor.executeExecNewPod(hook, deployment, "hook", "test"); err == nil {
@@ -111,7 +111,7 @@ func TestHookExecutor_executeExecNewPodSucceeded(t *testing.T) {
 	}()
 
 	executor := &hookExecutor{
-		pods: client.Core(),
+		pods: client.CoreV1(),
 		out:  podLogs,
 		getPodLogs: func(*corev1.Pod) (io.ReadCloser, error) {
 			return ioutil.NopCloser(strings.NewReader("test")), nil
@@ -175,7 +175,7 @@ func TestHookExecutor_executeExecNewPodFailed(t *testing.T) {
 	}()
 
 	executor := &hookExecutor{
-		pods: client.Core(),
+		pods: client.CoreV1(),
 		out:  ioutil.Discard,
 		getPodLogs: func(*corev1.Pod) (io.ReadCloser, error) {
 			return ioutil.NopCloser(strings.NewReader("test")), nil

diff --git a/pkg/authorization/apiserver/admission/restrictusers/restrictusers.go b/pkg/authorization/apiserver/admission/restrictusers/restrictusers.go
@@ -181,7 +181,7 @@ func (q *restrictUsersAdmission) Validate(a admission.Attributes) (err error) {
 	}
 
 	roleBindingRestrictionContext, err := newRoleBindingRestrictionContext(ns,
-		q.kubeClient, q.userClient.User(), q.groupCache)
+		q.kubeClient, q.userClient.UserV1(), q.groupCache)
 	if err != nil {
 		return admission.NewForbidden(a, err)
 	}

diff --git a/pkg/authorization/apiserver/admission/restrictusers/subjectchecker_test.go b/pkg/authorization/apiserver/admission/restrictusers/subjectchecker_test.go
@@ -329,7 +329,7 @@ func TestSubjectCheckers(t *testing.T) {
 	}
 
 	ctx, err := newRoleBindingRestrictionContext("namespace",
-		kclient, fakeUserClient.User(), groupCache)
+		kclient, fakeUserClient.UserV1(), groupCache)
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}

diff --git a/pkg/build/apiserver/apiserver.go b/pkg/build/apiserver/apiserver.go
@@ -130,9 +130,9 @@ func (c *completedConfig) newV1RESTStorage() (map[string]rest.Storage, error) {
 		Client: buildgenerator.Client{
 			Builds:            buildClient.BuildV1(),
 			BuildConfigs:      buildClient.BuildV1(),
-			ImageStreams:      imageClient.Image(),
-			ImageStreamImages: imageClient.Image(),
-			ImageStreamTags:   imageClient.Image(),
+			ImageStreams:      imageClient.ImageV1(),
+			ImageStreamImages: imageClient.ImageV1(),
+			ImageStreamTags:   imageClient.ImageV1(),
 		},
 		ServiceAccounts: kubeClient.CoreV1(),
 		Secrets:         kubeClient.CoreV1(),