Use versioned client APIs (#1458)

openshift · Oct 23, 2017 · 4bea012 · 4bea012
1 parent ff4af30
commit 4bea012
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -421,7 +421,7 @@ func getAuthCredentialsFromClusterServiceBroker(client kubernetes.Interface, bro
 	authInfo := broker.Spec.AuthInfo
 	if authInfo.Basic != nil {
 		secretRef := authInfo.Basic.SecretRef
-		secret, err := client.Core().Secrets(secretRef.Namespace).Get(secretRef.Name, metav1.GetOptions{})
+		secret, err := client.CoreV1().Secrets(secretRef.Namespace).Get(secretRef.Name, metav1.GetOptions{})
 		if err != nil {
 			return nil, err
 		}
@@ -434,7 +434,7 @@ func getAuthCredentialsFromClusterServiceBroker(client kubernetes.Interface, bro
 		}, nil
 	} else if authInfo.Bearer != nil {
 		secretRef := authInfo.Bearer.SecretRef
-		secret, err := client.Core().Secrets(secretRef.Namespace).Get(secretRef.Name, metav1.GetOptions{})
+		secret, err := client.CoreV1().Secrets(secretRef.Namespace).Get(secretRef.Name, metav1.GetOptions{})
 		if err != nil {
 			return nil, err
 		}

diff --git a/pkg/controller/controller_binding.go b/pkg/controller/controller_binding.go
@@ -839,7 +839,7 @@ func (c *controller) injectServiceBinding(binding *v1beta1.ServiceBinding, crede
 	}
 
 	// Creating/updating the Secret
-	secretClient := c.kubeClient.Core().Secrets(binding.Namespace)
+	secretClient := c.kubeClient.CoreV1().Secrets(binding.Namespace)
 	existingSecret, err := secretClient.Get(binding.Spec.SecretName, metav1.GetOptions{})
 	if err == nil {
 		// Update existing secret
@@ -896,7 +896,7 @@ func (c *controller) ejectServiceBinding(binding *v1beta1.ServiceBinding) error
 		`%s "%s/%s": Deleting Secret "%s/%s"`,
 		typeSB, binding.Namespace, binding.Name, binding.Namespace, binding.Spec.SecretName,
 	)
-	err = c.kubeClient.Core().Secrets(binding.Namespace).Delete(binding.Spec.SecretName, &metav1.DeleteOptions{})
+	err = c.kubeClient.CoreV1().Secrets(binding.Namespace).Delete(binding.Spec.SecretName, &metav1.DeleteOptions{})
 	if err != nil && !apierrors.IsNotFound(err) {
 		return err
 	}

diff --git a/pkg/controller/controller_instance.go b/pkg/controller/controller_instance.go
@@ -641,7 +641,7 @@ func (c *controller) reconcileServiceInstance(instance *v1beta1.ServiceInstance)
 		return err
 	}
 
-	ns, err := c.kubeClient.Core().Namespaces().Get(instance.Namespace, metav1.GetOptions{})
+	ns, err := c.kubeClient.CoreV1().Namespaces().Get(instance.Namespace, metav1.GetOptions{})
 	if err != nil {
 		s := fmt.Sprintf("Failed to get namespace %q during instance create: %s", instance.Namespace, err)
 		glog.Infof(

diff --git a/plugin/pkg/admission/broker/authsarcheck/admission.go b/plugin/pkg/admission/broker/authsarcheck/admission.go
@@ -111,7 +111,7 @@ func (s *sarcheck) Admit(a admission.Attributes) error {
 			//UID:    userInfo.GetUID(),
 		},
 	}
-	sar, err := s.client.Authorization().SubjectAccessReviews().Create(sar)
+	sar, err := s.client.AuthorizationV1().SubjectAccessReviews().Create(sar)
 	if err != nil {
 		return err
 	}

diff --git a/plugin/pkg/admission/namespace/lifecycle/admission.go b/plugin/pkg/admission/namespace/lifecycle/admission.go
@@ -113,7 +113,7 @@ func (l *lifecycle) Admit(a admission.Attributes) error {
 	// refuse to operate on non-existent namespaces
 	if !exists {
 		// as a last resort, make a call directly to storage
-		namespace, err = l.client.Core().Namespaces().Get(a.GetNamespace(), metav1.GetOptions{})
+		namespace, err = l.client.CoreV1().Namespaces().Get(a.GetNamespace(), metav1.GetOptions{})
 		switch {
 		case errors.IsNotFound(err):
 			return err

diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go
@@ -110,7 +110,7 @@ func CreateKubeNamespace(baseName string, c kubernetes.Interface) (*corev1.Names
 	var got *corev1.Namespace
 	err := wait.PollImmediate(Poll, defaultTimeout, func() (bool, error) {
 		var err error
-		got, err = c.Core().Namespaces().Create(ns)
+		got, err = c.CoreV1().Namespaces().Create(ns)
 		if err != nil {
 			Logf("Unexpected error while creating namespace: %v", err)
 			return false, nil
@@ -124,7 +124,7 @@ func CreateKubeNamespace(baseName string, c kubernetes.Interface) (*corev1.Names
 }
 
 func DeleteKubeNamespace(c kubernetes.Interface, namespace string) error {
-	return c.Core().Namespaces().Delete(namespace, nil)
+	return c.CoreV1().Namespaces().Delete(namespace, nil)
 }
 
 func ExpectNoError(err error, explain ...interface{}) {
@@ -171,7 +171,7 @@ func endpointAvailable(c kubernetes.Interface, namespace, name string) wait.Cond
 
 func podRunning(c kubernetes.Interface, podName, namespace string) wait.ConditionFunc {
 	return func() (bool, error) {
-		pod, err := c.Core().Pods(namespace).Get(podName, metav1.GetOptions{})
+		pod, err := c.CoreV1().Pods(namespace).Get(podName, metav1.GetOptions{})
 		if err != nil {
 			return false, err
 		}

diff --git a/vendor/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go b/vendor/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go