diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 6ef5711fc6..3f34eeca55 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -60,7 +60,6 @@ go_library( "//pkg/apis/certificates:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/kubectl:go_default_library", "//pkg/kubectl/apply/parse:go_default_library", @@ -126,6 +125,7 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes/typed/batch/v1:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/scale:go_default_library", diff --git a/pkg/kubectl/cmd/auth/BUILD b/pkg/kubectl/cmd/auth/BUILD index 0083071fef..0cf0b82cc3 100644 --- a/pkg/kubectl/cmd/auth/BUILD +++ b/pkg/kubectl/cmd/auth/BUILD @@ -16,8 +16,6 @@ go_library( "//build/visible_to:pkg_kubectl_cmd_auth_CONSUMERS", ], deps = [ - "//pkg/apis/authorization:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion:go_default_library", "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/genericclioptions:go_default_library", @@ -25,11 +23,13 @@ go_library( "//pkg/kubectl/genericclioptions/resource:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/registry/rbac/reconciliation:go_default_library", + "//staging/src/k8s.io/api/authorization/v1:go_default_library", "//staging/src/k8s.io/api/rbac/v1:go_default_library", "//staging/src/k8s.io/api/rbac/v1alpha1:go_default_library", "//staging/src/k8s.io/api/rbac/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1:go_default_library", "//vendor/github.com/golang/glog:go_default_library", diff --git a/pkg/kubectl/cmd/auth/cani.go b/pkg/kubectl/cmd/auth/cani.go index 118f0876d4..992c2d7456 100644 --- a/pkg/kubectl/cmd/auth/cani.go +++ b/pkg/kubectl/cmd/auth/cani.go @@ -24,14 +24,14 @@ import ( "strings" "github.com/spf13/cobra" - "k8s.io/kubernetes/pkg/kubectl/genericclioptions" + authorizationv1 "k8s.io/api/authorization/v1" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime/schema" - authorizationapi "k8s.io/kubernetes/pkg/apis/authorization" - internalauthorizationclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion" + authorizationv1client "k8s.io/client-go/kubernetes/typed/authorization/v1" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/genericclioptions" ) // CanIOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of @@ -40,7 +40,7 @@ type CanIOptions struct { AllNamespaces bool Quiet bool Namespace string - SelfSARClient internalauthorizationclient.SelfSubjectAccessReviewsGetter + SelfSARClient authorizationv1client.SelfSubjectAccessReviewsGetter Verb string Resource schema.GroupVersionResource @@ -138,11 +138,11 @@ func (o *CanIOptions) Complete(f cmdutil.Factory, args []string) error { } var err error - client, err := f.ClientSet() + client, err := f.KubernetesClientSet() if err != nil { return err } - o.SelfSARClient = client.Authorization() + o.SelfSARClient = client.AuthorizationV1() o.Namespace = "" if !o.AllNamespaces { @@ -168,11 +168,11 @@ func (o *CanIOptions) Validate() error { } func (o *CanIOptions) RunAccessCheck() (bool, error) { - var sar *authorizationapi.SelfSubjectAccessReview + var sar *authorizationv1.SelfSubjectAccessReview if o.NonResourceURL == "" { - sar = &authorizationapi.SelfSubjectAccessReview{ - Spec: authorizationapi.SelfSubjectAccessReviewSpec{ - ResourceAttributes: &authorizationapi.ResourceAttributes{ + sar = &authorizationv1.SelfSubjectAccessReview{ + Spec: authorizationv1.SelfSubjectAccessReviewSpec{ + ResourceAttributes: &authorizationv1.ResourceAttributes{ Namespace: o.Namespace, Verb: o.Verb, Group: o.Resource.Group, @@ -183,9 +183,9 @@ func (o *CanIOptions) RunAccessCheck() (bool, error) { }, } } else { - sar = &authorizationapi.SelfSubjectAccessReview{ - Spec: authorizationapi.SelfSubjectAccessReviewSpec{ - NonResourceAttributes: &authorizationapi.NonResourceAttributes{ + sar = &authorizationv1.SelfSubjectAccessReview{ + Spec: authorizationv1.SelfSubjectAccessReviewSpec{ + NonResourceAttributes: &authorizationv1.NonResourceAttributes{ Verb: o.Verb, Path: o.NonResourceURL, }, diff --git a/pkg/kubectl/cmd/clusterinfo_dump.go b/pkg/kubectl/cmd/clusterinfo_dump.go index c4200b221a..74d9fcb8bc 100644 --- a/pkg/kubectl/cmd/clusterinfo_dump.go +++ b/pkg/kubectl/cmd/clusterinfo_dump.go @@ -25,9 +25,10 @@ import ( "github.com/spf13/cobra" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes" api "k8s.io/kubernetes/pkg/apis/core" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/genericclioptions" @@ -46,7 +47,7 @@ type ClusterInfoDumpOptions struct { Namespaces []string Timeout time.Duration - Clientset internalclientset.Interface + Clientset kubernetes.Interface Namespace string RESTClientGetter genericclioptions.RESTClientGetter LogsForObject polymorphichelpers.LogsForObjectFunc @@ -130,7 +131,7 @@ func (o *ClusterInfoDumpOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) if err != nil { return err } - o.Clientset, err = f.ClientSet() + o.Clientset, err = f.KubernetesClientSet() if err != nil { return err } @@ -232,7 +233,7 @@ func (o *ClusterInfoDumpOptions) Run() error { return err } - printContainer := func(writer io.Writer, container api.Container, pod *api.Pod) { + printContainer := func(writer io.Writer, container corev1.Container, pod *corev1.Pod) { writer.Write([]byte(fmt.Sprintf("==== START logs for container %s of pod %s/%s ====\n", container.Name, pod.Namespace, pod.Name))) defer writer.Write([]byte(fmt.Sprintf("==== END logs for container %s of pod %s/%s ====\n", container.Name, pod.Namespace, pod.Name))) diff --git a/pkg/kubectl/cmd/cp.go b/pkg/kubectl/cmd/cp.go index 2c67fee7c6..a62f58cfdf 100644 --- a/pkg/kubectl/cmd/cp.go +++ b/pkg/kubectl/cmd/cp.go @@ -27,8 +27,8 @@ import ( "path/filepath" "strings" + "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/genericclioptions" @@ -70,7 +70,7 @@ type CopyOptions struct { Namespace string ClientConfig *restclient.Config - Clientset internalclientset.Interface + Clientset kubernetes.Interface genericclioptions.IOStreams } @@ -144,7 +144,7 @@ func (o *CopyOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error { return err } - o.Clientset, err = f.ClientSet() + o.Clientset, err = f.KubernetesClientSet() if err != nil { return err } diff --git a/pkg/kubectl/cmd/create/create_deployment.go b/pkg/kubectl/cmd/create/create_deployment.go index 13ec3235d5..c98a3956dc 100644 --- a/pkg/kubectl/cmd/create/create_deployment.go +++ b/pkg/kubectl/cmd/create/create_deployment.go @@ -117,7 +117,7 @@ func (o *DeploymentOpts) Complete(f cmdutil.Factory, cmd *cobra.Command, args [] return err } - clientset, err := f.ClientSet() + clientset, err := f.KubernetesClientSet() if err != nil { return err } diff --git a/pkg/kubectl/cmd/exec.go b/pkg/kubectl/cmd/exec.go index 16e8f92ed1..883dfb042e 100644 --- a/pkg/kubectl/cmd/exec.go +++ b/pkg/kubectl/cmd/exec.go @@ -24,12 +24,13 @@ import ( dockerterm "github.com/docker/docker/pkg/term" "github.com/spf13/cobra" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + coreclient "k8s.io/client-go/kubernetes/typed/core/v1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/remotecommand" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" - coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/genericclioptions" @@ -186,11 +187,11 @@ func (p *ExecOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, argsIn []s } p.Config = config - clientset, err := f.ClientSet() + clientset, err := f.KubernetesClientSet() if err != nil { return err } - p.PodClient = clientset.Core() + p.PodClient = clientset.CoreV1() return nil } @@ -271,7 +272,7 @@ func (p *ExecOptions) Run() error { return err } - if pod.Status.Phase == api.PodSucceeded || pod.Status.Phase == api.PodFailed { + if pod.Status.Phase == corev1.PodSucceeded || pod.Status.Phase == corev1.PodFailed { return fmt.Errorf("cannot exec into a container in a completed pod; current phase is %s", pod.Status.Phase) } diff --git a/pkg/kubectl/cmd/scale.go b/pkg/kubectl/cmd/scale.go index a883456dd2..7b25f1b36d 100644 --- a/pkg/kubectl/cmd/scale.go +++ b/pkg/kubectl/cmd/scale.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - batchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" + "k8s.io/client-go/kubernetes" + batchclient "k8s.io/client-go/kubernetes/typed/batch/v1" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/cmd/scalejob" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" @@ -84,7 +84,7 @@ type ScaleOptions struct { enforceNamespace bool args []string shortOutput bool - clientSet internalclientset.Interface + clientSet kubernetes.Interface scaler kubectl.Scaler unstructuredClientForMapping func(mapping *meta.RESTMapping) (resource.RESTClient, error) parent string @@ -156,7 +156,7 @@ func (o *ScaleOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []st o.builder = f.NewBuilder() o.args = args o.shortOutput = cmdutil.GetFlagString(cmd, "output") == "name" - o.clientSet, err = f.ClientSet() + o.clientSet, err = f.KubernetesClientSet() if err != nil { return err } diff --git a/pkg/kubectl/cmd/scalejob/BUILD b/pkg/kubectl/cmd/scalejob/BUILD index d2f6215faf..35d2f0d528 100644 --- a/pkg/kubectl/cmd/scalejob/BUILD +++ b/pkg/kubectl/cmd/scalejob/BUILD @@ -9,11 +9,11 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/scalejob", visibility = ["//visibility:public"], deps = [ - "//pkg/apis/batch:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", + "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes/typed/batch/v1:go_default_library", ], ) @@ -22,12 +22,12 @@ go_test( srcs = ["scalejob_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/apis/batch:go_default_library", "//pkg/apis/core:go_default_library", - "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", - "//pkg/client/clientset_generated/internalclientset/typed/batch/internalversion:go_default_library", + "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes/typed/batch/v1:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library", ], ) diff --git a/pkg/kubectl/cmd/scalejob/scalejob.go b/pkg/kubectl/cmd/scalejob/scalejob.go index 687c7b48a7..5324c33219 100644 --- a/pkg/kubectl/cmd/scalejob/scalejob.go +++ b/pkg/kubectl/cmd/scalejob/scalejob.go @@ -21,12 +21,11 @@ import ( "strconv" "time" + batch "k8s.io/api/batch/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/kubernetes/pkg/apis/batch" - - batchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" + batchclient "k8s.io/client-go/kubernetes/typed/batch/v1" ) // ScalePrecondition is a deprecated precondition diff --git a/pkg/kubectl/cmd/scalejob/scalejob_test.go b/pkg/kubectl/cmd/scalejob/scalejob_test.go index d8a22f88ef..c233bda2fd 100644 --- a/pkg/kubectl/cmd/scalejob/scalejob_test.go +++ b/pkg/kubectl/cmd/scalejob/scalejob_test.go @@ -20,13 +20,13 @@ import ( "errors" "testing" + batch "k8s.io/api/batch/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes/fake" + batchclient "k8s.io/client-go/kubernetes/typed/batch/v1" testcore "k8s.io/client-go/testing" - "k8s.io/kubernetes/pkg/apis/batch" api "k8s.io/kubernetes/pkg/apis/core" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - batchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" ) type errorJobs struct {