From 0e43e77b7ae103b2e52e2949ae521ba7ad6c3948 Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Tue, 14 Mar 2017 16:21:54 -0400 Subject: [PATCH 1/4] Rewrite k8s.io/kubernetes/pkg/util/homedir -> k8s.io/client-go/util/homedir --- pkg/bootstrap/docker/openshift/helper.go | 2 +- pkg/cmd/util/clientcmd/factory_client_access.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/bootstrap/docker/openshift/helper.go b/pkg/bootstrap/docker/openshift/helper.go index c41c8fa80a50..79d688fd2e0f 100644 --- a/pkg/bootstrap/docker/openshift/helper.go +++ b/pkg/bootstrap/docker/openshift/helper.go @@ -13,8 +13,8 @@ import ( docker "github.com/fsouza/go-dockerclient" "github.com/golang/glog" + "k8s.io/client-go/util/homedir" kapi "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/util/homedir" "github.com/openshift/origin/pkg/bootstrap/docker/dockerhelper" "github.com/openshift/origin/pkg/bootstrap/docker/errors" diff --git a/pkg/cmd/util/clientcmd/factory_client_access.go b/pkg/cmd/util/clientcmd/factory_client_access.go index 9a7b045290fb..b33a79ce86d6 100644 --- a/pkg/cmd/util/clientcmd/factory_client_access.go +++ b/pkg/cmd/util/clientcmd/factory_client_access.go @@ -23,13 +23,13 @@ import ( restclient "k8s.io/client-go/rest" kclientcmd "k8s.io/client-go/tools/clientcmd" kclientcmdapi "k8s.io/client-go/tools/clientcmd/api" + "k8s.io/client-go/util/homedir" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset" kapi "k8s.io/kubernetes/pkg/api" kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/kubectl" kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/resource" - "k8s.io/kubernetes/pkg/util/homedir" "github.com/openshift/origin/pkg/client" "github.com/openshift/origin/pkg/cmd/cli/config" From c24d43aa1de68997767a5b6b7c0ff747045f3e71 Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Tue, 14 Mar 2017 16:22:26 -0400 Subject: [PATCH 2/4] Move Insecure under TLSClientConfig --- pkg/cmd/util/clientcmd/clientcmd.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cmd/util/clientcmd/clientcmd.go b/pkg/cmd/util/clientcmd/clientcmd.go index 23521049079b..5c58cb624546 100644 --- a/pkg/cmd/util/clientcmd/clientcmd.go +++ b/pkg/cmd/util/clientcmd/clientcmd.go @@ -57,11 +57,11 @@ func AnonymousClientConfig(config *restclient.Config) restclient.Config { Prefix: config.Prefix, ContentConfig: config.ContentConfig, TLSClientConfig: restclient.TLSClientConfig{ - CAFile: config.TLSClientConfig.CAFile, - CAData: config.TLSClientConfig.CAData, + CAFile: config.TLSClientConfig.CAFile, + CAData: config.TLSClientConfig.CAData, + Insecure: config.Insecure, }, RateLimiter: config.RateLimiter, - Insecure: config.Insecure, UserAgent: config.UserAgent, Transport: config.Transport, WrapTransport: config.WrapTransport, From 137fe60d24141c5e509f30b66e0e14620a6d95c0 Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Tue, 14 Mar 2017 16:23:03 -0400 Subject: [PATCH 3/4] pkg/cmd/util/clientcmd: match upstream --- pkg/cmd/util/clientcmd/factory.go | 53 ++++++------------- .../util/clientcmd/factory_client_access.go | 42 +++++++-------- .../util/clientcmd/factory_object_mapping.go | 50 ++--------------- pkg/cmd/util/clientcmd/shortcut_restmapper.go | 8 +-- 4 files changed, 43 insertions(+), 110 deletions(-) diff --git a/pkg/cmd/util/clientcmd/factory.go b/pkg/cmd/util/clientcmd/factory.go index fd42f4c5bdf0..76c9917f745f 100644 --- a/pkg/cmd/util/clientcmd/factory.go +++ b/pkg/cmd/util/clientcmd/factory.go @@ -18,6 +18,7 @@ import ( "k8s.io/client-go/discovery" kclientcmd "k8s.io/client-go/tools/clientcmd" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" @@ -66,38 +67,14 @@ func NewFactory(optionalClientConfig kclientcmd.ClientConfig) *Factory { // PrintResourceInfos receives a list of resource infos and prints versioned objects if a generic output format was specified // otherwise, it iterates through info objects, printing each resource with a unique printer for its mapping func (f *Factory) PrintResourceInfos(cmd *cobra.Command, infos []*resource.Info, out io.Writer) error { - printer, generic, err := kcmdutil.PrinterForCommand(cmd) - if err != nil { - return nil - } - if !generic { - for _, info := range infos { - mapping := info.ResourceMapping() - printer, err := f.PrinterForMapping(cmd, mapping, false) - if err != nil { - return err - } - if err := printer.PrintObj(info.Object, out); err != nil { - return nil - } + for _, info := range infos { + if err := kcmdutil.PrintResourceInfoForCommand(cmd, info, f, out); err != nil { + // TODO(rebase-1.6) we may want to aggregate errors and return them at the end? + return err } - return nil } - clientConfig, err := f.ClientConfig() - if err != nil { - return err - } - outputVersion, err := kcmdutil.OutputVersion(cmd, clientConfig.GroupVersion) - if err != nil { - return err - } - object, err := resource.AsVersionedObject(infos, len(infos) != 1, outputVersion, api.Codecs.LegacyCodec(outputVersion)) - if err != nil { - return err - } - return printer.PrintObj(object, out) - + return nil } // FlagBinder represents an interface that allows to bind extra flags into commands. @@ -233,7 +210,7 @@ func (f *Factory) ApproximatePodTemplateForObject(object runtime.Object) (*api.P } func (f *Factory) PodForResource(resource string, timeout time.Duration) (string, error) { - sortBy := func(pods []*api.Pod) sort.Interface { return sort.Reverse(controller.ActivePods(pods)) } + sortBy := func(pods []*v1.Pod) sort.Interface { return sort.Reverse(controller.ActivePods(pods)) } namespace, _, err := f.DefaultNamespace() if err != nil { return "", err @@ -257,7 +234,7 @@ func (f *Factory) PodForResource(resource string, timeout time.Duration) (string return "", err } selector := labels.SelectorFromSet(rc.Spec.Selector) - pod, _, err := kcmdutil.GetFirstPod(kc, namespace, selector, timeout, sortBy) + pod, _, err := kcmdutil.GetFirstPod(kc.Core(), namespace, selector, timeout, sortBy) if err != nil { return "", err } @@ -290,7 +267,7 @@ func (f *Factory) PodForResource(resource string, timeout time.Duration) (string if err != nil { return "", err } - pod, _, err := kcmdutil.GetFirstPod(kc, namespace, selector, timeout, sortBy) + pod, _, err := kcmdutil.GetFirstPod(kc.Core(), namespace, selector, timeout, sortBy) if err != nil { return "", err } @@ -308,7 +285,7 @@ func (f *Factory) PodForResource(resource string, timeout time.Duration) (string if err != nil { return "", err } - pod, _, err := kcmdutil.GetFirstPod(kc, namespace, selector, timeout, sortBy) + pod, _, err := kcmdutil.GetFirstPod(kc.Core(), namespace, selector, timeout, sortBy) if err != nil { return "", err } @@ -326,7 +303,7 @@ func (f *Factory) PodForResource(resource string, timeout time.Duration) (string if err != nil { return "", err } - pod, _, err := kcmdutil.GetFirstPod(kc, namespace, selector, timeout, sortBy) + pod, _, err := kcmdutil.GetFirstPod(kc.Core(), namespace, selector, timeout, sortBy) if err != nil { return "", err } @@ -357,7 +334,7 @@ func (f *Factory) PodForResource(resource string, timeout time.Duration) (string } } -func podNameForJob(job *batch.Job, kc kclientset.Interface, timeout time.Duration, sortBy func(pods []*api.Pod) sort.Interface) (string, error) { +func podNameForJob(job *batch.Job, kc kclientset.Interface, timeout time.Duration, sortBy func(pods []*v1.Pod) sort.Interface) (string, error) { selector, err := metav1.LabelSelectorAsSelector(job.Spec.Selector) if err != nil { return "", err @@ -381,12 +358,12 @@ func FindAllCanonicalResources(d discovery.DiscoveryInterface, m meta.RESTMapper if err != nil { return nil, err } - for apiVersion, v := range all { - gv, err := schema.ParseGroupVersion(apiVersion) + for _, serverResource := range all { + gv, err := schema.ParseGroupVersion(serverResource.GroupVersion) if err != nil { continue } - for _, r := range v.APIResources { + for _, r := range serverResource.APIResources { // ignore subresources if strings.Contains(r.Name, "/") { continue diff --git a/pkg/cmd/util/clientcmd/factory_client_access.go b/pkg/cmd/util/clientcmd/factory_client_access.go index b33a79ce86d6..b0d978956b65 100644 --- a/pkg/cmd/util/clientcmd/factory_client_access.go +++ b/pkg/cmd/util/clientcmd/factory_client_access.go @@ -1,6 +1,7 @@ package clientcmd import ( + "errors" "fmt" "io" "io/ioutil" @@ -30,6 +31,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl" kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/resource" + kprinters "k8s.io/kubernetes/pkg/printers" "github.com/openshift/origin/pkg/client" "github.com/openshift/origin/pkg/cmd/cli/config" @@ -146,11 +148,11 @@ func (f *ring0Factory) DiscoveryClient() (discovery.CachedDiscoveryInterface, er return f.kubeClientAccessFactory.DiscoveryClient() } -func (f *ring0Factory) ClientSet() (*kclientset.Clientset, error) { +func (f *ring0Factory) ClientSet() (kclientset.Interface, error) { return f.kubeClientAccessFactory.ClientSet() } -func (f *ring0Factory) ClientSetForVersion(requiredVersion *schema.GroupVersion) (*kclientset.Clientset, error) { +func (f *ring0Factory) ClientSetForVersion(requiredVersion *schema.GroupVersion) (kclientset.Interface, error) { return f.kubeClientAccessFactory.ClientSetForVersion(requiredVersion) } @@ -158,6 +160,10 @@ func (f *ring0Factory) ClientConfig() (*restclient.Config, error) { return f.kubeClientAccessFactory.ClientConfig() } +func (f *ring0Factory) BareClientConfig() (*restclient.Config, error) { + return f.clientConfig.ClientConfig() +} + func (f *ring0Factory) ClientConfigForVersion(requiredVersion *schema.GroupVersion) (*restclient.Config, error) { return f.kubeClientAccessFactory.ClientConfigForVersion(nil) } @@ -231,8 +237,8 @@ func (f *ring0Factory) FlagSet() *pflag.FlagSet { return f.kubeClientAccessFactory.FlagSet() } -func (f *ring0Factory) Command() string { - return f.kubeClientAccessFactory.Command() +func (f *ring0Factory) Command(cmd *cobra.Command, showSecrets bool) string { + return f.kubeClientAccessFactory.Command(cmd, showSecrets) } func (f *ring0Factory) BindFlags(flags *pflag.FlagSet) { @@ -243,7 +249,7 @@ func (f *ring0Factory) BindExternalFlags(flags *pflag.FlagSet) { f.kubeClientAccessFactory.BindExternalFlags(flags) } -func (f *ring0Factory) DefaultResourceFilterOptions(cmd *cobra.Command, withNamespace bool) *kubectl.PrintOptions { +func (f *ring0Factory) DefaultResourceFilterOptions(cmd *cobra.Command, withNamespace bool) *kprinters.PrintOptions { return f.kubeClientAccessFactory.DefaultResourceFilterOptions(cmd, withNamespace) } @@ -257,30 +263,25 @@ func (f *ring0Factory) SuggestedPodTemplateResources() []schema.GroupResource { // Saves current resource name (or alias if any) in PrintOptions. Once saved, it will not be overwritten by the // kubernetes resource alias look-up, as it will notice a non-empty value in `options.Kind` -func (f *ring0Factory) Printer(mapping *meta.RESTMapping, options kubectl.PrintOptions) (kubectl.ResourcePrinter, error) { +func (f *ring0Factory) Printer(mapping *meta.RESTMapping, options kprinters.PrintOptions) (kprinters.ResourcePrinter, error) { if mapping != nil { options.Kind = mapping.Resource if alias, ok := resourceShortFormFor(mapping.Resource); ok { options.Kind = alias } } - return describe.NewHumanReadablePrinter(options), nil + return describe.NewHumanReadablePrinter(f.JSONEncoder(), f.Decoder(true), options), nil } -func (f *ring0Factory) Pauser(info *resource.Info) (bool, error) { +func (f *ring0Factory) Pauser(info *resource.Info) ([]byte, error) { switch t := info.Object.(type) { case *deployapi.DeploymentConfig: if t.Spec.Paused { - return true, nil + return nil, errors.New("is already paused") } t.Spec.Paused = true - oc, _, err := f.Clients() - if err != nil { - return false, err - } - _, err = oc.DeploymentConfigs(t.Namespace).Update(t) // TODO: Pause the deployer containers. - return false, err + return runtime.Encode(f.JSONEncoder(), info.Object) default: return f.kubeClientAccessFactory.Pauser(info) } @@ -326,20 +327,15 @@ func (f *ring0Factory) ResolveImage(image string) (string, error) { return imageutil.ResolveImagePullSpec(oc, oc, options.Source, image, namespace) } -func (f *ring0Factory) Resumer(info *resource.Info) (bool, error) { +func (f *ring0Factory) Resumer(info *resource.Info) ([]byte, error) { switch t := info.Object.(type) { case *deployapi.DeploymentConfig: if !t.Spec.Paused { - return true, nil + return nil, errors.New("is not paused") } t.Spec.Paused = false - oc, _, err := f.Clients() - if err != nil { - return false, err - } - _, err = oc.DeploymentConfigs(t.Namespace).Update(t) // TODO: Resume the deployer containers. - return false, err + return runtime.Encode(f.JSONEncoder(), info.Object) default: return f.kubeClientAccessFactory.Resumer(info) } diff --git a/pkg/cmd/util/clientcmd/factory_object_mapping.go b/pkg/cmd/util/clientcmd/factory_object_mapping.go index b97081020f61..68bd99dcb00d 100644 --- a/pkg/cmd/util/clientcmd/factory_object_mapping.go +++ b/pkg/cmd/util/clientcmd/factory_object_mapping.go @@ -9,21 +9,22 @@ import ( "github.com/blang/semver" "github.com/emicklei/go-restful/swagger" - "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/api/meta" metainternal "k8s.io/apimachinery/pkg/apis/meta/internalversion" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/client-go/dynamic" restclient "k8s.io/client-go/rest" kapi "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/client/typed/dynamic" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/kubectl" kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/resource" + kprinters "k8s.io/kubernetes/pkg/printers" "github.com/openshift/origin/pkg/api/latest" authorizationapi "github.com/openshift/origin/pkg/authorization/api" @@ -100,7 +101,7 @@ func (f *ring1Factory) UnstructuredClientForMapping(mapping *meta.RESTMapping) ( return f.kubeObjectMappingFactory.UnstructuredClientForMapping(mapping) } -func (f *ring1Factory) Describer(mapping *meta.RESTMapping) (kubectl.Describer, error) { +func (f *ring1Factory) Describer(mapping *meta.RESTMapping) (kprinters.Describer, error) { if latest.OriginKind(mapping.GroupVersionKind) { oClient, kClient, err := f.clientAccessFactory.Clients() if err != nil { @@ -287,7 +288,7 @@ func (f *ring1Factory) AttachablePodForObject(object runtime.Object) (*kapi.Pod, return nil, err } selector := labels.SelectorFromSet(t.Spec.Selector) - f := func(pods []*kapi.Pod) sort.Interface { return sort.Reverse(controller.ActivePods(pods)) } + f := func(pods []*v1.Pod) sort.Interface { return sort.Reverse(controller.ActivePods(pods)) } pod, _, err := kcmdutil.GetFirstPod(kc.Core(), t.Namespace, selector, 1*time.Minute, f) return pod, err default: @@ -295,47 +296,6 @@ func (f *ring1Factory) AttachablePodForObject(object runtime.Object) (*kapi.Pod, } } -// PrinterForMapping returns a printer suitable for displaying the provided resource type. -// Requires that printer flags have been added to cmd (see AddPrinterFlags). -func (f *ring1Factory) PrinterForMapping(cmd *cobra.Command, mapping *meta.RESTMapping, withNamespace bool) (kubectl.ResourcePrinter, error) { - /* - // TODO FIX ME. COPIED FROM KUBE AS PART OF THE COPY/PASTE FOR - // PrinterForMapping - if latest.OriginKind(mapping.GroupVersionKind) { - printer, ok, err := kcmdutil.PrinterForCommand(cmd) - if err != nil { - return nil, err - } - if ok && mapping != nil { - printer = kubectl.NewVersionedPrinter(printer, mapping.ObjectConvertor, mapping.GroupVersionKind.GroupVersion()) - } else { - // Some callers do not have "label-columns" so we can't use the GetFlagStringSlice() helper - columnLabel, err := cmd.Flags().GetStringSlice("label-columns") - if err != nil { - columnLabel = []string{} - } - printer, err = f.Printer(mapping, kubectl.PrintOptions{ - NoHeaders: kcmdutil.GetFlagBool(cmd, "no-headers"), - WithNamespace: withNamespace, - Wide: kcmdutil.GetWideFlag(cmd), - ShowAll: kcmdutil.GetFlagBool(cmd, "show-all"), - ShowLabels: kcmdutil.GetFlagBool(cmd, "show-labels"), - AbsoluteTimestamps: isWatch(cmd), - ColumnLabels: columnLabel, - }) - if err != nil { - return nil, err - } - printer = maybeWrapSortingPrinter(cmd, printer) - } - - return printer, nil - } - */ - - return f.kubeObjectMappingFactory.PrinterForMapping(cmd, mapping, withNamespace) -} - func (f *ring1Factory) Validator(validate bool, cacheDir string) (validation.Schema, error) { return f.kubeObjectMappingFactory.Validator(validate, cacheDir) } diff --git a/pkg/cmd/util/clientcmd/shortcut_restmapper.go b/pkg/cmd/util/clientcmd/shortcut_restmapper.go index 1d1cc9af8393..537cbc41d680 100644 --- a/pkg/cmd/util/clientcmd/shortcut_restmapper.go +++ b/pkg/cmd/util/clientcmd/shortcut_restmapper.go @@ -25,8 +25,8 @@ func NewShortcutExpander(discoveryClient discovery.DiscoveryInterface, delegate } availableResources := []schema.GroupVersionResource{} - for groupVersionString, resourceList := range apiResources { - currVersion, err := schema.ParseGroupVersion(groupVersionString) + for _, resourceList := range apiResources { + currVersion, err := schema.ParseGroupVersion(resourceList.GroupVersion) if err != nil { return defaultMapper } @@ -73,8 +73,8 @@ func (e ShortcutExpander) RESTMapping(gk schema.GroupKind, versions ...string) ( return e.RESTMapper.RESTMapping(gk, versions...) } -func (e ShortcutExpander) RESTMappings(gk schema.GroupKind) ([]*meta.RESTMapping, error) { - return e.RESTMapper.RESTMappings(gk) +func (e ShortcutExpander) RESTMappings(gk schema.GroupKind, versions ...string) ([]*meta.RESTMapping, error) { + return e.RESTMapper.RESTMappings(gk, versions...) } // userResources are the resource names that apply to the primary, user facing resources used by From 38169ade1f04dfbc857c6834f26e727f66b61c68 Mon Sep 17 00:00:00 2001 From: Andy Goldstein Date: Tue, 14 Mar 2017 16:27:29 -0400 Subject: [PATCH 4/4] Rewrite k8s.io/kubernetes/pkg/util/workqueue -> k8s.io/client-go/util/workqueue --- pkg/deploy/controller/deployment/controller.go | 2 +- pkg/deploy/controller/deployment/factory.go | 2 +- pkg/deploy/controller/deploymentconfig/controller.go | 2 +- pkg/deploy/controller/deploymentconfig/factory.go | 2 +- pkg/deploy/controller/generictrigger/controller.go | 2 +- pkg/deploy/controller/generictrigger/factory.go | 2 +- .../controller/clusterquotamapping/clusterquotamapping.go | 2 +- .../controller/clusterquotareconciliation/workqueuebucket.go | 2 +- pkg/service/controller/ingressip/controller.go | 2 +- pkg/service/controller/ingressip/controller_test.go | 2 +- .../controller/servingcert/secret_creating_controller.go | 3 +-- .../controller/servingcert/secret_updating_controller.go | 3 +-- pkg/serviceaccounts/controllers/create_dockercfg_secrets.go | 2 +- pkg/serviceaccounts/controllers/docker_registry_service.go | 2 +- pkg/unidling/controller/controller.go | 2 +- 15 files changed, 15 insertions(+), 17 deletions(-) diff --git a/pkg/deploy/controller/deployment/controller.go b/pkg/deploy/controller/deployment/controller.go index 310664af0a23..d2937fcb4c70 100755 --- a/pkg/deploy/controller/deployment/controller.go +++ b/pkg/deploy/controller/deployment/controller.go @@ -11,10 +11,10 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/tools/cache" + "k8s.io/client-go/util/workqueue" kapi "k8s.io/kubernetes/pkg/api" kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" - "k8s.io/kubernetes/pkg/util/workqueue" deployapi "github.com/openshift/origin/pkg/deploy/api" deployutil "github.com/openshift/origin/pkg/deploy/util" diff --git a/pkg/deploy/controller/deployment/factory.go b/pkg/deploy/controller/deployment/factory.go index d9704f109b70..cf0b27d5093a 100644 --- a/pkg/deploy/controller/deployment/factory.go +++ b/pkg/deploy/controller/deployment/factory.go @@ -8,12 +8,12 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/cache" + "k8s.io/client-go/util/workqueue" kapi "k8s.io/kubernetes/pkg/api" kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" kcontroller "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/util/workqueue" deployutil "github.com/openshift/origin/pkg/deploy/util" ) diff --git a/pkg/deploy/controller/deploymentconfig/controller.go b/pkg/deploy/controller/deploymentconfig/controller.go index 489b69a7f4be..fb5736eb8aef 100644 --- a/pkg/deploy/controller/deploymentconfig/controller.go +++ b/pkg/deploy/controller/deploymentconfig/controller.go @@ -13,11 +13,11 @@ import ( kutilerrors "k8s.io/apimachinery/pkg/util/errors" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/tools/cache" + "k8s.io/client-go/util/workqueue" kapi "k8s.io/kubernetes/pkg/api" kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/retry" - "k8s.io/kubernetes/pkg/util/workqueue" osclient "github.com/openshift/origin/pkg/client" oscache "github.com/openshift/origin/pkg/client/cache" diff --git a/pkg/deploy/controller/deploymentconfig/factory.go b/pkg/deploy/controller/deploymentconfig/factory.go index cbe37d1ebaf4..1065158f409d 100644 --- a/pkg/deploy/controller/deploymentconfig/factory.go +++ b/pkg/deploy/controller/deploymentconfig/factory.go @@ -8,12 +8,12 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/cache" + "k8s.io/client-go/util/workqueue" kapi "k8s.io/kubernetes/pkg/api" kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/record" kcontroller "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/util/workqueue" osclient "github.com/openshift/origin/pkg/client" deployapi "github.com/openshift/origin/pkg/deploy/api" diff --git a/pkg/deploy/controller/generictrigger/controller.go b/pkg/deploy/controller/generictrigger/controller.go index a7f5a1b7efb0..4d7942dedc61 100644 --- a/pkg/deploy/controller/generictrigger/controller.go +++ b/pkg/deploy/controller/generictrigger/controller.go @@ -4,7 +4,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/tools/cache" - "k8s.io/kubernetes/pkg/util/workqueue" + "k8s.io/client-go/util/workqueue" "github.com/golang/glog" osclient "github.com/openshift/origin/pkg/client" diff --git a/pkg/deploy/controller/generictrigger/factory.go b/pkg/deploy/controller/generictrigger/factory.go index b0e13b03348e..362cef924075 100644 --- a/pkg/deploy/controller/generictrigger/factory.go +++ b/pkg/deploy/controller/generictrigger/factory.go @@ -10,8 +10,8 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/cache" + "k8s.io/client-go/util/workqueue" kcontroller "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/util/workqueue" osclient "github.com/openshift/origin/pkg/client" deployapi "github.com/openshift/origin/pkg/deploy/api" diff --git a/pkg/quota/controller/clusterquotamapping/clusterquotamapping.go b/pkg/quota/controller/clusterquotamapping/clusterquotamapping.go index b929cced9aeb..5230d9192d6d 100644 --- a/pkg/quota/controller/clusterquotamapping/clusterquotamapping.go +++ b/pkg/quota/controller/clusterquotamapping/clusterquotamapping.go @@ -12,10 +12,10 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/cache" + "k8s.io/client-go/util/workqueue" kapi "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/informers" - "k8s.io/kubernetes/pkg/util/workqueue" ocache "github.com/openshift/origin/pkg/client/cache" "github.com/openshift/origin/pkg/controller/shared" diff --git a/pkg/quota/controller/clusterquotareconciliation/workqueuebucket.go b/pkg/quota/controller/clusterquotareconciliation/workqueuebucket.go index 3f4bb2012e3d..a98422208710 100644 --- a/pkg/quota/controller/clusterquotareconciliation/workqueuebucket.go +++ b/pkg/quota/controller/clusterquotareconciliation/workqueuebucket.go @@ -3,7 +3,7 @@ package clusterquotareconciliation import ( "sync" - "k8s.io/kubernetes/pkg/util/workqueue" + "k8s.io/client-go/util/workqueue" ) // BucketingWorkQueue gives a way to add items related to a single entry in a work queue diff --git a/pkg/service/controller/ingressip/controller.go b/pkg/service/controller/ingressip/controller.go index 82fa650c90cd..25967dbbb885 100644 --- a/pkg/service/controller/ingressip/controller.go +++ b/pkg/service/controller/ingressip/controller.go @@ -16,6 +16,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" + "k8s.io/client-go/util/workqueue" kapi "k8s.io/kubernetes/pkg/api" kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" @@ -23,7 +24,6 @@ import ( "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/registry/core/service/allocator" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" - "k8s.io/kubernetes/pkg/util/workqueue" ) const ( diff --git a/pkg/service/controller/ingressip/controller_test.go b/pkg/service/controller/ingressip/controller_test.go index f4f21fdf61f1..66e1cb9b0f05 100644 --- a/pkg/service/controller/ingressip/controller_test.go +++ b/pkg/service/controller/ingressip/controller_test.go @@ -11,12 +11,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/util/workqueue" kapi "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" - "k8s.io/kubernetes/pkg/util/workqueue" ) const namespace = "ns" diff --git a/pkg/service/controller/servingcert/secret_creating_controller.go b/pkg/service/controller/servingcert/secret_creating_controller.go index e3290b92a5ba..83eb37705adc 100644 --- a/pkg/service/controller/servingcert/secret_creating_controller.go +++ b/pkg/service/controller/servingcert/secret_creating_controller.go @@ -9,7 +9,6 @@ import ( "github.com/golang/glog" kapierrors "k8s.io/apimachinery/pkg/api/errors" - metainternal "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" @@ -17,10 +16,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" + "k8s.io/client-go/util/workqueue" kapi "k8s.io/kubernetes/pkg/api" kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/util/workqueue" "github.com/openshift/origin/pkg/cmd/server/crypto" "github.com/openshift/origin/pkg/cmd/server/crypto/extensions" diff --git a/pkg/service/controller/servingcert/secret_updating_controller.go b/pkg/service/controller/servingcert/secret_updating_controller.go index bc16251cc4fd..556f39e471cc 100644 --- a/pkg/service/controller/servingcert/secret_updating_controller.go +++ b/pkg/service/controller/servingcert/secret_updating_controller.go @@ -6,7 +6,6 @@ import ( "github.com/golang/glog" - metainternal "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" @@ -14,10 +13,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" + "k8s.io/client-go/util/workqueue" kapi "k8s.io/kubernetes/pkg/api" kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/util/workqueue" "github.com/openshift/origin/pkg/cmd/server/crypto" "github.com/openshift/origin/pkg/cmd/server/crypto/extensions" diff --git a/pkg/serviceaccounts/controllers/create_dockercfg_secrets.go b/pkg/serviceaccounts/controllers/create_dockercfg_secrets.go index 9809af9f10d2..999d4039128a 100644 --- a/pkg/serviceaccounts/controllers/create_dockercfg_secrets.go +++ b/pkg/serviceaccounts/controllers/create_dockercfg_secrets.go @@ -18,6 +18,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" + "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/pkg/api" kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/retry" @@ -25,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/credentialprovider" "k8s.io/kubernetes/pkg/registry/core/secret" "k8s.io/kubernetes/pkg/types" - "k8s.io/kubernetes/pkg/util/workqueue" osautil "github.com/openshift/origin/pkg/serviceaccounts/util" ) diff --git a/pkg/serviceaccounts/controllers/docker_registry_service.go b/pkg/serviceaccounts/controllers/docker_registry_service.go index 0a711101e956..4e0f92a9af4c 100644 --- a/pkg/serviceaccounts/controllers/docker_registry_service.go +++ b/pkg/serviceaccounts/controllers/docker_registry_service.go @@ -18,11 +18,11 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" + "k8s.io/client-go/util/workqueue" kapi "k8s.io/kubernetes/pkg/api" kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/credentialprovider" - "k8s.io/kubernetes/pkg/util/workqueue" ) // DockerRegistryServiceControllerOptions contains options for the DockerRegistryServiceController diff --git a/pkg/unidling/controller/controller.go b/pkg/unidling/controller/controller.go index 88e8b55b171e..0af95335f286 100644 --- a/pkg/unidling/controller/controller.go +++ b/pkg/unidling/controller/controller.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/kubernetes/pkg/util/workqueue" + "k8s.io/client-go/util/workqueue" "github.com/golang/glog" )