From 8e33cbfa281b7e464100a052c9408a1947ec29d5 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Wed, 5 Aug 2015 15:03:47 -0700 Subject: [PATCH] rewrite go imports --- Godeps/Godeps.json | 2 +- cluster/addons/dns/kube2sky/kube2sky.go | 18 ++-- cluster/addons/dns/kube2sky/kube2sky_test.go | 4 +- .../elasticsearch_logging_discovery.go | 4 +- cluster/addons/kube-ui/image/kube-ui.go | 2 +- cmd/genbashcomp/gen_kubectl_bash_comp.go | 6 +- cmd/genconversion/conversion.go | 14 +-- cmd/gendeepcopy/deep_copy.go | 14 +-- cmd/gendocs/gen_kubectl_docs.go | 6 +- cmd/genman/gen_kubectl_man.go | 6 +- cmd/hyperkube/hyperkube.go | 4 +- cmd/hyperkube/kube-apiserver.go | 2 +- cmd/hyperkube/kube-controller-manager.go | 2 +- cmd/hyperkube/kube-proxy.go | 2 +- cmd/hyperkube/kube-scheduler.go | 2 +- cmd/hyperkube/kubelet.go | 2 +- cmd/hyperkube/server.go | 2 +- cmd/integration/integration.go | 56 ++++++------ cmd/kube-apiserver/apiserver.go | 6 +- cmd/kube-apiserver/app/plugins.go | 34 +++---- cmd/kube-apiserver/app/server.go | 30 +++---- .../app/controllermanager.go | 32 +++---- cmd/kube-controller-manager/app/plugins.go | 20 ++--- .../controller-manager.go | 8 +- cmd/kube-proxy/app/server.go | 16 ++-- cmd/kube-proxy/proxy.go | 8 +- cmd/kube-version-change/version.go | 6 +- cmd/kubectl/kubectl.go | 4 +- cmd/kubelet/app/plugins.go | 44 ++++----- cmd/kubelet/app/server.go | 44 ++++----- cmd/kubelet/kubelet.go | 6 +- cmd/kubernetes/kubernetes.go | 42 ++++----- contrib/diurnal/dc.go | 4 +- contrib/for-tests/network-tester/webserver.go | 4 +- contrib/git-sync/main.go | 2 +- .../mesos/cmd/k8sm-controller-manager/main.go | 8 +- contrib/mesos/cmd/k8sm-executor/main.go | 8 +- contrib/mesos/cmd/k8sm-redirfd/redirfd.go | 2 +- contrib/mesos/cmd/k8sm-scheduler/main.go | 8 +- contrib/mesos/cmd/km/hyperkube.go | 4 +- .../mesos/cmd/km/k8sm-controllermanager.go | 4 +- contrib/mesos/cmd/km/k8sm-executor.go | 4 +- contrib/mesos/cmd/km/k8sm-minion.go | 4 +- contrib/mesos/cmd/km/k8sm-scheduler.go | 4 +- contrib/mesos/cmd/km/kube-apiserver.go | 4 +- contrib/mesos/cmd/km/kube-proxy.go | 4 +- contrib/mesos/cmd/km/server.go | 2 +- .../controllermanager/controllermanager.go | 38 ++++---- contrib/mesos/pkg/election/etcd_master.go | 8 +- .../mesos/pkg/election/etcd_master_test.go | 4 +- contrib/mesos/pkg/election/fake.go | 2 +- contrib/mesos/pkg/election/master.go | 4 +- contrib/mesos/pkg/election/master_test.go | 2 +- contrib/mesos/pkg/executor/executor.go | 20 ++--- contrib/mesos/pkg/executor/executor_test.go | 26 +++--- contrib/mesos/pkg/executor/mock_test.go | 2 +- contrib/mesos/pkg/executor/service/service.go | 30 +++---- contrib/mesos/pkg/minion/config/config.go | 2 +- contrib/mesos/pkg/minion/server.go | 12 +-- contrib/mesos/pkg/offers/offers.go | 12 +-- contrib/mesos/pkg/offers/offers_test.go | 2 +- contrib/mesos/pkg/proc/proc.go | 2 +- contrib/mesos/pkg/proc/proc_test.go | 2 +- contrib/mesos/pkg/queue/delay.go | 2 +- contrib/mesos/pkg/queue/historical.go | 2 +- contrib/mesos/pkg/queue/interface.go | 2 +- contrib/mesos/pkg/runtime/metrics.go | 2 +- contrib/mesos/pkg/runtime/util.go | 2 +- contrib/mesos/pkg/scheduler/fcfs.go | 4 +- contrib/mesos/pkg/scheduler/ha/election.go | 2 +- contrib/mesos/pkg/scheduler/ha/ha.go | 4 +- contrib/mesos/pkg/scheduler/mock_test.go | 6 +- contrib/mesos/pkg/scheduler/plugin.go | 32 +++---- contrib/mesos/pkg/scheduler/plugin_test.go | 30 +++---- contrib/mesos/pkg/scheduler/pod.go | 6 +- contrib/mesos/pkg/scheduler/podtask/leaky.go | 4 +- .../mesos/pkg/scheduler/podtask/pod_task.go | 10 +-- .../pkg/scheduler/podtask/pod_task_test.go | 6 +- .../pkg/scheduler/podtask/port_mapping.go | 4 +- .../scheduler/podtask/port_mapping_test.go | 2 +- .../mesos/pkg/scheduler/podtask/registry.go | 4 +- .../pkg/scheduler/podtask/registry_test.go | 4 +- .../mesos/pkg/scheduler/resource/resource.go | 6 +- contrib/mesos/pkg/scheduler/scheduler.go | 40 ++++----- contrib/mesos/pkg/scheduler/scheduler_test.go | 8 +- .../mesos/pkg/scheduler/service/publish.go | 6 +- .../mesos/pkg/scheduler/service/service.go | 44 ++++----- .../pkg/scheduler/service/service_test.go | 4 +- contrib/mesos/pkg/scheduler/types.go | 4 +- .../mesos/pkg/service/endpoints_controller.go | 28 +++--- .../pkg/service/endpoints_controller_test.go | 2 +- contrib/pod-master/podmaster.go | 2 +- .../service_loadbalancer.go | 16 ++-- .../service_loadbalancer_test.go | 6 +- contrib/submit-queue/github/github.go | 2 +- contrib/submit-queue/submit-queue.go | 4 +- .../elasticsearch/elasticsearch_discovery.go | 8 +- examples/examples_test.go | 16 ++-- examples/https-nginx/make_secret.go | 6 +- pkg/admission/attributes.go | 4 +- pkg/admission/chain.go | 2 +- pkg/admission/errors.go | 4 +- pkg/admission/handler.go | 2 +- pkg/admission/interfaces.go | 4 +- pkg/admission/plugins.go | 2 +- pkg/api/context.go | 2 +- pkg/api/context_test.go | 2 +- pkg/api/conversion.go | 12 +-- pkg/api/conversion_test.go | 4 +- pkg/api/copy_test.go | 6 +- pkg/api/deep_copy_generated.go | 12 +-- pkg/api/deep_copy_test.go | 2 +- pkg/api/endpoints/util.go | 4 +- pkg/api/endpoints/util_test.go | 2 +- pkg/api/errors/errors.go | 8 +- pkg/api/errors/errors_test.go | 6 +- pkg/api/errors/etcd/etcd.go | 4 +- pkg/api/generate.go | 2 +- pkg/api/helpers.go | 12 +-- pkg/api/helpers_test.go | 2 +- pkg/api/latest/latest.go | 14 +-- pkg/api/latest/latest_test.go | 2 +- pkg/api/mapper.go | 4 +- pkg/api/meta.go | 6 +- pkg/api/meta/interfaces.go | 4 +- pkg/api/meta/meta.go | 6 +- pkg/api/meta/meta_test.go | 4 +- pkg/api/meta/restmapper_test.go | 2 +- pkg/api/meta_test.go | 2 +- pkg/api/ref.go | 4 +- pkg/api/ref_test.go | 2 +- pkg/api/register.go | 2 +- pkg/api/resource/quantity_example_test.go | 2 +- pkg/api/resource_helpers.go | 2 +- pkg/api/resource_helpers_test.go | 2 +- pkg/api/rest/create.go | 8 +- pkg/api/rest/create_test.go | 4 +- pkg/api/rest/delete.go | 4 +- pkg/api/rest/rest.go | 10 +-- pkg/api/rest/resttest/resttest.go | 12 +-- pkg/api/rest/types.go | 8 +- pkg/api/rest/update.go | 8 +- pkg/api/rest/update_test.go | 6 +- pkg/api/serialization_test.go | 14 +-- pkg/api/testapi/testapi.go | 6 +- pkg/api/testing/fuzzer.go | 16 ++-- pkg/api/types.go | 12 +-- pkg/api/v1/conversion.go | 4 +- pkg/api/v1/conversion_generated.go | 6 +- pkg/api/v1/conversion_test.go | 4 +- pkg/api/v1/deep_copy_generated.go | 10 +-- pkg/api/v1/defaults.go | 4 +- pkg/api/v1/defaults_test.go | 8 +- pkg/api/v1/register.go | 6 +- pkg/api/v1/types.go | 8 +- pkg/api/validation/events.go | 6 +- pkg/api/validation/events_test.go | 2 +- pkg/api/validation/schema.go | 6 +- pkg/api/validation/schema_test.go | 8 +- pkg/api/validation/validation.go | 12 +-- pkg/api/validation/validation_test.go | 16 ++-- pkg/apiserver/api_installer.go | 14 +-- pkg/apiserver/api_installer_test.go | 4 +- pkg/apiserver/apiserver.go | 26 +++--- pkg/apiserver/apiserver_test.go | 26 +++--- pkg/apiserver/authn.go | 20 ++--- pkg/apiserver/authz.go | 4 +- pkg/apiserver/errors.go | 6 +- pkg/apiserver/errors_test.go | 4 +- pkg/apiserver/handlers.go | 12 +-- pkg/apiserver/handlers_test.go | 10 +-- pkg/apiserver/index.go | 2 +- pkg/apiserver/proxy.go | 20 ++--- pkg/apiserver/proxy_test.go | 2 +- pkg/apiserver/resthandler.go | 14 +-- pkg/apiserver/validator.go | 2 +- pkg/apiserver/validator_test.go | 2 +- pkg/apiserver/watch.go | 8 +- pkg/apiserver/watch_test.go | 12 +-- .../authenticator/bearertoken/bearertoken.go | 4 +- .../bearertoken/bearertoken_test.go | 4 +- pkg/auth/authenticator/interfaces.go | 2 +- pkg/auth/authorizer/abac/abac.go | 2 +- pkg/auth/authorizer/abac/abac_test.go | 4 +- pkg/auth/authorizer/interfaces.go | 2 +- pkg/auth/handlers/handlers.go | 4 +- pkg/auth/handlers/handlers_test.go | 6 +- pkg/client/cache/delta_fifo.go | 2 +- pkg/client/cache/expiration_cache.go | 2 +- pkg/client/cache/expiration_cache_fakes.go | 2 +- pkg/client/cache/expiration_cache_test.go | 2 +- pkg/client/cache/index.go | 4 +- pkg/client/cache/index_test.go | 2 +- pkg/client/cache/listers.go | 4 +- pkg/client/cache/listers_test.go | 6 +- pkg/client/cache/listwatch.go | 8 +- pkg/client/cache/listwatch_test.go | 10 +-- pkg/client/cache/poller.go | 2 +- pkg/client/cache/reflector.go | 10 +-- pkg/client/cache/reflector_test.go | 8 +- pkg/client/cache/store.go | 2 +- pkg/client/cache/store_test.go | 2 +- pkg/client/cache/thread_safe_store.go | 2 +- pkg/client/client.go | 4 +- pkg/client/client_test.go | 14 +-- pkg/client/clientcmd/api/latest/latest.go | 4 +- pkg/client/clientcmd/api/register.go | 2 +- pkg/client/clientcmd/api/types.go | 2 +- pkg/client/clientcmd/api/v1/conversion.go | 6 +- pkg/client/clientcmd/api/v1/register.go | 4 +- pkg/client/clientcmd/api/v1/types.go | 2 +- pkg/client/clientcmd/auth_loaders.go | 2 +- pkg/client/clientcmd/client_config.go | 8 +- pkg/client/clientcmd/client_config_test.go | 6 +- pkg/client/clientcmd/loader.go | 6 +- pkg/client/clientcmd/loader_test.go | 4 +- pkg/client/clientcmd/merged_client_builder.go | 4 +- pkg/client/clientcmd/overrides.go | 2 +- pkg/client/clientcmd/validation.go | 6 +- pkg/client/clientcmd/validation_test.go | 4 +- pkg/client/componentstatuses.go | 6 +- pkg/client/conditions.go | 4 +- pkg/client/debugging.go | 2 +- pkg/client/doc.go | 8 +- pkg/client/endpoints.go | 8 +- pkg/client/endpoints_test.go | 6 +- pkg/client/events.go | 10 +-- pkg/client/events_test.go | 10 +-- pkg/client/fake.go | 6 +- pkg/client/flags_test.go | 2 +- pkg/client/helper.go | 10 +-- pkg/client/helper_test.go | 6 +- pkg/client/kubelet.go | 4 +- pkg/client/kubelet_test.go | 4 +- pkg/client/limit_ranges.go | 8 +- pkg/client/limit_ranges_test.go | 10 +-- pkg/client/namespaces.go | 8 +- pkg/client/namespaces_test.go | 8 +- pkg/client/nodes.go | 8 +- pkg/client/nodes_test.go | 10 +-- pkg/client/persistentvolume_test.go | 10 +-- pkg/client/persistentvolumeclaim.go | 8 +- pkg/client/persistentvolumeclaim_test.go | 10 +-- pkg/client/persistentvolumes.go | 8 +- pkg/client/pod_templates.go | 8 +- pkg/client/pod_templates_test.go | 8 +- pkg/client/pods.go | 8 +- pkg/client/pods_test.go | 8 +- pkg/client/portforward/portforward.go | 8 +- pkg/client/portforward/portforward_test.go | 6 +- pkg/client/record/event.go | 12 +-- pkg/client/record/event_test.go | 10 +-- pkg/client/record/events_cache.go | 4 +- pkg/client/record/events_cache_test.go | 4 +- pkg/client/record/fake.go | 4 +- pkg/client/remotecommand/remotecommand.go | 12 +-- .../remotecommand/remotecommand_test.go | 8 +- pkg/client/replication_controllers.go | 8 +- pkg/client/replication_controllers_test.go | 6 +- pkg/client/request.go | 20 ++--- pkg/client/request_test.go | 20 ++--- pkg/client/resource_quotas.go | 8 +- pkg/client/resource_quotas_test.go | 10 +-- pkg/client/restclient.go | 6 +- pkg/client/restclient_test.go | 10 +-- pkg/client/secrets.go | 8 +- pkg/client/service_accounts.go | 8 +- pkg/client/services.go | 8 +- pkg/client/services_test.go | 6 +- pkg/client/testclient/actions.go | 6 +- .../testclient/fake_componentstatuses.go | 6 +- pkg/client/testclient/fake_endpoints.go | 8 +- pkg/client/testclient/fake_events.go | 10 +-- pkg/client/testclient/fake_limit_ranges.go | 8 +- pkg/client/testclient/fake_namespaces.go | 8 +- pkg/client/testclient/fake_nodes.go | 8 +- .../fake_persistent_volume_claims.go | 8 +- .../testclient/fake_persistent_volumes.go | 8 +- pkg/client/testclient/fake_pod_templates.go | 8 +- pkg/client/testclient/fake_pods.go | 8 +- .../fake_replication_controllers.go | 8 +- pkg/client/testclient/fake_resource_quotas.go | 8 +- pkg/client/testclient/fake_secrets.go | 8 +- .../testclient/fake_service_accounts.go | 8 +- pkg/client/testclient/fake_services.go | 8 +- pkg/client/testclient/fake_test.go | 2 +- pkg/client/testclient/fixture.go | 10 +-- pkg/client/testclient/testclient.go | 14 +-- pkg/client/testclient/testclient_test.go | 10 +-- pkg/clientauth/clientauth.go | 2 +- pkg/clientauth/clientauth_test.go | 2 +- pkg/cloudprovider/aws/aws.go | 6 +- pkg/cloudprovider/aws/aws_routes.go | 2 +- pkg/cloudprovider/aws/aws_test.go | 4 +- pkg/cloudprovider/cloud.go | 2 +- pkg/cloudprovider/fake/fake.go | 4 +- pkg/cloudprovider/gce/gce.go | 10 +-- pkg/cloudprovider/gce/token_source.go | 2 +- pkg/cloudprovider/mesos/client.go | 4 +- pkg/cloudprovider/mesos/mesos.go | 4 +- pkg/cloudprovider/openstack/openstack.go | 6 +- pkg/cloudprovider/ovirt/ovirt.go | 4 +- pkg/cloudprovider/ovirt/ovirt_test.go | 2 +- pkg/cloudprovider/rackspace/rackspace.go | 6 +- pkg/cloudprovider/vagrant/vagrant.go | 4 +- pkg/controller/controller_utils.go | 18 ++-- pkg/controller/controller_utils_test.go | 16 ++-- .../endpoint/endpoints_controller.go | 24 ++--- .../endpoint/endpoints_controller_test.go | 16 ++-- pkg/controller/framework/controller.go | 6 +- pkg/controller/framework/controller_test.go | 10 +-- .../framework/fake_controller_source.go | 8 +- .../framework/fake_controller_source_test.go | 2 +- .../namespace/namespace_controller.go | 20 ++--- .../namespace/namespace_controller_test.go | 6 +- pkg/controller/node/nodecontroller.go | 16 ++-- pkg/controller/node/nodecontroller_test.go | 18 ++-- pkg/controller/node/podevictor.go | 2 +- pkg/controller/node/podevictor_test.go | 2 +- .../replication/replication_controller.go | 24 ++--- .../replication_controller_test.go | 24 ++--- .../replication_controller_utils.go | 4 +- .../resource_quota_controller.go | 12 +-- .../resource_quota_controller_test.go | 8 +- pkg/controller/route/routecontroller.go | 12 +-- pkg/controller/route/routecontroller_test.go | 6 +- pkg/controller/service/servicecontroller.go | 18 ++-- .../service/servicecontroller_test.go | 8 +- pkg/controller/serviceaccount/jwt.go | 6 +- pkg/controller/serviceaccount/jwt_test.go | 6 +- .../serviceaccounts_controller.go | 20 ++--- .../serviceaccounts_controller_test.go | 10 +-- pkg/controller/serviceaccount/tokengetter.go | 14 +-- .../serviceaccount/tokens_controller.go | 22 ++--- .../serviceaccount/tokens_controller_test.go | 8 +- pkg/controller/serviceaccount/util.go | 4 +- pkg/conversion/deep_equal.go | 2 +- pkg/conversion/queryparams/convert.go | 2 +- pkg/conversion/queryparams/convert_test.go | 2 +- pkg/conversion/scheme_test.go | 2 +- pkg/credentialprovider/gcp/jwt.go | 2 +- pkg/credentialprovider/gcp/jwt_test.go | 2 +- pkg/credentialprovider/gcp/metadata.go | 2 +- pkg/credentialprovider/gcp/metadata_test.go | 2 +- pkg/credentialprovider/keyring.go | 4 +- pkg/expapi/latest/latest.go | 16 ++-- pkg/expapi/v1/register.go | 4 +- pkg/fieldpath/fieldpath.go | 2 +- pkg/fieldpath/fieldpath_test.go | 2 +- pkg/kubectl/bash_comp_utils.go | 2 +- pkg/kubectl/cmd/annotation.go | 8 +- pkg/kubectl/cmd/annotation_test.go | 8 +- pkg/kubectl/cmd/apiversions.go | 4 +- pkg/kubectl/cmd/attach.go | 8 +- pkg/kubectl/cmd/attach_test.go | 6 +- pkg/kubectl/cmd/clusterinfo.go | 6 +- pkg/kubectl/cmd/cmd.go | 6 +- pkg/kubectl/cmd/cmd_test.go | 22 ++--- pkg/kubectl/cmd/config/config.go | 4 +- pkg/kubectl/cmd/config/config_test.go | 10 +-- pkg/kubectl/cmd/config/create_authinfo.go | 6 +- pkg/kubectl/cmd/config/create_cluster.go | 6 +- pkg/kubectl/cmd/config/create_context.go | 6 +- .../cmd/config/navigation_step_parser.go | 4 +- .../cmd/config/navigation_step_parser_test.go | 4 +- pkg/kubectl/cmd/config/use_context.go | 2 +- pkg/kubectl/cmd/config/view.go | 12 +-- pkg/kubectl/cmd/create.go | 12 +-- pkg/kubectl/cmd/create_test.go | 6 +- pkg/kubectl/cmd/delete.go | 14 +-- pkg/kubectl/cmd/delete_test.go | 10 +-- pkg/kubectl/cmd/describe.go | 12 +-- pkg/kubectl/cmd/describe_test.go | 2 +- pkg/kubectl/cmd/exec.go | 8 +- pkg/kubectl/cmd/exec_test.go | 6 +- pkg/kubectl/cmd/expose.go | 6 +- pkg/kubectl/cmd/expose_test.go | 8 +- pkg/kubectl/cmd/get.go | 10 +-- pkg/kubectl/cmd/get_test.go | 16 ++-- pkg/kubectl/cmd/label.go | 10 +-- pkg/kubectl/cmd/label_test.go | 8 +- pkg/kubectl/cmd/log.go | 6 +- pkg/kubectl/cmd/log_test.go | 4 +- pkg/kubectl/cmd/namespace.go | 2 +- pkg/kubectl/cmd/patch.go | 6 +- pkg/kubectl/cmd/patch_test.go | 2 +- pkg/kubectl/cmd/portforward.go | 8 +- pkg/kubectl/cmd/portforward_test.go | 6 +- pkg/kubectl/cmd/proxy.go | 4 +- pkg/kubectl/cmd/replace.go | 8 +- pkg/kubectl/cmd/replace_test.go | 2 +- pkg/kubectl/cmd/rollingupdate.go | 12 +-- pkg/kubectl/cmd/run.go | 6 +- pkg/kubectl/cmd/scale.go | 8 +- pkg/kubectl/cmd/stop.go | 8 +- pkg/kubectl/cmd/util/clientcache.go | 6 +- pkg/kubectl/cmd/util/factory.go | 22 ++--- pkg/kubectl/cmd/util/factory_test.go | 12 +-- pkg/kubectl/cmd/util/helpers.go | 18 ++-- pkg/kubectl/cmd/util/helpers_test.go | 10 +-- pkg/kubectl/cmd/util/printing.go | 4 +- pkg/kubectl/cmd/version.go | 4 +- pkg/kubectl/describe.go | 16 ++-- pkg/kubectl/describe_test.go | 10 +-- pkg/kubectl/generate.go | 2 +- pkg/kubectl/interfaces.go | 4 +- pkg/kubectl/kubectl.go | 6 +- pkg/kubectl/proxy_server.go | 2 +- pkg/kubectl/proxy_server_test.go | 2 +- pkg/kubectl/resource/builder.go | 14 +-- pkg/kubectl/resource/builder_test.go | 20 ++--- pkg/kubectl/resource/helper.go | 12 +-- pkg/kubectl/resource/helper_test.go | 10 +-- pkg/kubectl/resource/interfaces.go | 6 +- pkg/kubectl/resource/mapper.go | 10 +-- pkg/kubectl/resource/result.go | 14 +-- pkg/kubectl/resource/selector.go | 10 +-- pkg/kubectl/resource/visitor.go | 12 +-- pkg/kubectl/resource_printer.go | 10 +-- pkg/kubectl/resource_printer_test.go | 8 +- pkg/kubectl/rolling_updater.go | 12 +-- pkg/kubectl/rolling_updater_test.go | 16 ++-- pkg/kubectl/run.go | 4 +- pkg/kubectl/run_test.go | 2 +- pkg/kubectl/scale.go | 6 +- pkg/kubectl/scale_test.go | 6 +- pkg/kubectl/service.go | 6 +- pkg/kubectl/service_test.go | 4 +- pkg/kubectl/sorted_event_list.go | 2 +- pkg/kubectl/sorted_event_list_test.go | 4 +- pkg/kubectl/sorted_resource_name_list.go | 2 +- pkg/kubectl/stop.go | 8 +- pkg/kubectl/stop_test.go | 6 +- pkg/kubectl/version.go | 4 +- pkg/kubectl/watchloop.go | 2 +- pkg/kubelet/cadvisor/cadvisor_linux.go | 2 +- pkg/kubelet/config/apiserver.go | 10 +-- pkg/kubelet/config/apiserver_test.go | 10 +-- pkg/kubelet/config/common.go | 14 +-- pkg/kubelet/config/common_test.go | 8 +- pkg/kubelet/config/config.go | 22 ++--- pkg/kubelet/config/config_test.go | 10 +-- pkg/kubelet/config/file.go | 6 +- pkg/kubelet/config/file_test.go | 12 +-- pkg/kubelet/config/http.go | 6 +- pkg/kubelet/config/http_test.go | 14 +-- .../container/container_reference_manager.go | 2 +- pkg/kubelet/container/fake_runtime.go | 4 +- pkg/kubelet/container/helpers.go | 6 +- pkg/kubelet/container/helpers_test.go | 2 +- pkg/kubelet/container/ref.go | 2 +- pkg/kubelet/container/ref_test.go | 4 +- pkg/kubelet/container/runtime.go | 6 +- pkg/kubelet/container_bridge.go | 2 +- pkg/kubelet/container_gc.go | 4 +- pkg/kubelet/container_gc_test.go | 2 +- pkg/kubelet/container_manager.go | 2 +- pkg/kubelet/container_manager_linux.go | 10 +-- pkg/kubelet/container_manager_unsupported.go | 4 +- pkg/kubelet/disk_manager.go | 2 +- pkg/kubelet/disk_manager_test.go | 2 +- pkg/kubelet/dockertools/convert.go | 4 +- pkg/kubelet/dockertools/convert_test.go | 4 +- pkg/kubelet/dockertools/docker.go | 16 ++-- pkg/kubelet/dockertools/docker_test.go | 14 +-- pkg/kubelet/dockertools/exec.go | 2 +- pkg/kubelet/dockertools/fake_docker_client.go | 4 +- pkg/kubelet/dockertools/fake_manager.go | 10 +-- .../dockertools/instrumented_docker.go | 2 +- pkg/kubelet/dockertools/manager.go | 26 +++--- pkg/kubelet/dockertools/manager_test.go | 20 ++--- pkg/kubelet/envvars/envvars.go | 2 +- pkg/kubelet/envvars/envvars_test.go | 4 +- pkg/kubelet/fake_pod_workers.go | 6 +- pkg/kubelet/image_manager.go | 10 +-- pkg/kubelet/image_manager_test.go | 8 +- pkg/kubelet/kubelet.go | 62 ++++++------- pkg/kubelet/kubelet_test.go | 34 +++---- pkg/kubelet/lifecycle/handlers.go | 8 +- pkg/kubelet/lifecycle/handlers_test.go | 6 +- pkg/kubelet/metrics/metrics.go | 2 +- pkg/kubelet/mirror_client.go | 6 +- pkg/kubelet/mirror_client_test.go | 6 +- pkg/kubelet/network/exec/exec.go | 6 +- pkg/kubelet/network/exec/exec_test.go | 2 +- pkg/kubelet/network/plugins.go | 10 +-- pkg/kubelet/network/testing.go | 4 +- pkg/kubelet/networks.go | 4 +- pkg/kubelet/oom_watcher.go | 8 +- pkg/kubelet/oom_watcher_test.go | 8 +- pkg/kubelet/pod_manager.go | 8 +- pkg/kubelet/pod_manager_test.go | 2 +- pkg/kubelet/pod_workers.go | 10 +-- pkg/kubelet/pod_workers_test.go | 12 +-- pkg/kubelet/prober/prober.go | 18 ++-- pkg/kubelet/prober/prober_fake.go | 4 +- pkg/kubelet/prober/prober_test.go | 8 +- pkg/kubelet/rkt/cap.go | 2 +- pkg/kubelet/rkt/pod_info.go | 6 +- pkg/kubelet/rkt/rkt.go | 16 ++-- pkg/kubelet/runonce.go | 6 +- pkg/kubelet/runonce_test.go | 12 +-- pkg/kubelet/runtime_hooks.go | 6 +- pkg/kubelet/server.go | 18 ++-- pkg/kubelet/server_test.go | 12 +-- pkg/kubelet/status_manager.go | 12 +-- pkg/kubelet/status_manager_test.go | 10 +-- pkg/kubelet/types.go | 2 +- pkg/kubelet/types/types.go | 2 +- pkg/kubelet/util.go | 8 +- pkg/kubelet/util/format.go | 2 +- pkg/kubelet/volume_manager.go | 4 +- pkg/kubelet/volumes.go | 14 +-- pkg/labels/selector.go | 4 +- pkg/labels/selector_test.go | 2 +- pkg/master/controller.go | 20 ++--- pkg/master/controller_test.go | 4 +- pkg/master/master.go | 90 +++++++++---------- pkg/master/master_test.go | 14 +-- pkg/probe/exec/exec.go | 4 +- pkg/probe/exec/exec_test.go | 2 +- pkg/probe/http/http.go | 2 +- pkg/probe/http/http_test.go | 2 +- pkg/probe/tcp/tcp.go | 2 +- pkg/probe/tcp/tcp_test.go | 2 +- pkg/proxy/config/api.go | 8 +- pkg/proxy/config/api_test.go | 8 +- pkg/proxy/config/config.go | 6 +- pkg/proxy/config/config_test.go | 4 +- pkg/proxy/loadbalancer.go | 4 +- pkg/proxy/port_allocator.go | 2 +- pkg/proxy/port_allocator_test.go | 2 +- pkg/proxy/proxier.go | 10 +-- pkg/proxy/proxier_test.go | 8 +- pkg/proxy/proxysocket.go | 4 +- pkg/proxy/roundrobin.go | 6 +- pkg/proxy/roundrobin_test.go | 4 +- pkg/registry/componentstatus/rest.go | 12 +-- pkg/registry/componentstatus/rest_test.go | 10 +-- pkg/registry/controller/etcd/etcd.go | 16 ++-- pkg/registry/controller/etcd/etcd_test.go | 24 ++--- pkg/registry/controller/registry.go | 10 +-- pkg/registry/controller/rest.go | 14 +-- pkg/registry/endpoint/etcd/etcd.go | 16 ++-- pkg/registry/endpoint/etcd/etcd_test.go | 22 ++--- pkg/registry/endpoint/registry.go | 10 +-- pkg/registry/endpoint/rest.go | 16 ++-- pkg/registry/etcd/etcd.go | 18 ++-- pkg/registry/etcd/etcd_test.go | 28 +++--- pkg/registry/event/registry.go | 10 +-- pkg/registry/event/registry_test.go | 20 ++--- pkg/registry/event/rest.go | 16 ++-- pkg/registry/event/rest_test.go | 16 ++-- pkg/registry/generic/etcd/etcd.go | 22 ++--- pkg/registry/generic/etcd/etcd_test.go | 20 ++--- pkg/registry/generic/registry.go | 10 +-- pkg/registry/generic/registry_test.go | 6 +- pkg/registry/generic/rest/proxy.go | 8 +- pkg/registry/generic/rest/proxy_test.go | 2 +- pkg/registry/generic/rest/streamer.go | 2 +- pkg/registry/limitrange/registry.go | 10 +-- pkg/registry/limitrange/registry_test.go | 22 ++--- pkg/registry/limitrange/rest.go | 18 ++-- pkg/registry/minion/etcd/etcd.go | 14 +-- pkg/registry/minion/etcd/etcd_test.go | 24 ++--- pkg/registry/minion/registry.go | 10 +-- pkg/registry/minion/rest.go | 24 ++--- pkg/registry/minion/rest_test.go | 4 +- pkg/registry/namespace/etcd/etcd.go | 20 ++--- pkg/registry/namespace/etcd/etcd_test.go | 24 ++--- pkg/registry/namespace/registry.go | 10 +-- pkg/registry/namespace/rest.go | 14 +-- pkg/registry/namespace/rest_test.go | 4 +- pkg/registry/persistentvolume/etcd/etcd.go | 16 ++-- .../persistentvolume/etcd/etcd_test.go | 26 +++--- pkg/registry/persistentvolume/registry.go | 10 +-- pkg/registry/persistentvolume/rest.go | 14 +-- .../persistentvolumeclaim/etcd/etcd.go | 16 ++-- .../persistentvolumeclaim/etcd/etcd_test.go | 26 +++--- .../persistentvolumeclaim/registry.go | 10 +-- pkg/registry/persistentvolumeclaim/rest.go | 14 +-- pkg/registry/pod/etcd/etcd.go | 30 +++---- pkg/registry/pod/etcd/etcd_test.go | 32 +++---- pkg/registry/pod/registry.go | 10 +-- pkg/registry/pod/rest.go | 20 ++--- pkg/registry/podtemplate/etcd/etcd.go | 16 ++-- pkg/registry/podtemplate/etcd/etcd_test.go | 14 +-- pkg/registry/podtemplate/rest.go | 14 +-- pkg/registry/registrytest/controller.go | 8 +- pkg/registry/registrytest/endpoint.go | 10 +-- pkg/registry/registrytest/generic.go | 8 +- pkg/registry/registrytest/minion.go | 10 +-- pkg/registry/registrytest/pod.go | 8 +- pkg/registry/registrytest/scheduler.go | 4 +- pkg/registry/registrytest/service.go | 8 +- pkg/registry/resourcequota/etcd/etcd.go | 16 ++-- pkg/registry/resourcequota/etcd/etcd_test.go | 28 +++--- pkg/registry/resourcequota/registry.go | 10 +-- pkg/registry/resourcequota/rest.go | 14 +-- pkg/registry/resourcequota/rest_test.go | 4 +- pkg/registry/secret/etcd/etcd.go | 16 ++-- pkg/registry/secret/etcd/etcd_test.go | 14 +-- pkg/registry/secret/registry.go | 10 +-- pkg/registry/secret/strategy.go | 16 ++-- pkg/registry/service/allocator/etcd/etcd.go | 16 ++-- .../service/allocator/etcd/etcd_test.go | 16 ++-- pkg/registry/service/ipallocator/allocator.go | 4 +- .../service/ipallocator/allocator_test.go | 4 +- .../service/ipallocator/controller/repair.go | 8 +- .../ipallocator/controller/repair_test.go | 6 +- .../service/ipallocator/etcd/etcd_test.go | 20 ++--- .../service/portallocator/allocator.go | 6 +- .../service/portallocator/allocator_test.go | 4 +- .../portallocator/controller/repair.go | 8 +- pkg/registry/service/registry.go | 8 +- pkg/registry/service/rest.go | 28 +++--- pkg/registry/service/rest_test.go | 20 ++--- pkg/registry/serviceaccount/etcd/etcd.go | 16 ++-- pkg/registry/serviceaccount/etcd/etcd_test.go | 14 +-- pkg/registry/serviceaccount/registry.go | 10 +-- pkg/registry/serviceaccount/strategy.go | 14 +-- pkg/runtime/codec.go | 2 +- pkg/runtime/conversion.go | 2 +- pkg/runtime/conversion_generation_test.go | 16 ++-- pkg/runtime/conversion_generator.go | 6 +- pkg/runtime/conversion_test.go | 2 +- pkg/runtime/deep_copy_generation_test.go | 14 +-- pkg/runtime/deep_copy_generator.go | 6 +- pkg/runtime/embedded_test.go | 6 +- pkg/runtime/error.go | 2 +- pkg/runtime/extension_test.go | 2 +- pkg/runtime/helper.go | 2 +- pkg/runtime/helper_test.go | 8 +- pkg/runtime/scheme.go | 2 +- pkg/runtime/scheme_test.go | 4 +- pkg/runtime/unstructured.go | 2 +- pkg/runtime/unstructured_test.go | 6 +- pkg/securitycontext/fake.go | 2 +- pkg/securitycontext/provider.go | 2 +- pkg/securitycontext/provider_test.go | 2 +- pkg/securitycontext/types.go | 2 +- pkg/securitycontext/util.go | 2 +- pkg/securitycontext/util_test.go | 2 +- pkg/storage/etcd/api_object_versioner.go | 8 +- pkg/storage/etcd/api_object_versioner_test.go | 4 +- pkg/storage/etcd/etcd_helper.go | 16 ++-- pkg/storage/etcd/etcd_helper_test.go | 14 +-- pkg/storage/etcd/etcd_util.go | 2 +- pkg/storage/etcd/etcd_watcher.go | 12 +-- pkg/storage/etcd/etcd_watcher_test.go | 14 +-- pkg/storage/interfaces.go | 4 +- pkg/storage/util.go | 6 +- pkg/storage/util_test.go | 2 +- pkg/ui/installsupport.go | 2 +- pkg/util/config/config.go | 2 +- pkg/util/fielderrors/fielderrors.go | 2 +- pkg/util/httpstream/spdy/connection.go | 2 +- pkg/util/httpstream/spdy/roundtripper.go | 8 +- pkg/util/httpstream/spdy/roundtripper_test.go | 2 +- pkg/util/httpstream/spdy/upgrade.go | 2 +- pkg/util/iptables/iptables.go | 4 +- pkg/util/iptables/iptables_test.go | 4 +- pkg/util/jsonpath/jsonpath.go | 2 +- pkg/util/mount/nsenter_mount.go | 2 +- pkg/util/node/node.go | 2 +- pkg/util/proxy/transport.go | 2 +- pkg/util/strategicpatch/patch.go | 2 +- pkg/util/uuid.go | 2 +- pkg/util/workqueue/queue_test.go | 2 +- pkg/version/verflag/verflag.go | 2 +- pkg/volume/aws_ebs/aws_ebs.go | 16 ++-- pkg/volume/aws_ebs/aws_ebs_test.go | 12 +-- pkg/volume/aws_ebs/aws_util.go | 4 +- pkg/volume/aws_ebs/aws_util_test.go | 2 +- pkg/volume/empty_dir/empty_dir.go | 12 +-- pkg/volume/empty_dir/empty_dir_linux.go | 2 +- pkg/volume/empty_dir/empty_dir_test.go | 10 +-- pkg/volume/empty_dir/empty_dir_unsupported.go | 2 +- pkg/volume/gce_pd/gce_pd.go | 12 +-- pkg/volume/gce_pd/gce_pd_test.go | 12 +-- pkg/volume/gce_pd/gce_util.go | 12 +-- pkg/volume/gce_pd/gce_util_test.go | 2 +- pkg/volume/git_repo/git_repo.go | 14 +-- pkg/volume/git_repo/git_repo_test.go | 12 +-- pkg/volume/glusterfs/glusterfs.go | 12 +-- pkg/volume/glusterfs/glusterfs_test.go | 14 +-- pkg/volume/host_path/host_path.go | 10 +-- pkg/volume/host_path/host_path_test.go | 10 +-- pkg/volume/iscsi/disk_manager.go | 2 +- pkg/volume/iscsi/iscsi.go | 12 +-- pkg/volume/iscsi/iscsi_test.go | 12 +-- pkg/volume/iscsi/iscsi_util.go | 4 +- pkg/volume/iscsi/iscsi_util_test.go | 2 +- pkg/volume/nfs/nfs.go | 10 +-- pkg/volume/nfs/nfs_test.go | 12 +-- .../persistent_claim/persistent_claim.go | 8 +- .../persistent_claim/persistent_claim_test.go | 16 ++-- pkg/volume/plugins.go | 12 +-- pkg/volume/plugins_test.go | 2 +- pkg/volume/rbd/disk_manager.go | 2 +- pkg/volume/rbd/rbd.go | 12 +-- pkg/volume/rbd/rbd_test.go | 12 +-- pkg/volume/rbd/rbd_util.go | 6 +- pkg/volume/secret/secret.go | 12 +-- pkg/volume/secret/secret_test.go | 16 ++-- pkg/volume/testing.go | 10 +-- pkg/volume/util.go | 14 +-- pkg/volume/util_test.go | 2 +- .../persistent_volume_claim_binder.go | 18 ++-- .../persistent_volume_claim_binder_test.go | 12 +-- .../persistent_volume_index_test.go | 4 +- .../persistent_volume_recycler.go | 22 ++--- pkg/volumeclaimbinder/types.go | 8 +- pkg/watch/iowatcher.go | 4 +- pkg/watch/iowatcher_test.go | 2 +- pkg/watch/json/decoder.go | 4 +- pkg/watch/json/decoder_test.go | 8 +- pkg/watch/json/encoder.go | 4 +- pkg/watch/json/encoder_test.go | 8 +- pkg/watch/json/types.go | 4 +- pkg/watch/mux.go | 2 +- pkg/watch/watch.go | 2 +- plugin/cmd/kube-scheduler/app/server.go | 26 +++--- plugin/cmd/kube-scheduler/scheduler.go | 8 +- plugin/pkg/admission/admit/admission.go | 4 +- plugin/pkg/admission/deny/admission.go | 4 +- plugin/pkg/admission/deny/admission_test.go | 2 +- .../exec/denyprivileged/admission.go | 10 +-- .../exec/denyprivileged/admission_test.go | 10 +-- plugin/pkg/admission/limitranger/admission.go | 20 ++--- .../admission/limitranger/admission_test.go | 10 +-- .../pkg/admission/limitranger/interfaces.go | 4 +- .../namespace/autoprovision/admission.go | 20 ++--- .../namespace/autoprovision/admission_test.go | 10 +-- .../admission/namespace/exists/admission.go | 18 ++-- .../namespace/lifecycle/admission.go | 22 ++--- .../namespace/lifecycle/admission_test.go | 8 +- .../pkg/admission/resourcequota/admission.go | 20 ++--- .../admission/resourcequota/admission_test.go | 10 +-- .../securitycontext/scdeny/admission.go | 8 +- .../securitycontext/scdeny/admission_test.go | 4 +- .../pkg/admission/serviceaccount/admission.go | 22 ++--- .../serviceaccount/admission_test.go | 10 +-- .../authenticator/password/allow/allow.go | 4 +- .../password/passwordfile/passwordfile.go | 2 +- .../passwordfile/passwordfile_test.go | 2 +- .../request/basicauth/basicauth.go | 4 +- .../request/basicauth/basicauth_test.go | 4 +- .../auth/authenticator/request/union/union.go | 6 +- .../request/union/unionauth_test.go | 2 +- .../auth/authenticator/request/x509/x509.go | 4 +- .../authenticator/request/x509/x509_test.go | 2 +- .../token/tokenfile/tokenfile.go | 2 +- .../token/tokenfile/tokenfile_test.go | 2 +- .../token/tokentest/tokentest.go | 2 +- plugin/pkg/scheduler/algorithm/listers.go | 4 +- .../algorithm/predicates/predicates.go | 8 +- .../algorithm/predicates/predicates_test.go | 6 +- .../algorithm/priorities/priorities.go | 10 +-- .../algorithm/priorities/priorities_test.go | 8 +- .../priorities/selector_spreading.go | 6 +- .../priorities/selector_spreading_test.go | 4 +- .../algorithm/scheduler_interface.go | 2 +- .../algorithm/scheduler_interface_test.go | 2 +- plugin/pkg/scheduler/algorithm/types.go | 2 +- .../algorithmprovider/defaults/defaults.go | 12 +-- .../scheduler/algorithmprovider/plugins.go | 2 +- .../algorithmprovider/plugins_test.go | 2 +- plugin/pkg/scheduler/api/latest/latest.go | 2 +- plugin/pkg/scheduler/api/register.go | 2 +- plugin/pkg/scheduler/api/types.go | 2 +- plugin/pkg/scheduler/api/v1/register.go | 4 +- plugin/pkg/scheduler/api/v1/types.go | 2 +- .../scheduler/api/validation/validation.go | 4 +- .../api/validation/validation_test.go | 2 +- plugin/pkg/scheduler/factory/factory.go | 22 ++--- plugin/pkg/scheduler/factory/factory_test.go | 20 ++--- plugin/pkg/scheduler/factory/plugins.go | 10 +-- plugin/pkg/scheduler/generic_scheduler.go | 8 +- .../pkg/scheduler/generic_scheduler_test.go | 6 +- plugin/pkg/scheduler/modeler.go | 8 +- plugin/pkg/scheduler/modeler_test.go | 6 +- plugin/pkg/scheduler/scheduler.go | 10 +-- plugin/pkg/scheduler/scheduler_test.go | 14 +-- test/e2e/addon_update.go | 4 +- test/e2e/cadvisor.go | 6 +- test/e2e/cluster_upgrade.go | 12 +-- test/e2e/container_probe.go | 8 +- test/e2e/density.go | 18 ++-- test/e2e/dns.go | 14 +-- test/e2e/docker_containers.go | 6 +- test/e2e/downward_api.go | 4 +- test/e2e/e2e_test.go | 8 +- test/e2e/empty_dir.go | 6 +- test/e2e/es_cluster_logging.go | 6 +- test/e2e/etcd_failure.go | 8 +- test/e2e/events.go | 10 +-- test/e2e/examples.go | 8 +- test/e2e/expansion.go | 4 +- test/e2e/framework.go | 8 +- test/e2e/host_path.go | 8 +- test/e2e/kibana_logging.go | 6 +- test/e2e/kube-ui.go | 4 +- test/e2e/kubectl.go | 8 +- test/e2e/kubelet.go | 10 +-- test/e2e/kubelet_stats.go | 16 ++-- test/e2e/load.go | 8 +- test/e2e/monitoring.go | 8 +- test/e2e/namespace.go | 10 +-- test/e2e/networking.go | 8 +- test/e2e/pd.go | 16 ++-- test/e2e/persistent_volumes.go | 8 +- test/e2e/pods.go | 18 ++-- test/e2e/pre_stop.go | 6 +- test/e2e/proxy.go | 12 +-- test/e2e/rc.go | 14 +-- test/e2e/reboot.go | 8 +- test/e2e/resize_nodes.go | 16 ++-- test/e2e/restart.go | 10 +-- test/e2e/scheduler_predicates.go | 12 +-- test/e2e/secrets.go | 4 +- test/e2e/service.go | 14 +-- test/e2e/service_accounts.go | 14 +-- test/e2e/service_latency.go | 16 ++-- test/e2e/ssh.go | 2 +- test/e2e/util.go | 30 +++---- test/e2e/volumes.go | 6 +- test/integration/auth_test.go | 26 +++--- test/integration/client_test.go | 16 ++-- test/integration/etcd_tools_test.go | 16 ++-- test/integration/framework/etcd_utils.go | 10 +-- test/integration/framework/master_utils.go | 30 +++---- test/integration/master_benchmark_test.go | 14 +-- test/integration/master_test.go | 2 +- test/integration/metrics_test.go | 12 +-- test/integration/openshift_test.go | 2 +- test/integration/persistent_volumes_test.go | 14 +-- test/integration/scheduler_test.go | 32 +++---- test/integration/secret_test.go | 14 +-- test/integration/service_account_test.go | 36 ++++---- test/integration/utils.go | 14 +-- test/soak/cauldron/cauldron.go | 10 +-- test/soak/serve_hostnames/serve_hostnames.go | 12 +-- third_party/golang/expansion/expand_test.go | 2 +- 844 files changed, 3659 insertions(+), 3659 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index bcebba952e..01f951b241 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,5 +1,5 @@ { - "ImportPath": "github.com/GoogleCloudPlatform/kubernetes", + "ImportPath": "k8s.io/kubernetes", "GoVersion": "go1.4.2", "Packages": [ "./..." diff --git a/cluster/addons/dns/kube2sky/kube2sky.go b/cluster/addons/dns/kube2sky/kube2sky.go index ea298bb8a4..6b9354c2dc 100644 --- a/cluster/addons/dns/kube2sky/kube2sky.go +++ b/cluster/addons/dns/kube2sky/kube2sky.go @@ -31,15 +31,15 @@ import ( "sync" "time" - kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - kcache "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - kclientcmd "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - kframework "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - kSelector "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + kapi "k8s.io/kubernetes/pkg/api" + kclient "k8s.io/kubernetes/pkg/client" + kcache "k8s.io/kubernetes/pkg/client/cache" + kclientcmd "k8s.io/kubernetes/pkg/client/clientcmd" + kframework "k8s.io/kubernetes/pkg/controller/framework" + kSelector "k8s.io/kubernetes/pkg/fields" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" etcd "github.com/coreos/go-etcd/etcd" "github.com/golang/glog" skymsg "github.com/skynetservices/skydns/msg" diff --git a/cluster/addons/dns/kube2sky/kube2sky_test.go b/cluster/addons/dns/kube2sky/kube2sky_test.go index 4e61607ab7..f276d678b9 100644 --- a/cluster/addons/dns/kube2sky/kube2sky_test.go +++ b/cluster/addons/dns/kube2sky/kube2sky_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" + kapi "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/cache" "github.com/coreos/go-etcd/etcd" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go index c5ab844882..a05450bd78 100644 --- a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go +++ b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go @@ -22,8 +22,8 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" "github.com/golang/glog" ) diff --git a/cluster/addons/kube-ui/image/kube-ui.go b/cluster/addons/kube-ui/image/kube-ui.go index 1440db1031..73175cc415 100644 --- a/cluster/addons/kube-ui/image/kube-ui.go +++ b/cluster/addons/kube-ui/image/kube-ui.go @@ -23,7 +23,7 @@ import ( "mime" "net/http" - "github.com/GoogleCloudPlatform/kubernetes/pkg/ui/data/dashboard" + "k8s.io/kubernetes/pkg/ui/data/dashboard" "github.com/golang/glog" assetfs "github.com/elazarl/go-bindata-assetfs" diff --git a/cmd/genbashcomp/gen_kubectl_bash_comp.go b/cmd/genbashcomp/gen_kubectl_bash_comp.go index 44f61d87d5..a0ea9de41e 100644 --- a/cmd/genbashcomp/gen_kubectl_bash_comp.go +++ b/cmd/genbashcomp/gen_kubectl_bash_comp.go @@ -21,9 +21,9 @@ import ( "io/ioutil" "os" - "github.com/GoogleCloudPlatform/kubernetes/cmd/genutils" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/cmd/genutils" + "k8s.io/kubernetes/pkg/kubectl/cmd" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" ) func main() { diff --git a/cmd/genconversion/conversion.go b/cmd/genconversion/conversion.go index c60b8f1dac..dc178e9a87 100644 --- a/cmd/genconversion/conversion.go +++ b/cmd/genconversion/conversion.go @@ -23,10 +23,10 @@ import ( "path" "runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1" - pkg_runtime "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + _ "k8s.io/kubernetes/pkg/api/v1" + pkg_runtime "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" flag "github.com/spf13/pflag" @@ -53,9 +53,9 @@ func main() { funcOut = file } - generator := pkg_runtime.NewConversionGenerator(api.Scheme.Raw(), path.Join("github.com/GoogleCloudPlatform/kubernetes/pkg/api", *version)) - apiShort := generator.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api") - generator.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource") + generator := pkg_runtime.NewConversionGenerator(api.Scheme.Raw(), path.Join("k8s.io/kubernetes/pkg/api", *version)) + apiShort := generator.AddImport("k8s.io/kubernetes/pkg/api") + generator.AddImport("k8s.io/kubernetes/pkg/api/resource") // TODO(wojtek-t): Change the overwrites to a flag. generator.OverwritePackage(*version, "") for _, knownType := range api.Scheme.KnownTypes(*version) { diff --git a/cmd/gendeepcopy/deep_copy.go b/cmd/gendeepcopy/deep_copy.go index 34b49a875c..9aace9757f 100644 --- a/cmd/gendeepcopy/deep_copy.go +++ b/cmd/gendeepcopy/deep_copy.go @@ -23,10 +23,10 @@ import ( "runtime" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1" - pkg_runtime "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + _ "k8s.io/kubernetes/pkg/api/v1" + pkg_runtime "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" flag "github.com/spf13/pflag" @@ -60,9 +60,9 @@ func main() { knownVersion = api.Scheme.Raw().InternalVersion registerTo = "Scheme" } - pkgPath := path.Join("github.com/GoogleCloudPlatform/kubernetes/pkg/api", knownVersion) - generator := pkg_runtime.NewDeepCopyGenerator(api.Scheme.Raw(), pkgPath, util.NewStringSet("github.com/GoogleCloudPlatform/kubernetes")) - generator.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api") + pkgPath := path.Join("k8s.io/kubernetes/pkg/api", knownVersion) + generator := pkg_runtime.NewDeepCopyGenerator(api.Scheme.Raw(), pkgPath, util.NewStringSet("k8s.io/kubernetes")) + generator.AddImport("k8s.io/kubernetes/pkg/api") if len(*overwrites) > 0 { for _, overwrite := range strings.Split(*overwrites, ",") { diff --git a/cmd/gendocs/gen_kubectl_docs.go b/cmd/gendocs/gen_kubectl_docs.go index 0ccc54467f..47416124df 100644 --- a/cmd/gendocs/gen_kubectl_docs.go +++ b/cmd/gendocs/gen_kubectl_docs.go @@ -21,9 +21,9 @@ import ( "io/ioutil" "os" - "github.com/GoogleCloudPlatform/kubernetes/cmd/genutils" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/cmd/genutils" + "k8s.io/kubernetes/pkg/kubectl/cmd" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "github.com/spf13/cobra" ) diff --git a/cmd/genman/gen_kubectl_man.go b/cmd/genman/gen_kubectl_man.go index 38b203832a..2a9182d3a4 100644 --- a/cmd/genman/gen_kubectl_man.go +++ b/cmd/genman/gen_kubectl_man.go @@ -23,9 +23,9 @@ import ( "os" "strings" - "github.com/GoogleCloudPlatform/kubernetes/cmd/genutils" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/cmd/genutils" + "k8s.io/kubernetes/pkg/kubectl/cmd" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" mangen "github.com/cpuguy83/go-md2man/md2man" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/hyperkube/hyperkube.go b/cmd/hyperkube/hyperkube.go index ba12003257..7b1ec231cc 100644 --- a/cmd/hyperkube/hyperkube.go +++ b/cmd/hyperkube/hyperkube.go @@ -28,8 +28,8 @@ import ( "path" "runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" ) diff --git a/cmd/hyperkube/kube-apiserver.go b/cmd/hyperkube/kube-apiserver.go index e6942ef9b5..0c5eb11e25 100644 --- a/cmd/hyperkube/kube-apiserver.go +++ b/cmd/hyperkube/kube-apiserver.go @@ -19,7 +19,7 @@ limitations under the License. package main import ( - kubeapiserver "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-apiserver/app" + kubeapiserver "k8s.io/kubernetes/cmd/kube-apiserver/app" ) // NewKubeAPIServer creates a new hyperkube Server object that includes the diff --git a/cmd/hyperkube/kube-controller-manager.go b/cmd/hyperkube/kube-controller-manager.go index f99e5244e1..646dcc560a 100644 --- a/cmd/hyperkube/kube-controller-manager.go +++ b/cmd/hyperkube/kube-controller-manager.go @@ -19,7 +19,7 @@ limitations under the License. package main import ( - controllermgr "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-controller-manager/app" + controllermgr "k8s.io/kubernetes/cmd/kube-controller-manager/app" ) // NewKubeControllerManager creates a new hyperkube Server object that includes the diff --git a/cmd/hyperkube/kube-proxy.go b/cmd/hyperkube/kube-proxy.go index ffaa1a54c1..427d776a67 100644 --- a/cmd/hyperkube/kube-proxy.go +++ b/cmd/hyperkube/kube-proxy.go @@ -19,7 +19,7 @@ limitations under the License. package main import ( - kubeproxy "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-proxy/app" + kubeproxy "k8s.io/kubernetes/cmd/kube-proxy/app" ) // NewKubeProxy creates a new hyperkube Server object that includes the diff --git a/cmd/hyperkube/kube-scheduler.go b/cmd/hyperkube/kube-scheduler.go index ededc4ed8a..f27a3f863d 100644 --- a/cmd/hyperkube/kube-scheduler.go +++ b/cmd/hyperkube/kube-scheduler.go @@ -19,7 +19,7 @@ limitations under the License. package main import ( - scheduler "github.com/GoogleCloudPlatform/kubernetes/plugin/cmd/kube-scheduler/app" + scheduler "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app" ) // NewScheduler creates a new hyperkube Server object that includes the diff --git a/cmd/hyperkube/kubelet.go b/cmd/hyperkube/kubelet.go index 430b739d0c..f93eac02c2 100644 --- a/cmd/hyperkube/kubelet.go +++ b/cmd/hyperkube/kubelet.go @@ -17,7 +17,7 @@ limitations under the License. package main import ( - kubelet "github.com/GoogleCloudPlatform/kubernetes/cmd/kubelet/app" + kubelet "k8s.io/kubernetes/cmd/kubelet/app" ) // NewKubelet creates a new hyperkube Server object that includes the diff --git a/cmd/hyperkube/server.go b/cmd/hyperkube/server.go index ece91b803b..6b6e5ce521 100644 --- a/cmd/hyperkube/server.go +++ b/cmd/hyperkube/server.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" "github.com/spf13/pflag" ) diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 8b64b65b4d..7f9d5d3e00 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -33,34 +33,34 @@ import ( "sync" "time" - kubeletapp "github.com/GoogleCloudPlatform/kubernetes/cmd/kubelet/app" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/endpoint" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/node" - replicationControllerPkg "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/replication" - explatest "github.com/GoogleCloudPlatform/kubernetes/pkg/expapi/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/empty_dir" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/admit" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler" - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithmprovider" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/factory" - "github.com/GoogleCloudPlatform/kubernetes/test/e2e" + kubeletapp "k8s.io/kubernetes/cmd/kubelet/app" + "k8s.io/kubernetes/pkg/api" + apierrors "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/apiserver" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/controller/endpoint" + "k8s.io/kubernetes/pkg/controller/node" + replicationControllerPkg "k8s.io/kubernetes/pkg/controller/replication" + explatest "k8s.io/kubernetes/pkg/expapi/latest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/volume/empty_dir" + "k8s.io/kubernetes/plugin/pkg/admission/admit" + "k8s.io/kubernetes/plugin/pkg/scheduler" + _ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" + "k8s.io/kubernetes/plugin/pkg/scheduler/factory" + "k8s.io/kubernetes/test/e2e" docker "github.com/fsouza/go-dockerclient" "github.com/coreos/go-etcd/etcd" diff --git a/cmd/kube-apiserver/apiserver.go b/cmd/kube-apiserver/apiserver.go index 2d16448d30..483040d3fc 100644 --- a/cmd/kube-apiserver/apiserver.go +++ b/cmd/kube-apiserver/apiserver.go @@ -25,9 +25,9 @@ import ( "runtime" "time" - "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-apiserver/app" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag" + "k8s.io/kubernetes/cmd/kube-apiserver/app" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" ) diff --git a/cmd/kube-apiserver/app/plugins.go b/cmd/kube-apiserver/app/plugins.go index 40381f8d04..eea9ac0354 100644 --- a/cmd/kube-apiserver/app/plugins.go +++ b/cmd/kube-apiserver/app/plugins.go @@ -21,23 +21,23 @@ package app // given binary target. import ( // Cloud providers - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/aws" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/gce" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/mesos" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/openstack" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/ovirt" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/rackspace" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/vagrant" + _ "k8s.io/kubernetes/pkg/cloudprovider/aws" + _ "k8s.io/kubernetes/pkg/cloudprovider/gce" + _ "k8s.io/kubernetes/pkg/cloudprovider/mesos" + _ "k8s.io/kubernetes/pkg/cloudprovider/openstack" + _ "k8s.io/kubernetes/pkg/cloudprovider/ovirt" + _ "k8s.io/kubernetes/pkg/cloudprovider/rackspace" + _ "k8s.io/kubernetes/pkg/cloudprovider/vagrant" // Admission policies - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/admit" - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/deny" - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/exec/denyprivileged" - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/limitranger" - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/namespace/autoprovision" - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/namespace/exists" - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/namespace/lifecycle" - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/resourcequota" - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/securitycontext/scdeny" - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/serviceaccount" + _ "k8s.io/kubernetes/plugin/pkg/admission/admit" + _ "k8s.io/kubernetes/plugin/pkg/admission/deny" + _ "k8s.io/kubernetes/plugin/pkg/admission/exec/denyprivileged" + _ "k8s.io/kubernetes/plugin/pkg/admission/limitranger" + _ "k8s.io/kubernetes/plugin/pkg/admission/namespace/autoprovision" + _ "k8s.io/kubernetes/plugin/pkg/admission/namespace/exists" + _ "k8s.io/kubernetes/plugin/pkg/admission/namespace/lifecycle" + _ "k8s.io/kubernetes/plugin/pkg/admission/resourcequota" + _ "k8s.io/kubernetes/plugin/pkg/admission/securitycontext/scdeny" + _ "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount" ) diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index c62868b663..ee275cd81b 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -30,21 +30,21 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver" - "github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" - explatest "github.com/GoogleCloudPlatform/kubernetes/pkg/expapi/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - forked "github.com/GoogleCloudPlatform/kubernetes/third_party/forked/coreos/go-etcd/etcd" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/apiserver" + "k8s.io/kubernetes/pkg/capabilities" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/cloudprovider" + explatest "k8s.io/kubernetes/pkg/expapi/latest" + "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/util" + forked "k8s.io/kubernetes/third_party/forked/coreos/go-etcd/etcd" systemd "github.com/coreos/go-systemd/daemon" "github.com/coreos/go-etcd/etcd" diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 00e6d81ce8..f6f190b0d7 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -31,22 +31,22 @@ import ( "strconv" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/endpoint" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/namespace" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/node" - replicationControllerPkg "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/replication" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/resourcequota" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/route" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/service" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/serviceaccount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volumeclaimbinder" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/controller/endpoint" + "k8s.io/kubernetes/pkg/controller/namespace" + "k8s.io/kubernetes/pkg/controller/node" + replicationControllerPkg "k8s.io/kubernetes/pkg/controller/replication" + "k8s.io/kubernetes/pkg/controller/resourcequota" + "k8s.io/kubernetes/pkg/controller/route" + "k8s.io/kubernetes/pkg/controller/service" + "k8s.io/kubernetes/pkg/controller/serviceaccount" + "k8s.io/kubernetes/pkg/healthz" + "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/volumeclaimbinder" "github.com/golang/glog" "github.com/prometheus/client_golang/prometheus" diff --git a/cmd/kube-controller-manager/app/plugins.go b/cmd/kube-controller-manager/app/plugins.go index cd6b1649b8..5d41afab7d 100644 --- a/cmd/kube-controller-manager/app/plugins.go +++ b/cmd/kube-controller-manager/app/plugins.go @@ -22,18 +22,18 @@ import ( // given binary target. //Cloud providers - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/aws" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/gce" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/mesos" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/openstack" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/ovirt" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/rackspace" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/vagrant" + _ "k8s.io/kubernetes/pkg/cloudprovider/aws" + _ "k8s.io/kubernetes/pkg/cloudprovider/gce" + _ "k8s.io/kubernetes/pkg/cloudprovider/mesos" + _ "k8s.io/kubernetes/pkg/cloudprovider/openstack" + _ "k8s.io/kubernetes/pkg/cloudprovider/ovirt" + _ "k8s.io/kubernetes/pkg/cloudprovider/rackspace" + _ "k8s.io/kubernetes/pkg/cloudprovider/vagrant" // Volume plugins - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/host_path" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/nfs" + "k8s.io/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/volume/host_path" + "k8s.io/kubernetes/pkg/volume/nfs" ) // ProbeRecyclableVolumePlugins collects all persistent volume plugins into an easy to use list. diff --git a/cmd/kube-controller-manager/controller-manager.go b/cmd/kube-controller-manager/controller-manager.go index 0b0bcef93a..e10d9a2b82 100644 --- a/cmd/kube-controller-manager/controller-manager.go +++ b/cmd/kube-controller-manager/controller-manager.go @@ -25,10 +25,10 @@ import ( "os" "runtime" - "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-controller-manager/app" - "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag" + "k8s.io/kubernetes/cmd/kube-controller-manager/app" + "k8s.io/kubernetes/pkg/healthz" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" ) diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index 6e17309570..b4643620a7 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -25,14 +25,14 @@ import ( "strconv" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/proxy" - "github.com/GoogleCloudPlatform/kubernetes/pkg/proxy/config" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/iptables" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/proxy" + "k8s.io/kubernetes/pkg/proxy/config" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util/iptables" "github.com/golang/glog" "github.com/spf13/pflag" diff --git a/cmd/kube-proxy/proxy.go b/cmd/kube-proxy/proxy.go index 721146f2bc..fbcb1f611f 100644 --- a/cmd/kube-proxy/proxy.go +++ b/cmd/kube-proxy/proxy.go @@ -21,10 +21,10 @@ import ( "os" "runtime" - "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-proxy/app" - "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag" + "k8s.io/kubernetes/cmd/kube-proxy/app" + "k8s.io/kubernetes/pkg/healthz" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" ) diff --git a/cmd/kube-version-change/version.go b/cmd/kube-version-change/version.go index 9f557c46b0..a5715d76ec 100644 --- a/cmd/kube-version-change/version.go +++ b/cmd/kube-version-change/version.go @@ -27,9 +27,9 @@ import ( "os" "runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/util" "github.com/ghodss/yaml" flag "github.com/spf13/pflag" diff --git a/cmd/kubectl/kubectl.go b/cmd/kubectl/kubectl.go index 5fd519fca9..78af2a7790 100644 --- a/cmd/kubectl/kubectl.go +++ b/cmd/kubectl/kubectl.go @@ -20,8 +20,8 @@ import ( "os" "runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/cmd" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" ) func main() { diff --git a/cmd/kubelet/app/plugins.go b/cmd/kubelet/app/plugins.go index 9923753b2e..c4c55cc6c5 100644 --- a/cmd/kubelet/app/plugins.go +++ b/cmd/kubelet/app/plugins.go @@ -19,31 +19,31 @@ package app // This file exists to force the desired plugin implementations to be linked. import ( // Credential providers - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/credentialprovider/gcp" + _ "k8s.io/kubernetes/pkg/credentialprovider/gcp" // Network plugins - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/network" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/network/exec" + "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/kubelet/network/exec" // Volume plugins - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/aws_ebs" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/empty_dir" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/gce_pd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/git_repo" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/glusterfs" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/host_path" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/iscsi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/nfs" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/persistent_claim" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/rbd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/secret" + "k8s.io/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/volume/aws_ebs" + "k8s.io/kubernetes/pkg/volume/empty_dir" + "k8s.io/kubernetes/pkg/volume/gce_pd" + "k8s.io/kubernetes/pkg/volume/git_repo" + "k8s.io/kubernetes/pkg/volume/glusterfs" + "k8s.io/kubernetes/pkg/volume/host_path" + "k8s.io/kubernetes/pkg/volume/iscsi" + "k8s.io/kubernetes/pkg/volume/nfs" + "k8s.io/kubernetes/pkg/volume/persistent_claim" + "k8s.io/kubernetes/pkg/volume/rbd" + "k8s.io/kubernetes/pkg/volume/secret" //Cloud providers - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/aws" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/gce" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/mesos" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/openstack" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/ovirt" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/rackspace" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/vagrant" + _ "k8s.io/kubernetes/pkg/cloudprovider/aws" + _ "k8s.io/kubernetes/pkg/cloudprovider/gce" + _ "k8s.io/kubernetes/pkg/cloudprovider/mesos" + _ "k8s.io/kubernetes/pkg/cloudprovider/openstack" + _ "k8s.io/kubernetes/pkg/cloudprovider/ovirt" + _ "k8s.io/kubernetes/pkg/cloudprovider/rackspace" + _ "k8s.io/kubernetes/pkg/cloudprovider/vagrant" ) // ProbeVolumePlugins collects all volume plugins into an easy to use list. diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 37e55583d8..05f6fef3cd 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -32,29 +32,29 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/chaosclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/clientauth" - "github.com/GoogleCloudPlatform/kubernetes/pkg/credentialprovider" - "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/config" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/network" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - nodeutil "github.com/GoogleCloudPlatform/kubernetes/pkg/util/node" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/capabilities" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/chaosclient" + "k8s.io/kubernetes/pkg/client/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/clientauth" + "k8s.io/kubernetes/pkg/credentialprovider" + "k8s.io/kubernetes/pkg/healthz" + "k8s.io/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" + "k8s.io/kubernetes/pkg/kubelet/config" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/mount" + nodeutil "k8s.io/kubernetes/pkg/util/node" + "k8s.io/kubernetes/pkg/volume" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/cloudprovider" "github.com/golang/glog" "github.com/spf13/pflag" ) diff --git a/cmd/kubelet/kubelet.go b/cmd/kubelet/kubelet.go index 37bd0497a3..dac193ee32 100644 --- a/cmd/kubelet/kubelet.go +++ b/cmd/kubelet/kubelet.go @@ -25,9 +25,9 @@ import ( "os" "runtime" - "github.com/GoogleCloudPlatform/kubernetes/cmd/kubelet/app" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag" + "k8s.io/kubernetes/cmd/kubelet/app" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" ) diff --git a/cmd/kubernetes/kubernetes.go b/cmd/kubernetes/kubernetes.go index 2ef7045220..5f6ec9e755 100644 --- a/cmd/kubernetes/kubernetes.go +++ b/cmd/kubernetes/kubernetes.go @@ -28,27 +28,27 @@ import ( "runtime" "time" - kubeletapp "github.com/GoogleCloudPlatform/kubernetes/cmd/kubelet/app" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/endpoint" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/node" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/replication" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/service" - explatest "github.com/GoogleCloudPlatform/kubernetes/pkg/expapi/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler" - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithmprovider" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/factory" + kubeletapp "k8s.io/kubernetes/cmd/kubelet/app" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/apiserver" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/controller/endpoint" + "k8s.io/kubernetes/pkg/controller/node" + "k8s.io/kubernetes/pkg/controller/replication" + "k8s.io/kubernetes/pkg/controller/service" + explatest "k8s.io/kubernetes/pkg/expapi/latest" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/master" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/plugin/pkg/scheduler" + _ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" + "k8s.io/kubernetes/plugin/pkg/scheduler/factory" "github.com/golang/glog" flag "github.com/spf13/pflag" diff --git a/contrib/diurnal/dc.go b/contrib/diurnal/dc.go index b9952c034c..f545979b59 100644 --- a/contrib/diurnal/dc.go +++ b/contrib/diurnal/dc.go @@ -31,8 +31,8 @@ import ( "syscall" "time" - kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + kclient "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/labels" "github.com/golang/glog" ) diff --git a/contrib/for-tests/network-tester/webserver.go b/contrib/for-tests/network-tester/webserver.go index a7d8d1af84..79f37aed37 100644 --- a/contrib/for-tests/network-tester/webserver.go +++ b/contrib/for-tests/network-tester/webserver.go @@ -42,8 +42,8 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/util" ) var ( diff --git a/contrib/git-sync/main.go b/contrib/git-sync/main.go index 0222ad27e1..376ff36a28 100644 --- a/contrib/git-sync/main.go +++ b/contrib/git-sync/main.go @@ -16,7 +16,7 @@ limitations under the License. // git-sync is a command that pull a git repository to a local directory. -package main // import "github.com/GoogleCloudPlatform/kubernetes/contrib/git-sync" +package main // import "k8s.io/kubernetes/contrib/git-sync" import ( "flag" diff --git a/contrib/mesos/cmd/k8sm-controller-manager/main.go b/contrib/mesos/cmd/k8sm-controller-manager/main.go index 25917f7251..72c7baf499 100644 --- a/contrib/mesos/cmd/k8sm-controller-manager/main.go +++ b/contrib/mesos/cmd/k8sm-controller-manager/main.go @@ -21,11 +21,11 @@ import ( "os" "runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag" + "k8s.io/kubernetes/pkg/healthz" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/version/verflag" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/controllermanager" + "k8s.io/kubernetes/contrib/mesos/pkg/controllermanager" "github.com/spf13/pflag" ) diff --git a/contrib/mesos/cmd/k8sm-executor/main.go b/contrib/mesos/cmd/k8sm-executor/main.go index 4ca45668c9..d393a4b03b 100644 --- a/contrib/mesos/cmd/k8sm-executor/main.go +++ b/contrib/mesos/cmd/k8sm-executor/main.go @@ -21,10 +21,10 @@ import ( "os" "runtime" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/executor/service" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/hyperkube" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag" + "k8s.io/kubernetes/contrib/mesos/pkg/executor/service" + "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" ) diff --git a/contrib/mesos/cmd/k8sm-redirfd/redirfd.go b/contrib/mesos/cmd/k8sm-redirfd/redirfd.go index 5592b3273d..afed9f9c44 100644 --- a/contrib/mesos/cmd/k8sm-redirfd/redirfd.go +++ b/contrib/mesos/cmd/k8sm-redirfd/redirfd.go @@ -23,7 +23,7 @@ import ( "os/exec" "syscall" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/redirfd" + "k8s.io/kubernetes/contrib/mesos/pkg/redirfd" ) func main() { diff --git a/contrib/mesos/cmd/k8sm-scheduler/main.go b/contrib/mesos/cmd/k8sm-scheduler/main.go index 8ff4a987bb..4b22962ed8 100644 --- a/contrib/mesos/cmd/k8sm-scheduler/main.go +++ b/contrib/mesos/cmd/k8sm-scheduler/main.go @@ -21,10 +21,10 @@ import ( "os" "runtime" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/hyperkube" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/service" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag" + "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/service" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" ) diff --git a/contrib/mesos/cmd/km/hyperkube.go b/contrib/mesos/cmd/km/hyperkube.go index b8e2e9dffc..47ddbd4536 100644 --- a/contrib/mesos/cmd/km/hyperkube.go +++ b/contrib/mesos/cmd/km/hyperkube.go @@ -27,8 +27,8 @@ import ( "path" "runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" ) diff --git a/contrib/mesos/cmd/km/k8sm-controllermanager.go b/contrib/mesos/cmd/km/k8sm-controllermanager.go index 7d941cdb23..43f72a4e30 100644 --- a/contrib/mesos/cmd/km/k8sm-controllermanager.go +++ b/contrib/mesos/cmd/km/k8sm-controllermanager.go @@ -18,8 +18,8 @@ limitations under the License. package main import ( - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/controllermanager" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/hyperkube" + "k8s.io/kubernetes/contrib/mesos/pkg/controllermanager" + "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" ) // NewHyperkubeServer creates a new hyperkube Server object that includes the diff --git a/contrib/mesos/cmd/km/k8sm-executor.go b/contrib/mesos/cmd/km/k8sm-executor.go index e2b2a2dca8..bde04e44cb 100644 --- a/contrib/mesos/cmd/km/k8sm-executor.go +++ b/contrib/mesos/cmd/km/k8sm-executor.go @@ -17,8 +17,8 @@ limitations under the License. package main import ( - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/executor/service" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/hyperkube" + "k8s.io/kubernetes/contrib/mesos/pkg/executor/service" + "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" ) // NewHyperkubeServer creates a new hyperkube Server object that includes the diff --git a/contrib/mesos/cmd/km/k8sm-minion.go b/contrib/mesos/cmd/km/k8sm-minion.go index 1bda8b14c6..67968dd536 100644 --- a/contrib/mesos/cmd/km/k8sm-minion.go +++ b/contrib/mesos/cmd/km/k8sm-minion.go @@ -17,8 +17,8 @@ limitations under the License. package main import ( - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/hyperkube" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/minion" + "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" + "k8s.io/kubernetes/contrib/mesos/pkg/minion" ) // NewMinion creates a new hyperkube Server object that includes the diff --git a/contrib/mesos/cmd/km/k8sm-scheduler.go b/contrib/mesos/cmd/km/k8sm-scheduler.go index c23bd4854a..3904668f4d 100644 --- a/contrib/mesos/cmd/km/k8sm-scheduler.go +++ b/contrib/mesos/cmd/km/k8sm-scheduler.go @@ -18,8 +18,8 @@ limitations under the License. package main import ( - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/hyperkube" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/service" + "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/service" ) // NewScheduler creates a new hyperkube Server object that includes the diff --git a/contrib/mesos/cmd/km/kube-apiserver.go b/contrib/mesos/cmd/km/kube-apiserver.go index 971293919c..dc76807c8a 100644 --- a/contrib/mesos/cmd/km/kube-apiserver.go +++ b/contrib/mesos/cmd/km/kube-apiserver.go @@ -18,8 +18,8 @@ limitations under the License. package main import ( - kubeapiserver "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-apiserver/app" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/hyperkube" + kubeapiserver "k8s.io/kubernetes/cmd/kube-apiserver/app" + "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" ) // NewKubeAPIServer creates a new hyperkube Server object that includes the diff --git a/contrib/mesos/cmd/km/kube-proxy.go b/contrib/mesos/cmd/km/kube-proxy.go index b4ee800250..d410441d6c 100644 --- a/contrib/mesos/cmd/km/kube-proxy.go +++ b/contrib/mesos/cmd/km/kube-proxy.go @@ -18,8 +18,8 @@ limitations under the License. package main import ( - kubeproxy "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-proxy/app" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/hyperkube" + kubeproxy "k8s.io/kubernetes/cmd/kube-proxy/app" + "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" ) // NewKubeProxy creates a new hyperkube Server object that includes the diff --git a/contrib/mesos/cmd/km/server.go b/contrib/mesos/cmd/km/server.go index b00599a5cd..a4033926e1 100644 --- a/contrib/mesos/cmd/km/server.go +++ b/contrib/mesos/cmd/km/server.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" "github.com/spf13/pflag" ) diff --git a/contrib/mesos/pkg/controllermanager/controllermanager.go b/contrib/mesos/pkg/controllermanager/controllermanager.go index 9a4b141cb7..18d091f729 100644 --- a/contrib/mesos/pkg/controllermanager/controllermanager.go +++ b/contrib/mesos/pkg/controllermanager/controllermanager.go @@ -23,26 +23,26 @@ import ( "net/http" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/cmd/kube-controller-manager/app" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/mesos" - kendpoint "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/endpoint" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/namespace" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/node" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/replication" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/resourcequota" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/route" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/service" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/serviceaccount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volumeclaimbinder" + "k8s.io/kubernetes/cmd/kube-controller-manager/app" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/cloudprovider/mesos" + kendpoint "k8s.io/kubernetes/pkg/controller/endpoint" + "k8s.io/kubernetes/pkg/controller/namespace" + "k8s.io/kubernetes/pkg/controller/node" + "k8s.io/kubernetes/pkg/controller/replication" + "k8s.io/kubernetes/pkg/controller/resourcequota" + "k8s.io/kubernetes/pkg/controller/route" + "k8s.io/kubernetes/pkg/controller/service" + "k8s.io/kubernetes/pkg/controller/serviceaccount" + "k8s.io/kubernetes/pkg/healthz" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/volumeclaimbinder" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/profile" - kmendpoint "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/service" + "k8s.io/kubernetes/contrib/mesos/pkg/profile" + kmendpoint "k8s.io/kubernetes/contrib/mesos/pkg/service" "github.com/golang/glog" "github.com/prometheus/client_golang/prometheus" diff --git a/contrib/mesos/pkg/election/etcd_master.go b/contrib/mesos/pkg/election/etcd_master.go index 81b435ee98..2a0e0a0e98 100644 --- a/contrib/mesos/pkg/election/etcd_master.go +++ b/contrib/mesos/pkg/election/etcd_master.go @@ -20,10 +20,10 @@ import ( "fmt" "time" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" "github.com/coreos/go-etcd/etcd" "github.com/golang/glog" ) diff --git a/contrib/mesos/pkg/election/etcd_master_test.go b/contrib/mesos/pkg/election/etcd_master_test.go index 9facd53241..03c1296a52 100644 --- a/contrib/mesos/pkg/election/etcd_master_test.go +++ b/contrib/mesos/pkg/election/etcd_master_test.go @@ -19,8 +19,8 @@ package election import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/watch" "github.com/coreos/go-etcd/etcd" ) diff --git a/contrib/mesos/pkg/election/fake.go b/contrib/mesos/pkg/election/fake.go index d4eaddfb3e..1540354d56 100644 --- a/contrib/mesos/pkg/election/fake.go +++ b/contrib/mesos/pkg/election/fake.go @@ -19,7 +19,7 @@ package election import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/watch" ) // Fake allows for testing of anything consuming a MasterElector. diff --git a/contrib/mesos/pkg/election/master.go b/contrib/mesos/pkg/election/master.go index 8ab199634b..a5360e0abc 100644 --- a/contrib/mesos/pkg/election/master.go +++ b/contrib/mesos/pkg/election/master.go @@ -19,8 +19,8 @@ package election import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/contrib/mesos/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" "github.com/golang/glog" ) diff --git a/contrib/mesos/pkg/election/master_test.go b/contrib/mesos/pkg/election/master_test.go index 307428e84b..b1e44b7b70 100644 --- a/contrib/mesos/pkg/election/master_test.go +++ b/contrib/mesos/pkg/election/master_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/runtime" + "k8s.io/kubernetes/contrib/mesos/pkg/runtime" ) type slowService struct { diff --git a/contrib/mesos/pkg/executor/executor.go b/contrib/mesos/pkg/executor/executor.go index 575a087538..6360aec1e0 100644 --- a/contrib/mesos/pkg/executor/executor.go +++ b/contrib/mesos/pkg/executor/executor.go @@ -25,16 +25,16 @@ import ( "sync/atomic" "time" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/archive" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/executor/messages" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/contrib/mesos/pkg/archive" + "k8s.io/kubernetes/contrib/mesos/pkg/executor/messages" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" "github.com/fsouza/go-dockerclient" "github.com/gogo/protobuf/proto" log "github.com/golang/glog" diff --git a/contrib/mesos/pkg/executor/executor_test.go b/contrib/mesos/pkg/executor/executor_test.go index 79a1be714e..a4c40bc7e6 100644 --- a/contrib/mesos/pkg/executor/executor_test.go +++ b/contrib/mesos/pkg/executor/executor_test.go @@ -31,19 +31,19 @@ import ( "testing" "time" - assertext "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/assert" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/executor/messages" - kmruntime "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/podtask" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - kconfig "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/config" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + assertext "k8s.io/kubernetes/contrib/mesos/pkg/assert" + "k8s.io/kubernetes/contrib/mesos/pkg/executor/messages" + kmruntime "k8s.io/kubernetes/contrib/mesos/pkg/runtime" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/kubelet" + kconfig "k8s.io/kubernetes/pkg/kubelet/config" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" "github.com/golang/glog" bindings "github.com/mesos/mesos-go/executor" diff --git a/contrib/mesos/pkg/executor/mock_test.go b/contrib/mesos/pkg/executor/mock_test.go index 4b060024a5..3ea17cbe6e 100644 --- a/contrib/mesos/pkg/executor/mock_test.go +++ b/contrib/mesos/pkg/executor/mock_test.go @@ -19,7 +19,7 @@ package executor import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/kubelet/dockertools" "github.com/mesos/mesos-go/mesosproto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/contrib/mesos/pkg/executor/service/service.go b/contrib/mesos/pkg/executor/service/service.go index 57a00b9e8a..99b2425e11 100644 --- a/contrib/mesos/pkg/executor/service/service.go +++ b/contrib/mesos/pkg/executor/service/service.go @@ -30,21 +30,21 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/cmd/kubelet/app" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/executor" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/executor/config" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/hyperkube" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/redirfd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/credentialprovider" - "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" - kconfig "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/config" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/cmd/kubelet/app" + "k8s.io/kubernetes/contrib/mesos/pkg/executor" + "k8s.io/kubernetes/contrib/mesos/pkg/executor/config" + "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" + "k8s.io/kubernetes/contrib/mesos/pkg/redirfd" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/credentialprovider" + "k8s.io/kubernetes/pkg/healthz" + "k8s.io/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" + kconfig "k8s.io/kubernetes/pkg/kubelet/config" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/mount" log "github.com/golang/glog" bindings "github.com/mesos/mesos-go/executor" diff --git a/contrib/mesos/pkg/minion/config/config.go b/contrib/mesos/pkg/minion/config/config.go index c7815e2316..af5a2ce94e 100644 --- a/contrib/mesos/pkg/minion/config/config.go +++ b/contrib/mesos/pkg/minion/config/config.go @@ -17,7 +17,7 @@ limitations under the License. package config import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/resource" ) const ( diff --git a/contrib/mesos/pkg/minion/server.go b/contrib/mesos/pkg/minion/server.go index 5ace2a8874..1b182b9c90 100644 --- a/contrib/mesos/pkg/minion/server.go +++ b/contrib/mesos/pkg/minion/server.go @@ -24,12 +24,12 @@ import ( "os/exec" "time" - exservice "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/executor/service" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/hyperkube" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/minion/config" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + exservice "k8s.io/kubernetes/contrib/mesos/pkg/executor/service" + "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" + "k8s.io/kubernetes/contrib/mesos/pkg/minion/config" + "k8s.io/kubernetes/contrib/mesos/pkg/runtime" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client" log "github.com/golang/glog" "github.com/kardianos/osext" diff --git a/contrib/mesos/pkg/offers/offers.go b/contrib/mesos/pkg/offers/offers.go index 0df507d593..71ed07cc87 100644 --- a/contrib/mesos/pkg/offers/offers.go +++ b/contrib/mesos/pkg/offers/offers.go @@ -23,12 +23,12 @@ import ( "sync/atomic" "time" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/offers/metrics" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/proc" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/queue" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/contrib/mesos/pkg/offers/metrics" + "k8s.io/kubernetes/contrib/mesos/pkg/proc" + "k8s.io/kubernetes/contrib/mesos/pkg/queue" + "k8s.io/kubernetes/contrib/mesos/pkg/runtime" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/util" log "github.com/golang/glog" mesos "github.com/mesos/mesos-go/mesosproto" ) diff --git a/contrib/mesos/pkg/offers/offers_test.go b/contrib/mesos/pkg/offers/offers_test.go index 5b44eee5af..a7193beb21 100644 --- a/contrib/mesos/pkg/offers/offers_test.go +++ b/contrib/mesos/pkg/offers/offers_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/proc" + "k8s.io/kubernetes/contrib/mesos/pkg/proc" mesos "github.com/mesos/mesos-go/mesosproto" util "github.com/mesos/mesos-go/mesosutil" ) diff --git a/contrib/mesos/pkg/proc/proc.go b/contrib/mesos/pkg/proc/proc.go index 0108563add..619d49de26 100644 --- a/contrib/mesos/pkg/proc/proc.go +++ b/contrib/mesos/pkg/proc/proc.go @@ -22,7 +22,7 @@ import ( "sync/atomic" "time" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/runtime" + "k8s.io/kubernetes/contrib/mesos/pkg/runtime" log "github.com/golang/glog" ) diff --git a/contrib/mesos/pkg/proc/proc_test.go b/contrib/mesos/pkg/proc/proc_test.go index 3439a05085..5d450c3112 100644 --- a/contrib/mesos/pkg/proc/proc_test.go +++ b/contrib/mesos/pkg/proc/proc_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/runtime" + "k8s.io/kubernetes/contrib/mesos/pkg/runtime" log "github.com/golang/glog" ) diff --git a/contrib/mesos/pkg/queue/delay.go b/contrib/mesos/pkg/queue/delay.go index 39e93281cd..6ec436b71e 100644 --- a/contrib/mesos/pkg/queue/delay.go +++ b/contrib/mesos/pkg/queue/delay.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) type qitem struct { diff --git a/contrib/mesos/pkg/queue/historical.go b/contrib/mesos/pkg/queue/historical.go index 09148acdb8..492cb2a9b6 100644 --- a/contrib/mesos/pkg/queue/historical.go +++ b/contrib/mesos/pkg/queue/historical.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) type entry struct { diff --git a/contrib/mesos/pkg/queue/interface.go b/contrib/mesos/pkg/queue/interface.go index 7191552bfb..143816c90d 100644 --- a/contrib/mesos/pkg/queue/interface.go +++ b/contrib/mesos/pkg/queue/interface.go @@ -19,7 +19,7 @@ package queue import ( "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/cache" ) type EventType int diff --git a/contrib/mesos/pkg/runtime/metrics.go b/contrib/mesos/pkg/runtime/metrics.go index a2b1596680..8a57fb7f75 100644 --- a/contrib/mesos/pkg/runtime/metrics.go +++ b/contrib/mesos/pkg/runtime/metrics.go @@ -19,7 +19,7 @@ package runtime import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" "github.com/prometheus/client_golang/prometheus" ) diff --git a/contrib/mesos/pkg/runtime/util.go b/contrib/mesos/pkg/runtime/util.go index ed7974245e..e3064e04f1 100644 --- a/contrib/mesos/pkg/runtime/util.go +++ b/contrib/mesos/pkg/runtime/util.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) type Signal <-chan struct{} diff --git a/contrib/mesos/pkg/scheduler/fcfs.go b/contrib/mesos/pkg/scheduler/fcfs.go index 761c49c362..76553615a8 100644 --- a/contrib/mesos/pkg/scheduler/fcfs.go +++ b/contrib/mesos/pkg/scheduler/fcfs.go @@ -20,8 +20,8 @@ import ( "fmt" log "github.com/golang/glog" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/offers" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/podtask" + "k8s.io/kubernetes/contrib/mesos/pkg/offers" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" ) // A first-come-first-serve scheduler: acquires the first offer that can support the task diff --git a/contrib/mesos/pkg/scheduler/ha/election.go b/contrib/mesos/pkg/scheduler/ha/election.go index 588b2ba5f6..0ef5cf314d 100644 --- a/contrib/mesos/pkg/scheduler/ha/election.go +++ b/contrib/mesos/pkg/scheduler/ha/election.go @@ -17,7 +17,7 @@ limitations under the License. package ha import ( - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/election" + "k8s.io/kubernetes/contrib/mesos/pkg/election" log "github.com/golang/glog" ) diff --git a/contrib/mesos/pkg/scheduler/ha/ha.go b/contrib/mesos/pkg/scheduler/ha/ha.go index cdfc0c0c5c..0fe4045a26 100644 --- a/contrib/mesos/pkg/scheduler/ha/ha.go +++ b/contrib/mesos/pkg/scheduler/ha/ha.go @@ -20,8 +20,8 @@ import ( "fmt" "sync/atomic" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/proc" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/runtime" + "k8s.io/kubernetes/contrib/mesos/pkg/proc" + "k8s.io/kubernetes/contrib/mesos/pkg/runtime" log "github.com/golang/glog" mesos "github.com/mesos/mesos-go/mesosproto" bindings "github.com/mesos/mesos-go/scheduler" diff --git a/contrib/mesos/pkg/scheduler/mock_test.go b/contrib/mesos/pkg/scheduler/mock_test.go index 1dbb9da78d..ba3e214d7c 100644 --- a/contrib/mesos/pkg/scheduler/mock_test.go +++ b/contrib/mesos/pkg/scheduler/mock_test.go @@ -20,9 +20,9 @@ import ( "sync" "testing" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/offers" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/podtask" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/contrib/mesos/pkg/offers" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" + "k8s.io/kubernetes/pkg/api" mesos "github.com/mesos/mesos-go/mesosproto" "github.com/stretchr/testify/mock" ) diff --git a/contrib/mesos/pkg/scheduler/plugin.go b/contrib/mesos/pkg/scheduler/plugin.go index 06241e150b..c50e44956a 100644 --- a/contrib/mesos/pkg/scheduler/plugin.go +++ b/contrib/mesos/pkg/scheduler/plugin.go @@ -24,22 +24,22 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/backoff" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/offers" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/queue" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/runtime" - annotation "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/meta" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/podtask" - mresource "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - plugin "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/contrib/mesos/pkg/backoff" + "k8s.io/kubernetes/contrib/mesos/pkg/offers" + "k8s.io/kubernetes/contrib/mesos/pkg/queue" + "k8s.io/kubernetes/contrib/mesos/pkg/runtime" + annotation "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" + mresource "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resource" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/util" + plugin "k8s.io/kubernetes/plugin/pkg/scheduler" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" log "github.com/golang/glog" mesos "github.com/mesos/mesos-go/mesosproto" mutil "github.com/mesos/mesos-go/mesosutil" diff --git a/contrib/mesos/pkg/scheduler/plugin_test.go b/contrib/mesos/pkg/scheduler/plugin_test.go index 5a55eec461..346622100f 100644 --- a/contrib/mesos/pkg/scheduler/plugin_test.go +++ b/contrib/mesos/pkg/scheduler/plugin_test.go @@ -24,22 +24,22 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - kutil "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/runtime" + kutil "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" - assertext "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/assert" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/executor/messages" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/queue" - schedcfg "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/config" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/ha" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/meta" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/podtask" - mresource "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/resource" + assertext "k8s.io/kubernetes/contrib/mesos/pkg/assert" + "k8s.io/kubernetes/contrib/mesos/pkg/executor/messages" + "k8s.io/kubernetes/contrib/mesos/pkg/queue" + schedcfg "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/config" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/ha" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" + mresource "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resource" log "github.com/golang/glog" mesos "github.com/mesos/mesos-go/mesosproto" util "github.com/mesos/mesos-go/mesosutil" diff --git a/contrib/mesos/pkg/scheduler/pod.go b/contrib/mesos/pkg/scheduler/pod.go index 4a9a9388b8..bf70100bcf 100644 --- a/contrib/mesos/pkg/scheduler/pod.go +++ b/contrib/mesos/pkg/scheduler/pod.go @@ -20,9 +20,9 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/queue" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/contrib/mesos/pkg/queue" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/cache" ) // wrapper for the k8s pod type so that we can define additional methods on a "pod" diff --git a/contrib/mesos/pkg/scheduler/podtask/leaky.go b/contrib/mesos/pkg/scheduler/podtask/leaky.go index a0a66d7edc..653ba2f7b1 100644 --- a/contrib/mesos/pkg/scheduler/podtask/leaky.go +++ b/contrib/mesos/pkg/scheduler/podtask/leaky.go @@ -19,8 +19,8 @@ package podtask // Concepts that have leaked to where they should not have. import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/etcd" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/registry/etcd" ) // makePodKey constructs etcd paths to pod items enforcing namespace rules. diff --git a/contrib/mesos/pkg/scheduler/podtask/pod_task.go b/contrib/mesos/pkg/scheduler/podtask/pod_task.go index 80ea421d8f..89231b9f37 100644 --- a/contrib/mesos/pkg/scheduler/podtask/pod_task.go +++ b/contrib/mesos/pkg/scheduler/podtask/pod_task.go @@ -21,11 +21,11 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/offers" - annotation "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/meta" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/metrics" - mresource "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/contrib/mesos/pkg/offers" + annotation "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/metrics" + mresource "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resource" + "k8s.io/kubernetes/pkg/api" "github.com/gogo/protobuf/proto" "github.com/pborman/uuid" diff --git a/contrib/mesos/pkg/scheduler/podtask/pod_task_test.go b/contrib/mesos/pkg/scheduler/podtask/pod_task_test.go index c24e3f2fbd..930738719b 100644 --- a/contrib/mesos/pkg/scheduler/podtask/pod_task_test.go +++ b/contrib/mesos/pkg/scheduler/podtask/pod_task_test.go @@ -19,9 +19,9 @@ package podtask import ( "testing" - mresource "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" + mresource "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resource" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" mesos "github.com/mesos/mesos-go/mesosproto" mutil "github.com/mesos/mesos-go/mesosutil" diff --git a/contrib/mesos/pkg/scheduler/podtask/port_mapping.go b/contrib/mesos/pkg/scheduler/podtask/port_mapping.go index 9c90ef15b7..5da4942e4d 100644 --- a/contrib/mesos/pkg/scheduler/podtask/port_mapping.go +++ b/contrib/mesos/pkg/scheduler/podtask/port_mapping.go @@ -19,8 +19,8 @@ package podtask import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/labels" log "github.com/golang/glog" mesos "github.com/mesos/mesos-go/mesosproto" ) diff --git a/contrib/mesos/pkg/scheduler/podtask/port_mapping_test.go b/contrib/mesos/pkg/scheduler/podtask/port_mapping_test.go index d5c911f3bf..20d2d4ef8d 100644 --- a/contrib/mesos/pkg/scheduler/podtask/port_mapping_test.go +++ b/contrib/mesos/pkg/scheduler/podtask/port_mapping_test.go @@ -19,7 +19,7 @@ package podtask import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" mesos "github.com/mesos/mesos-go/mesosproto" ) diff --git a/contrib/mesos/pkg/scheduler/podtask/registry.go b/contrib/mesos/pkg/scheduler/podtask/registry.go index 589484fb14..3641d42228 100644 --- a/contrib/mesos/pkg/scheduler/podtask/registry.go +++ b/contrib/mesos/pkg/scheduler/podtask/registry.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/metrics" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/metrics" + "k8s.io/kubernetes/pkg/api" log "github.com/golang/glog" mesos "github.com/mesos/mesos-go/mesosproto" ) diff --git a/contrib/mesos/pkg/scheduler/podtask/registry_test.go b/contrib/mesos/pkg/scheduler/podtask/registry_test.go index 92716b2bb8..69bfe47442 100644 --- a/contrib/mesos/pkg/scheduler/podtask/registry_test.go +++ b/contrib/mesos/pkg/scheduler/podtask/registry_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/offers" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/proc" + "k8s.io/kubernetes/contrib/mesos/pkg/offers" + "k8s.io/kubernetes/contrib/mesos/pkg/proc" mesos "github.com/mesos/mesos-go/mesosproto" "github.com/mesos/mesos-go/mesosutil" "github.com/stretchr/testify/assert" diff --git a/contrib/mesos/pkg/scheduler/resource/resource.go b/contrib/mesos/pkg/scheduler/resource/resource.go index 44ca401a27..f2521d730e 100644 --- a/contrib/mesos/pkg/scheduler/resource/resource.go +++ b/contrib/mesos/pkg/scheduler/resource/resource.go @@ -17,9 +17,9 @@ limitations under the License. package resource import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/resourcequota" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/controller/resourcequota" ) const ( diff --git a/contrib/mesos/pkg/scheduler/scheduler.go b/contrib/mesos/pkg/scheduler/scheduler.go index 01ce2e60e4..5a9e310b9f 100644 --- a/contrib/mesos/pkg/scheduler/scheduler.go +++ b/contrib/mesos/pkg/scheduler/scheduler.go @@ -25,26 +25,26 @@ import ( "sync" "time" - execcfg "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/executor/config" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/executor/messages" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/offers" - offerMetrics "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/offers/metrics" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/proc" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/runtime" - schedcfg "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/config" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/meta" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/metrics" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/podtask" - mresource "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/resource" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/uid" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + execcfg "k8s.io/kubernetes/contrib/mesos/pkg/executor/config" + "k8s.io/kubernetes/contrib/mesos/pkg/executor/messages" + "k8s.io/kubernetes/contrib/mesos/pkg/offers" + offerMetrics "k8s.io/kubernetes/contrib/mesos/pkg/offers/metrics" + "k8s.io/kubernetes/contrib/mesos/pkg/proc" + "k8s.io/kubernetes/contrib/mesos/pkg/runtime" + schedcfg "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/config" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/metrics" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" + mresource "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resource" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/uid" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/util" log "github.com/golang/glog" mesos "github.com/mesos/mesos-go/mesosproto" mutil "github.com/mesos/mesos-go/mesosutil" diff --git a/contrib/mesos/pkg/scheduler/scheduler_test.go b/contrib/mesos/pkg/scheduler/scheduler_test.go index e4fe2577e2..4c52633773 100644 --- a/contrib/mesos/pkg/scheduler/scheduler_test.go +++ b/contrib/mesos/pkg/scheduler/scheduler_test.go @@ -19,10 +19,10 @@ package scheduler import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/offers" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/proc" - schedcfg "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/config" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/podtask" + "k8s.io/kubernetes/contrib/mesos/pkg/offers" + "k8s.io/kubernetes/contrib/mesos/pkg/proc" + schedcfg "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/config" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" mesos "github.com/mesos/mesos-go/mesosproto" util "github.com/mesos/mesos-go/mesosutil" "github.com/stretchr/testify/assert" diff --git a/contrib/mesos/pkg/scheduler/service/publish.go b/contrib/mesos/pkg/scheduler/service/publish.go index 2a356e5af3..a9597f3de0 100644 --- a/contrib/mesos/pkg/scheduler/service/publish.go +++ b/contrib/mesos/pkg/scheduler/service/publish.go @@ -21,9 +21,9 @@ import ( "reflect" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/master/ports" "github.com/golang/glog" ) diff --git a/contrib/mesos/pkg/scheduler/service/service.go b/contrib/mesos/pkg/scheduler/service/service.go index a58f00a29b..058fc2eca2 100644 --- a/contrib/mesos/pkg/scheduler/service/service.go +++ b/contrib/mesos/pkg/scheduler/service/service.go @@ -32,28 +32,28 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/archive" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/election" - execcfg "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/executor/config" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/hyperkube" - minioncfg "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/minion/config" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/profile" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler" - schedcfg "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/config" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/ha" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/meta" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/metrics" - mresource "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/resource" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/uid" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/clientauth" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/contrib/mesos/pkg/archive" + "k8s.io/kubernetes/contrib/mesos/pkg/election" + execcfg "k8s.io/kubernetes/contrib/mesos/pkg/executor/config" + "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" + minioncfg "k8s.io/kubernetes/contrib/mesos/pkg/minion/config" + "k8s.io/kubernetes/contrib/mesos/pkg/profile" + "k8s.io/kubernetes/contrib/mesos/pkg/runtime" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler" + schedcfg "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/config" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/ha" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/metrics" + mresource "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resource" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/uid" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/clientauth" + "k8s.io/kubernetes/pkg/master/ports" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/util" "github.com/coreos/go-etcd/etcd" "github.com/gogo/protobuf/proto" log "github.com/golang/glog" diff --git a/contrib/mesos/pkg/scheduler/service/service_test.go b/contrib/mesos/pkg/scheduler/service/service_test.go index 7894074554..c9f594db67 100644 --- a/contrib/mesos/pkg/scheduler/service/service_test.go +++ b/contrib/mesos/pkg/scheduler/service/service_test.go @@ -27,8 +27,8 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/archive" - mresource "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/resource" + "k8s.io/kubernetes/contrib/mesos/pkg/archive" + mresource "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resource" "github.com/stretchr/testify/assert" ) diff --git a/contrib/mesos/pkg/scheduler/types.go b/contrib/mesos/pkg/scheduler/types.go index a8ab9bd399..0b9ba9de01 100644 --- a/contrib/mesos/pkg/scheduler/types.go +++ b/contrib/mesos/pkg/scheduler/types.go @@ -19,8 +19,8 @@ package scheduler import ( "errors" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/offers" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/podtask" + "k8s.io/kubernetes/contrib/mesos/pkg/offers" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" ) // PodScheduleFunc implements how to schedule pods among slaves. diff --git a/contrib/mesos/pkg/service/endpoints_controller.go b/contrib/mesos/pkg/service/endpoints_controller.go index 4327ea240c..324e459e0a 100644 --- a/contrib/mesos/pkg/service/endpoints_controller.go +++ b/contrib/mesos/pkg/service/endpoints_controller.go @@ -22,20 +22,20 @@ import ( "strconv" "time" - "github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/scheduler/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/endpoints" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - kservice "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/endpoint" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/workqueue" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/endpoints" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + kservice "k8s.io/kubernetes/pkg/controller/endpoint" + "k8s.io/kubernetes/pkg/controller/framework" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/workqueue" + "k8s.io/kubernetes/pkg/watch" "github.com/golang/glog" ) diff --git a/contrib/mesos/pkg/service/endpoints_controller_test.go b/contrib/mesos/pkg/service/endpoints_controller_test.go index 8168cd01cd..b0537cee3d 100644 --- a/contrib/mesos/pkg/service/endpoints_controller_test.go +++ b/contrib/mesos/pkg/service/endpoints_controller_test.go @@ -19,7 +19,7 @@ package service import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) func TestFindMappedPort(t *testing.T) { diff --git a/contrib/pod-master/podmaster.go b/contrib/pod-master/podmaster.go index 08b94e4cb2..dc41370143 100644 --- a/contrib/pod-master/podmaster.go +++ b/contrib/pod-master/podmaster.go @@ -27,7 +27,7 @@ import ( "strings" "time" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" "github.com/coreos/go-etcd/etcd" "github.com/golang/glog" diff --git a/contrib/service-loadbalancer/service_loadbalancer.go b/contrib/service-loadbalancer/service_loadbalancer.go index 5dffd6bed4..65978809cd 100644 --- a/contrib/service-loadbalancer/service_loadbalancer.go +++ b/contrib/service-loadbalancer/service_loadbalancer.go @@ -30,14 +30,14 @@ import ( "text/template" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - kubectl_util "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/workqueue" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/controller/framework" + "k8s.io/kubernetes/pkg/fields" + kubectl_util "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/workqueue" "github.com/golang/glog" flag "github.com/spf13/pflag" ) diff --git a/contrib/service-loadbalancer/service_loadbalancer_test.go b/contrib/service-loadbalancer/service_loadbalancer_test.go index 5271833e09..a744682cd1 100644 --- a/contrib/service-loadbalancer/service_loadbalancer_test.go +++ b/contrib/service-loadbalancer/service_loadbalancer_test.go @@ -20,9 +20,9 @@ import ( "fmt" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/contrib/submit-queue/github/github.go b/contrib/submit-queue/github/github.go index 5a84a1aaa7..ab26738fef 100644 --- a/contrib/submit-queue/github/github.go +++ b/contrib/submit-queue/github/github.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" "github.com/google/go-github/github" diff --git a/contrib/submit-queue/submit-queue.go b/contrib/submit-queue/submit-queue.go index b0735997a3..aa28c01dd4 100644 --- a/contrib/submit-queue/submit-queue.go +++ b/contrib/submit-queue/submit-queue.go @@ -45,8 +45,8 @@ import ( "os" "strings" - "github.com/GoogleCloudPlatform/kubernetes/contrib/submit-queue/github" - "github.com/GoogleCloudPlatform/kubernetes/contrib/submit-queue/jenkins" + "k8s.io/kubernetes/contrib/submit-queue/github" + "k8s.io/kubernetes/contrib/submit-queue/jenkins" "github.com/golang/glog" github_api "github.com/google/go-github/github" diff --git a/examples/elasticsearch/elasticsearch_discovery.go b/examples/elasticsearch/elasticsearch_discovery.go index 100ba01260..17d02b770e 100644 --- a/examples/elasticsearch/elasticsearch_discovery.go +++ b/examples/elasticsearch/elasticsearch_discovery.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" "github.com/golang/glog" ) diff --git a/examples/examples_test.go b/examples/examples_test.go index d5e42f526a..b69569d055 100644 --- a/examples/examples_test.go +++ b/examples/examples_test.go @@ -25,14 +25,14 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/yaml" - schedulerapi "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/api" - schedulerapilatest "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/api/latest" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/capabilities" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/yaml" + schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" + schedulerapilatest "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest" "github.com/golang/glog" ) diff --git a/examples/https-nginx/make_secret.go b/examples/https-nginx/make_secret.go index d286a1943e..91dd294878 100644 --- a/examples/https-nginx/make_secret.go +++ b/examples/https-nginx/make_secret.go @@ -23,9 +23,9 @@ package main import ( "flag" "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/runtime" "io/ioutil" "log" ) diff --git a/pkg/admission/attributes.go b/pkg/admission/attributes.go index 63b50f0a04..d14c29691c 100644 --- a/pkg/admission/attributes.go +++ b/pkg/admission/attributes.go @@ -17,8 +17,8 @@ limitations under the License. package admission import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/runtime" ) type attributesRecord struct { diff --git a/pkg/admission/chain.go b/pkg/admission/chain.go index 09d64b9545..9d11a604d0 100644 --- a/pkg/admission/chain.go +++ b/pkg/admission/chain.go @@ -17,7 +17,7 @@ limitations under the License. package admission import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client" ) // chainAdmissionHandler is an instance of admission.Interface that performs admission control using a chain of admission handlers diff --git a/pkg/admission/errors.go b/pkg/admission/errors.go index defe1c3d61..227b2e5448 100644 --- a/pkg/admission/errors.go +++ b/pkg/admission/errors.go @@ -17,8 +17,8 @@ limitations under the License. package admission import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api" + apierrors "k8s.io/kubernetes/pkg/api/errors" ) // NewForbidden is a utility function to return a well-formatted admission control error response diff --git a/pkg/admission/handler.go b/pkg/admission/handler.go index 22998eac03..fe79285fd6 100644 --- a/pkg/admission/handler.go +++ b/pkg/admission/handler.go @@ -17,7 +17,7 @@ limitations under the License. package admission import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) // Handler is a base for admission control handlers that diff --git a/pkg/admission/interfaces.go b/pkg/admission/interfaces.go index b5daa5f34e..8110c8e1f9 100644 --- a/pkg/admission/interfaces.go +++ b/pkg/admission/interfaces.go @@ -17,8 +17,8 @@ limitations under the License. package admission import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/runtime" ) // Attributes is an interface used by AdmissionController to get information about a request diff --git a/pkg/admission/plugins.go b/pkg/admission/plugins.go index 6b4e1db9b7..15226d63ca 100644 --- a/pkg/admission/plugins.go +++ b/pkg/admission/plugins.go @@ -21,7 +21,7 @@ import ( "os" "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client" "github.com/golang/glog" ) diff --git a/pkg/api/context.go b/pkg/api/context.go index 7796fa51cb..7b204d3f83 100644 --- a/pkg/api/context.go +++ b/pkg/api/context.go @@ -19,7 +19,7 @@ package api import ( stderrs "errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/user" "golang.org/x/net/context" ) diff --git a/pkg/api/context_test.go b/pkg/api/context_test.go index add61c7604..c384999ff2 100644 --- a/pkg/api/context_test.go +++ b/pkg/api/context_test.go @@ -19,7 +19,7 @@ package api_test import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // TestNamespaceContext validates that a namespace can be get/set on a context object diff --git a/pkg/api/conversion.go b/pkg/api/conversion.go index 61bd117d86..c0d1a676bb 100644 --- a/pkg/api/conversion.go +++ b/pkg/api/conversion.go @@ -17,12 +17,12 @@ limitations under the License. package api import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) // Codec is the identity codec for this package - it can only convert itself diff --git a/pkg/api/conversion_test.go b/pkg/api/conversion_test.go index b552d17f63..0ad68dfdd1 100644 --- a/pkg/api/conversion_test.go +++ b/pkg/api/conversion_test.go @@ -20,8 +20,8 @@ import ( "io/ioutil" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" ) func BenchmarkPodConversion(b *testing.B) { diff --git a/pkg/api/copy_test.go b/pkg/api/copy_test.go index 7b942c94b3..79796ed2c5 100644 --- a/pkg/api/copy_test.go +++ b/pkg/api/copy_test.go @@ -21,9 +21,9 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - apitesting "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testing" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + apitesting "k8s.io/kubernetes/pkg/api/testing" ) func TestDeepCopyApiObjects(t *testing.T) { diff --git a/pkg/api/deep_copy_generated.go b/pkg/api/deep_copy_generated.go index e7fd78d3f0..2a4d4d80ca 100644 --- a/pkg/api/deep_copy_generated.go +++ b/pkg/api/deep_copy_generated.go @@ -18,12 +18,12 @@ package api // AUTO-GENERATED FUNCTIONS START HERE import ( - resource "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - conversion "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" - fields "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - labels "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - runtime "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - util "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + resource "k8s.io/kubernetes/pkg/api/resource" + conversion "k8s.io/kubernetes/pkg/conversion" + fields "k8s.io/kubernetes/pkg/fields" + labels "k8s.io/kubernetes/pkg/labels" + runtime "k8s.io/kubernetes/pkg/runtime" + util "k8s.io/kubernetes/pkg/util" inf "speter.net/go/exp/math/dec/inf" time "time" ) diff --git a/pkg/api/deep_copy_test.go b/pkg/api/deep_copy_test.go index 232ad7d67d..606e3ab080 100644 --- a/pkg/api/deep_copy_test.go +++ b/pkg/api/deep_copy_test.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) func BenchmarkPodCopy(b *testing.B) { diff --git a/pkg/api/endpoints/util.go b/pkg/api/endpoints/util.go index 6d8d712098..0b440bb1bc 100644 --- a/pkg/api/endpoints/util.go +++ b/pkg/api/endpoints/util.go @@ -23,8 +23,8 @@ import ( "hash" "sort" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" ) // RepackSubsets takes a slice of EndpointSubset objects, expands it to the full diff --git a/pkg/api/endpoints/util_test.go b/pkg/api/endpoints/util_test.go index 4ef1eb62ea..38eb8597d7 100644 --- a/pkg/api/endpoints/util_test.go +++ b/pkg/api/endpoints/util_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" "github.com/davecgh/go-spew/spew" ) diff --git a/pkg/api/errors/errors.go b/pkg/api/errors/errors.go index 0577b3a4f1..890e333496 100644 --- a/pkg/api/errors/errors.go +++ b/pkg/api/errors/errors.go @@ -22,10 +22,10 @@ import ( "net/http" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // HTTP Status codes not in the golang http package. diff --git a/pkg/api/errors/errors_test.go b/pkg/api/errors/errors_test.go index 78c6d01fe6..b0f5eed658 100644 --- a/pkg/api/errors/errors_test.go +++ b/pkg/api/errors/errors_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/fielderrors" ) func TestErrorNew(t *testing.T) { diff --git a/pkg/api/errors/etcd/etcd.go b/pkg/api/errors/etcd/etcd.go index 3b85aaffcd..f3dcff02c0 100644 --- a/pkg/api/errors/etcd/etcd.go +++ b/pkg/api/errors/etcd/etcd.go @@ -17,8 +17,8 @@ limitations under the License. package etcd import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/api/errors" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" ) // InterpretGetError converts a generic etcd error on a retrieval diff --git a/pkg/api/generate.go b/pkg/api/generate.go index 772873f90e..2cca5e52fc 100644 --- a/pkg/api/generate.go +++ b/pkg/api/generate.go @@ -19,7 +19,7 @@ package api import ( "fmt" - utilrand "github.com/GoogleCloudPlatform/kubernetes/pkg/util/rand" + utilrand "k8s.io/kubernetes/pkg/util/rand" ) // NameGenerator generates names for objects. Some backends may have more information diff --git a/pkg/api/helpers.go b/pkg/api/helpers.go index 26affb3c51..d9e83156d6 100644 --- a/pkg/api/helpers.go +++ b/pkg/api/helpers.go @@ -21,12 +21,12 @@ import ( "fmt" "reflect" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" "github.com/davecgh/go-spew/spew" ) diff --git a/pkg/api/helpers_test.go b/pkg/api/helpers_test.go index a3b47eb3fe..47e8050a74 100644 --- a/pkg/api/helpers_test.go +++ b/pkg/api/helpers_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/resource" "speter.net/go/exp/math/dec/inf" ) diff --git a/pkg/api/latest/latest.go b/pkg/api/latest/latest.go index 585c978ce0..6bbcc210b8 100644 --- a/pkg/api/latest/latest.go +++ b/pkg/api/latest/latest.go @@ -20,12 +20,12 @@ import ( "fmt" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/registered" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/registered" + "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) // Version is the string that represents the current external default version. @@ -63,7 +63,7 @@ var RESTMapper meta.RESTMapper // userResources is a group of resources mostly used by a kubectl user var userResources = []string{"rc", "svc", "pods", "pvc"} -const importPrefix = "github.com/GoogleCloudPlatform/kubernetes/pkg/api" +const importPrefix = "k8s.io/kubernetes/pkg/api" func init() { // Use the first API version in the list of registered versions as the latest. diff --git a/pkg/api/latest/latest_test.go b/pkg/api/latest/latest_test.go index de6e378ee5..bfce20aa74 100644 --- a/pkg/api/latest/latest_test.go +++ b/pkg/api/latest/latest_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - internal "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + internal "k8s.io/kubernetes/pkg/api" ) func TestResourceVersioner(t *testing.T) { diff --git a/pkg/api/mapper.go b/pkg/api/mapper.go index 4cc3dd3447..7e4fad1b59 100644 --- a/pkg/api/mapper.go +++ b/pkg/api/mapper.go @@ -19,8 +19,8 @@ package api import ( "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/util" ) var RESTMapper meta.RESTMapper diff --git a/pkg/api/meta.go b/pkg/api/meta.go index 63ab2a6f38..e5fa9635fb 100644 --- a/pkg/api/meta.go +++ b/pkg/api/meta.go @@ -17,9 +17,9 @@ limitations under the License. package api import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) // FillObjectMetaSystemFields populates fields that are managed by the system on ObjectMeta. diff --git a/pkg/api/meta/interfaces.go b/pkg/api/meta/interfaces.go index d64fdaccb9..888fc73a96 100644 --- a/pkg/api/meta/interfaces.go +++ b/pkg/api/meta/interfaces.go @@ -17,8 +17,8 @@ limitations under the License. package meta import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/types" ) // VersionInterfaces contains the interfaces one should use for dealing with types of a particular version. diff --git a/pkg/api/meta/meta.go b/pkg/api/meta/meta.go index d7ad98f691..848f09afe5 100644 --- a/pkg/api/meta/meta.go +++ b/pkg/api/meta/meta.go @@ -20,9 +20,9 @@ import ( "fmt" "reflect" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/types" ) // Accessor takes an arbitrary object pointer and returns meta.Interface. diff --git a/pkg/api/meta/meta_test.go b/pkg/api/meta/meta_test.go index 712d6da7eb..a1c81e6307 100644 --- a/pkg/api/meta/meta_test.go +++ b/pkg/api/meta/meta_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) func TestGenericTypeMeta(t *testing.T) { diff --git a/pkg/api/meta/restmapper_test.go b/pkg/api/meta/restmapper_test.go index 148c02565a..2c748d07c4 100644 --- a/pkg/api/meta/restmapper_test.go +++ b/pkg/api/meta/restmapper_test.go @@ -20,7 +20,7 @@ import ( "errors" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" ) type fakeCodec struct{} diff --git a/pkg/api/meta_test.go b/pkg/api/meta_test.go index 65caf5c1ac..f3b293cd99 100644 --- a/pkg/api/meta_test.go +++ b/pkg/api/meta_test.go @@ -19,7 +19,7 @@ package api_test import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // TestFillObjectMetaSystemFields validates that system populated fields are set on an object diff --git a/pkg/api/ref.go b/pkg/api/ref.go index 9aa7268771..0029b223d8 100644 --- a/pkg/api/ref.go +++ b/pkg/api/ref.go @@ -22,8 +22,8 @@ import ( "net/url" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/runtime" ) var ( diff --git a/pkg/api/ref_test.go b/pkg/api/ref_test.go index 8d65dd2630..491c35f145 100644 --- a/pkg/api/ref_test.go +++ b/pkg/api/ref_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" ) type FakeAPIObject struct{} diff --git a/pkg/api/register.go b/pkg/api/register.go index 675f9e5e61..d53f35b963 100644 --- a/pkg/api/register.go +++ b/pkg/api/register.go @@ -17,7 +17,7 @@ limitations under the License. package api import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" ) // Scheme is the default instance of runtime.Scheme to which types in the Kubernetes API are already registered. diff --git a/pkg/api/resource/quantity_example_test.go b/pkg/api/resource/quantity_example_test.go index 58ad0079b7..48c3d2555f 100644 --- a/pkg/api/resource/quantity_example_test.go +++ b/pkg/api/resource/quantity_example_test.go @@ -19,7 +19,7 @@ package resource_test import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/resource" ) func ExampleFormat() { diff --git a/pkg/api/resource_helpers.go b/pkg/api/resource_helpers.go index 8a0c6fdff1..2dee56870b 100644 --- a/pkg/api/resource_helpers.go +++ b/pkg/api/resource_helpers.go @@ -17,7 +17,7 @@ limitations under the License. package api import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/resource" ) // Returns string version of ResourceName. diff --git a/pkg/api/resource_helpers_test.go b/pkg/api/resource_helpers_test.go index 70955a90dc..e18386f294 100644 --- a/pkg/api/resource_helpers_test.go +++ b/pkg/api/resource_helpers_test.go @@ -19,7 +19,7 @@ package api import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/resource" ) func TestResourceHelpers(t *testing.T) { diff --git a/pkg/api/rest/create.go b/pkg/api/rest/create.go index 6b0951f2f4..3d51ded7e7 100644 --- a/pkg/api/rest/create.go +++ b/pkg/api/rest/create.go @@ -17,10 +17,10 @@ limitations under the License. package rest import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // RESTCreateStrategy defines the minimum validation, accepted input, and diff --git a/pkg/api/rest/create_test.go b/pkg/api/rest/create_test.go index 6d3b35f0a5..8bf7ef696e 100644 --- a/pkg/api/rest/create_test.go +++ b/pkg/api/rest/create_test.go @@ -19,8 +19,8 @@ package rest import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" ) func TestCheckGeneratedNameError(t *testing.T) { diff --git a/pkg/api/rest/delete.go b/pkg/api/rest/delete.go index 950fada6c7..9d433f80fe 100644 --- a/pkg/api/rest/delete.go +++ b/pkg/api/rest/delete.go @@ -17,8 +17,8 @@ limitations under the License. package rest import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" ) // RESTDeleteStrategy defines deletion behavior on an object that follows Kubernetes diff --git a/pkg/api/rest/rest.go b/pkg/api/rest/rest.go index fbb8a13157..d4db3d0a88 100644 --- a/pkg/api/rest/rest.go +++ b/pkg/api/rest/rest.go @@ -21,11 +21,11 @@ import ( "net/http" "net/url" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) //TODO: diff --git a/pkg/api/rest/resttest/resttest.go b/pkg/api/rest/resttest/resttest.go index 269180d809..b8b5564324 100644 --- a/pkg/api/rest/resttest/resttest.go +++ b/pkg/api/rest/resttest/resttest.go @@ -20,12 +20,12 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/util" "github.com/coreos/go-etcd/etcd" ) diff --git a/pkg/api/rest/types.go b/pkg/api/rest/types.go index a5523aeb18..8701f9c043 100644 --- a/pkg/api/rest/types.go +++ b/pkg/api/rest/types.go @@ -17,10 +17,10 @@ limitations under the License. package rest import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // ObjectFunc is a function to act on a given object. An error may be returned diff --git a/pkg/api/rest/update.go b/pkg/api/rest/update.go index b7c1c02e90..b65bed246d 100644 --- a/pkg/api/rest/update.go +++ b/pkg/api/rest/update.go @@ -17,10 +17,10 @@ limitations under the License. package rest import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // RESTUpdateStrategy defines the minimum validation, accepted input, and diff --git a/pkg/api/rest/update_test.go b/pkg/api/rest/update_test.go index a401efccdc..d5512cbad4 100644 --- a/pkg/api/rest/update_test.go +++ b/pkg/api/rest/update_test.go @@ -19,9 +19,9 @@ package rest import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) func makeValidService() api.Service { diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index 3fc3aecadf..e6e20504db 100644 --- a/pkg/api/serialization_test.go +++ b/pkg/api/serialization_test.go @@ -23,13 +23,13 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - apitesting "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/testapi" + apitesting "k8s.io/kubernetes/pkg/api/testing" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" "github.com/davecgh/go-spew/spew" flag "github.com/spf13/pflag" diff --git a/pkg/api/testapi/testapi.go b/pkg/api/testapi/testapi.go index 8d03105063..bd294c00a1 100644 --- a/pkg/api/testapi/testapi.go +++ b/pkg/api/testapi/testapi.go @@ -22,9 +22,9 @@ import ( "os" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/runtime" ) // Version returns the API version to test against, as set by the KUBE_API_VERSION env var. diff --git a/pkg/api/testing/fuzzer.go b/pkg/api/testing/fuzzer.go index 347d1bd477..b6e75d7f20 100644 --- a/pkg/api/testing/fuzzer.go +++ b/pkg/api/testing/fuzzer.go @@ -22,14 +22,14 @@ import ( "strconv" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/registered" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/registered" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" docker "github.com/fsouza/go-dockerclient" "github.com/google/gofuzz" diff --git a/pkg/api/types.go b/pkg/api/types.go index 910ce2b35a..ba19a23a88 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -17,12 +17,12 @@ limitations under the License. package api import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" ) // Common string formats diff --git a/pkg/api/v1/conversion.go b/pkg/api/v1/conversion.go index d1b0afb8dd..7ace3ee114 100644 --- a/pkg/api/v1/conversion.go +++ b/pkg/api/v1/conversion.go @@ -20,8 +20,8 @@ import ( "fmt" "reflect" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/conversion" ) func addConversionFuncs() { diff --git a/pkg/api/v1/conversion_generated.go b/pkg/api/v1/conversion_generated.go index df544703be..397c65c3cf 100644 --- a/pkg/api/v1/conversion_generated.go +++ b/pkg/api/v1/conversion_generated.go @@ -18,9 +18,9 @@ package v1 // AUTO-GENERATED FUNCTIONS START HERE import ( - api "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - resource "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - conversion "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" + api "k8s.io/kubernetes/pkg/api" + resource "k8s.io/kubernetes/pkg/api/resource" + conversion "k8s.io/kubernetes/pkg/conversion" reflect "reflect" ) diff --git a/pkg/api/v1/conversion_test.go b/pkg/api/v1/conversion_test.go index 519915dc03..2c74a518f5 100644 --- a/pkg/api/v1/conversion_test.go +++ b/pkg/api/v1/conversion_test.go @@ -19,8 +19,8 @@ package v1_test import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - versioned "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/api" + versioned "k8s.io/kubernetes/pkg/api/v1" ) func TestNodeConversion(t *testing.T) { diff --git a/pkg/api/v1/deep_copy_generated.go b/pkg/api/v1/deep_copy_generated.go index be6da7cfde..44a4d68521 100644 --- a/pkg/api/v1/deep_copy_generated.go +++ b/pkg/api/v1/deep_copy_generated.go @@ -18,11 +18,11 @@ package v1 // AUTO-GENERATED FUNCTIONS START HERE import ( - api "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - resource "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - conversion "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" - runtime "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - util "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + api "k8s.io/kubernetes/pkg/api" + resource "k8s.io/kubernetes/pkg/api/resource" + conversion "k8s.io/kubernetes/pkg/conversion" + runtime "k8s.io/kubernetes/pkg/runtime" + util "k8s.io/kubernetes/pkg/util" inf "speter.net/go/exp/math/dec/inf" time "time" ) diff --git a/pkg/api/v1/defaults.go b/pkg/api/v1/defaults.go index b89461bf45..f9e47a2135 100644 --- a/pkg/api/v1/defaults.go +++ b/pkg/api/v1/defaults.go @@ -19,8 +19,8 @@ package v1 import ( "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" ) func addDefaultingFuncs() { diff --git a/pkg/api/v1/defaults_test.go b/pkg/api/v1/defaults_test.go index a7d8d51b4a..9c4a6275f4 100644 --- a/pkg/api/v1/defaults_test.go +++ b/pkg/api/v1/defaults_test.go @@ -20,10 +20,10 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - versioned "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + versioned "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) func roundTrip(t *testing.T, obj runtime.Object) runtime.Object { diff --git a/pkg/api/v1/register.go b/pkg/api/v1/register.go index e497f6ed4a..bb5b142c0c 100644 --- a/pkg/api/v1/register.go +++ b/pkg/api/v1/register.go @@ -17,9 +17,9 @@ limitations under the License. package v1 import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/registered" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/registered" + "k8s.io/kubernetes/pkg/runtime" ) // Codec encodes internal objects to the v1 scheme diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index c51e8a2f89..3185ece53d 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -17,10 +17,10 @@ limitations under the License. package v1 import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" ) // Common string formats diff --git a/pkg/api/validation/events.go b/pkg/api/validation/events.go index 0f9e1cf406..2fe0f7ac50 100644 --- a/pkg/api/validation/events.go +++ b/pkg/api/validation/events.go @@ -17,9 +17,9 @@ limitations under the License. package validation import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - errs "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" + errs "k8s.io/kubernetes/pkg/util/fielderrors" ) // ValidateEvent makes sure that the event makes sense. diff --git a/pkg/api/validation/events_test.go b/pkg/api/validation/events_test.go index 050b317ab7..a2910d0646 100644 --- a/pkg/api/validation/events_test.go +++ b/pkg/api/validation/events_test.go @@ -19,7 +19,7 @@ package validation import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) func TestValidateEvent(t *testing.T) { diff --git a/pkg/api/validation/schema.go b/pkg/api/validation/schema.go index daec08f198..d06f75ee83 100644 --- a/pkg/api/validation/schema.go +++ b/pkg/api/validation/schema.go @@ -22,9 +22,9 @@ import ( "reflect" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" - errs "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/yaml" + "k8s.io/kubernetes/pkg/util/errors" + errs "k8s.io/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/util/yaml" "github.com/emicklei/go-restful/swagger" "github.com/golang/glog" ) diff --git a/pkg/api/validation/schema_test.go b/pkg/api/validation/schema_test.go index 58dcd6eb9d..4c22a273db 100644 --- a/pkg/api/validation/schema_test.go +++ b/pkg/api/validation/schema_test.go @@ -21,10 +21,10 @@ import ( "math/rand" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - apitesting "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + apitesting "k8s.io/kubernetes/pkg/api/testing" + "k8s.io/kubernetes/pkg/runtime" ) func readPod(filename string) (string, error) { diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go index e61ed13cb7..15a353f6be 100644 --- a/pkg/api/validation/validation.go +++ b/pkg/api/validation/validation.go @@ -25,12 +25,12 @@ import ( "regexp" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - errs "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/capabilities" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" + errs "k8s.io/kubernetes/pkg/util/fielderrors" "github.com/golang/glog" ) diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go index add2fbb3db..a4479b6f93 100644 --- a/pkg/api/validation/validation_test.go +++ b/pkg/api/validation/validation_test.go @@ -22,14 +22,14 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - utilerrors "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" - errors "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/capabilities" + "k8s.io/kubernetes/pkg/util" + utilerrors "k8s.io/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/util/fielderrors" + errors "k8s.io/kubernetes/pkg/util/fielderrors" ) func expectPrefix(t *testing.T, prefix string, errs fielderrors.ValidationErrorList) { diff --git a/pkg/apiserver/api_installer.go b/pkg/apiserver/api_installer.go index debd438936..097aede933 100644 --- a/pkg/apiserver/api_installer.go +++ b/pkg/apiserver/api_installer.go @@ -25,13 +25,13 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - watchjson "github.com/GoogleCloudPlatform/kubernetes/pkg/watch/json" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/runtime" + watchjson "k8s.io/kubernetes/pkg/watch/json" "github.com/emicklei/go-restful" ) diff --git a/pkg/apiserver/api_installer_test.go b/pkg/apiserver/api_installer_test.go index 302db3e85e..fd5750ccf3 100644 --- a/pkg/apiserver/api_installer_test.go +++ b/pkg/apiserver/api_installer_test.go @@ -19,8 +19,8 @@ package apiserver import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/meta" "github.com/emicklei/go-restful" ) diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index 6b7e1199ec..49fe11c7a2 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -29,19 +29,19 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver/metrics" - "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/flushwriter" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + apierrors "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/apiserver/metrics" + "k8s.io/kubernetes/pkg/healthz" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/util/flushwriter" + "k8s.io/kubernetes/pkg/version" "github.com/emicklei/go-restful" "github.com/golang/glog" diff --git a/pkg/apiserver/apiserver_test.go b/pkg/apiserver/apiserver_test.go index b48ae0bca3..f26e109fec 100644 --- a/pkg/apiserver/apiserver_test.go +++ b/pkg/apiserver/apiserver_test.go @@ -32,19 +32,19 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - apierrs "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/admit" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/deny" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + apierrs "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/version" + "k8s.io/kubernetes/pkg/watch" + "k8s.io/kubernetes/plugin/pkg/admission/admit" + "k8s.io/kubernetes/plugin/pkg/admission/deny" "github.com/emicklei/go-restful" ) diff --git a/pkg/apiserver/authn.go b/pkg/apiserver/authn.go index cc3000d484..638447c692 100644 --- a/pkg/apiserver/authn.go +++ b/pkg/apiserver/authn.go @@ -19,16 +19,16 @@ package apiserver import ( "crypto/rsa" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator/bearertoken" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/serviceaccount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/auth/authenticator/password/passwordfile" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/auth/authenticator/request/basicauth" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/auth/authenticator/request/union" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/auth/authenticator/request/x509" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/auth/authenticator/token/tokenfile" + "k8s.io/kubernetes/pkg/auth/authenticator" + "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" + "k8s.io/kubernetes/pkg/controller/serviceaccount" + "k8s.io/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/passwordfile" + "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/basicauth" + "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/union" + "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/x509" + "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/tokenfile" ) // NewAuthenticator returns an authenticator.Request or an error diff --git a/pkg/apiserver/authz.go b/pkg/apiserver/authz.go index 7fc593140b..e2558b3962 100644 --- a/pkg/apiserver/authz.go +++ b/pkg/apiserver/authz.go @@ -19,8 +19,8 @@ package apiserver import ( "errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authorizer" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authorizer/abac" + "k8s.io/kubernetes/pkg/auth/authorizer" + "k8s.io/kubernetes/pkg/auth/authorizer/abac" ) // Attributes implements authorizer.Attributes interface. diff --git a/pkg/apiserver/errors.go b/pkg/apiserver/errors.go index 503d45ac5b..53f35179cb 100644 --- a/pkg/apiserver/errors.go +++ b/pkg/apiserver/errors.go @@ -20,9 +20,9 @@ import ( "fmt" "net/http" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/util" ) // statusError is an object that can be converted into an api.Status diff --git a/pkg/apiserver/errors_test.go b/pkg/apiserver/errors_test.go index a39c867fee..b40a82e1cb 100644 --- a/pkg/apiserver/errors_test.go +++ b/pkg/apiserver/errors_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" ) func TestErrorsToAPIStatus(t *testing.T) { diff --git a/pkg/apiserver/handlers.go b/pkg/apiserver/handlers.go index 45cad7214c..a611feae75 100644 --- a/pkg/apiserver/handlers.go +++ b/pkg/apiserver/handlers.go @@ -28,12 +28,12 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authorizer" - "github.com/GoogleCloudPlatform/kubernetes/pkg/httplog" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/auth/authorizer" + "k8s.io/kubernetes/pkg/httplog" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/apiserver/handlers_test.go b/pkg/apiserver/handlers_test.go index 5ebc2a4bbb..30ec81da66 100644 --- a/pkg/apiserver/handlers_test.go +++ b/pkg/apiserver/handlers_test.go @@ -27,11 +27,11 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/util" ) type fakeRL bool diff --git a/pkg/apiserver/index.go b/pkg/apiserver/index.go index b2ac0d3b95..480deb6e1a 100644 --- a/pkg/apiserver/index.go +++ b/pkg/apiserver/index.go @@ -20,7 +20,7 @@ import ( "net/http" "sort" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" "github.com/emicklei/go-restful" ) diff --git a/pkg/apiserver/proxy.go b/pkg/apiserver/proxy.go index a7a538c4ab..260b3d85ba 100644 --- a/pkg/apiserver/proxy.go +++ b/pkg/apiserver/proxy.go @@ -29,17 +29,17 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver/metrics" - "github.com/GoogleCloudPlatform/kubernetes/pkg/httplog" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" - proxyutil "github.com/GoogleCloudPlatform/kubernetes/pkg/util/proxy" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/apiserver/metrics" + "k8s.io/kubernetes/pkg/httplog" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/httpstream" + proxyutil "k8s.io/kubernetes/pkg/util/proxy" - "github.com/GoogleCloudPlatform/kubernetes/third_party/golang/netutil" + "k8s.io/kubernetes/third_party/golang/netutil" "github.com/golang/glog" ) diff --git a/pkg/apiserver/proxy_test.go b/pkg/apiserver/proxy_test.go index bc66097089..a666eb63db 100644 --- a/pkg/apiserver/proxy_test.go +++ b/pkg/apiserver/proxy_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/api/rest" "golang.org/x/net/websocket" ) diff --git a/pkg/apiserver/resthandler.go b/pkg/apiserver/resthandler.go index 168b54ec83..890eb41a00 100644 --- a/pkg/apiserver/resthandler.go +++ b/pkg/apiserver/resthandler.go @@ -23,13 +23,13 @@ import ( gpath "path" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/strategicpatch" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/strategicpatch" "github.com/emicklei/go-restful" "github.com/evanphx/json-patch" diff --git a/pkg/apiserver/validator.go b/pkg/apiserver/validator.go index 93f45b1413..a3916da686 100644 --- a/pkg/apiserver/validator.go +++ b/pkg/apiserver/validator.go @@ -25,7 +25,7 @@ import ( "strconv" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/probe" ) // TODO: this basic interface is duplicated in N places. consolidate? diff --git a/pkg/apiserver/validator_test.go b/pkg/apiserver/validator_test.go index c359f5735b..5dcd268162 100644 --- a/pkg/apiserver/validator_test.go +++ b/pkg/apiserver/validator_test.go @@ -24,7 +24,7 @@ import ( "net/http" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/probe" ) type fakeRoundTripper struct { diff --git a/pkg/apiserver/watch.go b/pkg/apiserver/watch.go index 9107f0c3ab..2231135543 100644 --- a/pkg/apiserver/watch.go +++ b/pkg/apiserver/watch.go @@ -24,10 +24,10 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/httplog" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" - watchjson "github.com/GoogleCloudPlatform/kubernetes/pkg/watch/json" + "k8s.io/kubernetes/pkg/httplog" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" + watchjson "k8s.io/kubernetes/pkg/watch/json" "github.com/emicklei/go-restful" "github.com/golang/glog" diff --git a/pkg/apiserver/watch_test.go b/pkg/apiserver/watch_test.go index 8a4d7f1ce3..64f9a40504 100644 --- a/pkg/apiserver/watch_test.go +++ b/pkg/apiserver/watch_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" "golang.org/x/net/websocket" ) diff --git a/pkg/auth/authenticator/bearertoken/bearertoken.go b/pkg/auth/authenticator/bearertoken/bearertoken.go index c26d2e2ea3..eff338bfba 100644 --- a/pkg/auth/authenticator/bearertoken/bearertoken.go +++ b/pkg/auth/authenticator/bearertoken/bearertoken.go @@ -20,8 +20,8 @@ import ( "net/http" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/authenticator" + "k8s.io/kubernetes/pkg/auth/user" ) type Authenticator struct { diff --git a/pkg/auth/authenticator/bearertoken/bearertoken_test.go b/pkg/auth/authenticator/bearertoken/bearertoken_test.go index 844bca6a8d..6b9f676621 100644 --- a/pkg/auth/authenticator/bearertoken/bearertoken_test.go +++ b/pkg/auth/authenticator/bearertoken/bearertoken_test.go @@ -21,8 +21,8 @@ import ( "net/http" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/authenticator" + "k8s.io/kubernetes/pkg/auth/user" ) func TestAuthenticateRequest(t *testing.T) { diff --git a/pkg/auth/authenticator/interfaces.go b/pkg/auth/authenticator/interfaces.go index 2ac0a6a584..2da820cc08 100644 --- a/pkg/auth/authenticator/interfaces.go +++ b/pkg/auth/authenticator/interfaces.go @@ -19,7 +19,7 @@ package authenticator import ( "net/http" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/user" ) // Token checks a string value against a backing authentication store and returns diff --git a/pkg/auth/authorizer/abac/abac.go b/pkg/auth/authorizer/abac/abac.go index 390514ab2e..cbc2c59018 100644 --- a/pkg/auth/authorizer/abac/abac.go +++ b/pkg/auth/authorizer/abac/abac.go @@ -25,7 +25,7 @@ import ( "errors" "os" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authorizer" + "k8s.io/kubernetes/pkg/auth/authorizer" ) // TODO: make this into a real API object. Note that when that happens, it diff --git a/pkg/auth/authorizer/abac/abac_test.go b/pkg/auth/authorizer/abac/abac_test.go index 11aff223ec..42f8b936f1 100644 --- a/pkg/auth/authorizer/abac/abac_test.go +++ b/pkg/auth/authorizer/abac/abac_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authorizer" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/authorizer" + "k8s.io/kubernetes/pkg/auth/user" ) func TestEmptyFile(t *testing.T) { diff --git a/pkg/auth/authorizer/interfaces.go b/pkg/auth/authorizer/interfaces.go index 11ed3cc64b..b44f4d9e71 100644 --- a/pkg/auth/authorizer/interfaces.go +++ b/pkg/auth/authorizer/interfaces.go @@ -17,7 +17,7 @@ limitations under the License. package authorizer import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/user" ) // Attributes is an interface used by an Authorizer to get information about a request diff --git a/pkg/auth/handlers/handlers.go b/pkg/auth/handlers/handlers.go index 362cfcfb7f..d3b2a9b766 100644 --- a/pkg/auth/handlers/handlers.go +++ b/pkg/auth/handlers/handlers.go @@ -19,8 +19,8 @@ package handlers import ( "net/http" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/auth/authenticator" "github.com/golang/glog" ) diff --git a/pkg/auth/handlers/handlers_test.go b/pkg/auth/handlers/handlers_test.go index 65c04894f0..6ad0e67b59 100644 --- a/pkg/auth/handlers/handlers_test.go +++ b/pkg/auth/handlers/handlers_test.go @@ -22,9 +22,9 @@ import ( "net/http/httptest" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/auth/authenticator" + "k8s.io/kubernetes/pkg/auth/user" ) func TestAuthenticateRequest(t *testing.T) { diff --git a/pkg/client/cache/delta_fifo.go b/pkg/client/cache/delta_fifo.go index eb12582080..2ed7f385b0 100644 --- a/pkg/client/cache/delta_fifo.go +++ b/pkg/client/cache/delta_fifo.go @@ -21,7 +21,7 @@ import ( "fmt" "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/client/cache/expiration_cache.go b/pkg/client/cache/expiration_cache.go index ba18a3cb63..a135569ad7 100644 --- a/pkg/client/cache/expiration_cache.go +++ b/pkg/client/cache/expiration_cache.go @@ -17,7 +17,7 @@ limitations under the License. package cache import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" "time" ) diff --git a/pkg/client/cache/expiration_cache_fakes.go b/pkg/client/cache/expiration_cache_fakes.go index 2c2431ed50..5fc380abc4 100644 --- a/pkg/client/cache/expiration_cache_fakes.go +++ b/pkg/client/cache/expiration_cache_fakes.go @@ -17,7 +17,7 @@ limitations under the License. package cache import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) type fakeThreadSafeMap struct { diff --git a/pkg/client/cache/expiration_cache_test.go b/pkg/client/cache/expiration_cache_test.go index 2354050947..5c6b87e8e9 100644 --- a/pkg/client/cache/expiration_cache_test.go +++ b/pkg/client/cache/expiration_cache_test.go @@ -17,7 +17,7 @@ limitations under the License. package cache import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" "reflect" "testing" "time" diff --git a/pkg/client/cache/index.go b/pkg/client/cache/index.go index 31379e7dfe..6e189c2bf6 100644 --- a/pkg/client/cache/index.go +++ b/pkg/client/cache/index.go @@ -19,8 +19,8 @@ package cache import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/util" ) // Indexer is a storage interface that lets you list objects using multiple indexing functions diff --git a/pkg/client/cache/index_test.go b/pkg/client/cache/index_test.go index d978203aed..4b0d5ff4f9 100644 --- a/pkg/client/cache/index_test.go +++ b/pkg/client/cache/index_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) func testIndexFunc(obj interface{}) ([]string, error) { diff --git a/pkg/client/cache/listers.go b/pkg/client/cache/listers.go index 785db43fdd..36af48af04 100644 --- a/pkg/client/cache/listers.go +++ b/pkg/client/cache/listers.go @@ -19,8 +19,8 @@ package cache import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/labels" "github.com/golang/glog" ) diff --git a/pkg/client/cache/listers_test.go b/pkg/client/cache/listers_test.go index 647d98a307..54c714d9fb 100644 --- a/pkg/client/cache/listers_test.go +++ b/pkg/client/cache/listers_test.go @@ -19,9 +19,9 @@ package cache import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" ) func TestStoreToMinionLister(t *testing.T) { diff --git a/pkg/client/cache/listwatch.go b/pkg/client/cache/listwatch.go index 6a7046b79a..d07c534fd2 100644 --- a/pkg/client/cache/listwatch.go +++ b/pkg/client/cache/listwatch.go @@ -17,10 +17,10 @@ limitations under the License. package cache import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) // ListFunc knows how to list resources diff --git a/pkg/client/cache/listwatch_test.go b/pkg/client/cache/listwatch_test.go index 1c666940d2..019faa6e8a 100644 --- a/pkg/client/cache/listwatch_test.go +++ b/pkg/client/cache/listwatch_test.go @@ -21,11 +21,11 @@ import ( "net/url" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/util" ) func parseSelectorOrDie(s string) fields.Selector { diff --git a/pkg/client/cache/poller.go b/pkg/client/cache/poller.go index 1223ef3844..7b0e5ff5e8 100644 --- a/pkg/client/cache/poller.go +++ b/pkg/client/cache/poller.go @@ -19,7 +19,7 @@ package cache import ( "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/client/cache/reflector.go b/pkg/client/cache/reflector.go index 89b1c85f4e..abf84a4c55 100644 --- a/pkg/client/cache/reflector.go +++ b/pkg/client/cache/reflector.go @@ -29,11 +29,11 @@ import ( "syscall" "time" - apierrs "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + apierrs "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" "github.com/golang/glog" ) diff --git a/pkg/client/cache/reflector_test.go b/pkg/client/cache/reflector_test.go index a63dfd0356..d1fb7f6ed8 100644 --- a/pkg/client/cache/reflector_test.go +++ b/pkg/client/cache/reflector_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" ) type testLW struct { diff --git a/pkg/client/cache/store.go b/pkg/client/cache/store.go index 78e309bcec..3972db9b9c 100644 --- a/pkg/client/cache/store.go +++ b/pkg/client/cache/store.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/meta" ) // Store is a generic object storage interface. Reflector knows how to watch a server diff --git a/pkg/client/cache/store_test.go b/pkg/client/cache/store_test.go index 15b07bbc89..f3d2e2fb73 100644 --- a/pkg/client/cache/store_test.go +++ b/pkg/client/cache/store_test.go @@ -19,7 +19,7 @@ package cache import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) // Test public interface diff --git a/pkg/client/cache/thread_safe_store.go b/pkg/client/cache/thread_safe_store.go index 453fa48de6..e76c436816 100644 --- a/pkg/client/cache/thread_safe_store.go +++ b/pkg/client/cache/thread_safe_store.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) // ThreadSafeStore is an interface that allows concurrent access to a storage backend. diff --git a/pkg/client/client.go b/pkg/client/client.go index f069329425..f1e543dd97 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -23,8 +23,8 @@ import ( "net/url" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/version" ) // Interface holds the methods for clients of Kubernetes, diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go index 9b475cea9c..53aaad0c0a 100644 --- a/pkg/client/client_test.go +++ b/pkg/client/client_test.go @@ -26,13 +26,13 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/version" ) const nameRequiredError = "resource name may not be empty" diff --git a/pkg/client/clientcmd/api/latest/latest.go b/pkg/client/clientcmd/api/latest/latest.go index 7cbef60306..7da9d6e3e2 100644 --- a/pkg/client/clientcmd/api/latest/latest.go +++ b/pkg/client/clientcmd/api/latest/latest.go @@ -17,8 +17,8 @@ limitations under the License. package latest import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api/v1" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/client/clientcmd/api/v1" + "k8s.io/kubernetes/pkg/runtime" ) // Version is the string that represents the current external default version. diff --git a/pkg/client/clientcmd/api/register.go b/pkg/client/clientcmd/api/register.go index fa68f14459..5248228929 100644 --- a/pkg/client/clientcmd/api/register.go +++ b/pkg/client/clientcmd/api/register.go @@ -17,7 +17,7 @@ limitations under the License. package api import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" ) // Scheme is the default instance of runtime.Scheme to which types in the Kubernetes API are already registered. diff --git a/pkg/client/clientcmd/api/types.go b/pkg/client/clientcmd/api/types.go index 434bfa2b23..b5d9674df4 100644 --- a/pkg/client/clientcmd/api/types.go +++ b/pkg/client/clientcmd/api/types.go @@ -17,7 +17,7 @@ limitations under the License. package api import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" ) // Where possible, json tags match the cli argument names. diff --git a/pkg/client/clientcmd/api/v1/conversion.go b/pkg/client/clientcmd/api/v1/conversion.go index 5d7746ed5a..ab6eb6accf 100644 --- a/pkg/client/clientcmd/api/v1/conversion.go +++ b/pkg/client/clientcmd/api/v1/conversion.go @@ -19,9 +19,9 @@ package v1 import ( "sort" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/runtime" ) func init() { diff --git a/pkg/client/clientcmd/api/v1/register.go b/pkg/client/clientcmd/api/v1/register.go index 3b4489718e..f8d1f5c3f6 100644 --- a/pkg/client/clientcmd/api/v1/register.go +++ b/pkg/client/clientcmd/api/v1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/runtime" ) // Codec encodes internal objects to the v1 scheme diff --git a/pkg/client/clientcmd/api/v1/types.go b/pkg/client/clientcmd/api/v1/types.go index 0b4d0ab4dd..e04f1311e4 100644 --- a/pkg/client/clientcmd/api/v1/types.go +++ b/pkg/client/clientcmd/api/v1/types.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" ) // Where possible, json tags match the cli argument names. diff --git a/pkg/client/clientcmd/auth_loaders.go b/pkg/client/clientcmd/auth_loaders.go index 282eac25bc..407dbe007f 100644 --- a/pkg/client/clientcmd/auth_loaders.go +++ b/pkg/client/clientcmd/auth_loaders.go @@ -23,7 +23,7 @@ import ( "io/ioutil" "os" - "github.com/GoogleCloudPlatform/kubernetes/pkg/clientauth" + "k8s.io/kubernetes/pkg/clientauth" ) // AuthLoaders are used to build clientauth.Info objects. diff --git a/pkg/client/clientcmd/client_config.go b/pkg/client/clientcmd/client_config.go index 5245b3dc91..c95486d0ba 100644 --- a/pkg/client/clientcmd/client_config.go +++ b/pkg/client/clientcmd/client_config.go @@ -24,10 +24,10 @@ import ( "github.com/imdario/mergo" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/clientauth" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/clientauth" ) var ( diff --git a/pkg/client/clientcmd/client_config_test.go b/pkg/client/clientcmd/client_config_test.go index ed6dbdd85f..33113023c4 100644 --- a/pkg/client/clientcmd/client_config_test.go +++ b/pkg/client/clientcmd/client_config_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/client" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" ) func createValidTestConfig() *clientcmdapi.Config { diff --git a/pkg/client/clientcmd/loader.go b/pkg/client/clientcmd/loader.go index 596433f6d3..09c1fed05b 100644 --- a/pkg/client/clientcmd/loader.go +++ b/pkg/client/clientcmd/loader.go @@ -28,9 +28,9 @@ import ( "github.com/ghodss/yaml" "github.com/imdario/mergo" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - clientcmdlatest "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + clientcmdlatest "k8s.io/kubernetes/pkg/client/clientcmd/api/latest" + "k8s.io/kubernetes/pkg/util/errors" ) const ( diff --git a/pkg/client/clientcmd/loader_test.go b/pkg/client/clientcmd/loader_test.go index b011cc8d4a..3334953aac 100644 --- a/pkg/client/clientcmd/loader_test.go +++ b/pkg/client/clientcmd/loader_test.go @@ -28,8 +28,8 @@ import ( "github.com/ghodss/yaml" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - clientcmdlatest "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api/latest" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + clientcmdlatest "k8s.io/kubernetes/pkg/client/clientcmd/api/latest" ) var ( diff --git a/pkg/client/clientcmd/merged_client_builder.go b/pkg/client/clientcmd/merged_client_builder.go index 996a575613..38df2deff0 100644 --- a/pkg/client/clientcmd/merged_client_builder.go +++ b/pkg/client/clientcmd/merged_client_builder.go @@ -22,8 +22,8 @@ import ( "github.com/golang/glog" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/client" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" ) // DeferredLoadingClientConfig is a ClientConfig interface that is backed by a set of loading rules diff --git a/pkg/client/clientcmd/overrides.go b/pkg/client/clientcmd/overrides.go index e2b8f24cfa..14d64ef666 100644 --- a/pkg/client/clientcmd/overrides.go +++ b/pkg/client/clientcmd/overrides.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/pflag" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" ) // ConfigOverrides holds values that should override whatever information is pulled from the actual Config object. You can't diff --git a/pkg/client/clientcmd/validation.go b/pkg/client/clientcmd/validation.go index 9253875975..40a5d1dde6 100644 --- a/pkg/client/clientcmd/validation.go +++ b/pkg/client/clientcmd/validation.go @@ -22,9 +22,9 @@ import ( "os" "strings" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - utilerrors "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/util" + utilerrors "k8s.io/kubernetes/pkg/util/errors" ) var ErrNoContext = errors.New("no context chosen") diff --git a/pkg/client/clientcmd/validation_test.go b/pkg/client/clientcmd/validation_test.go index c058dc67aa..c5c5df4110 100644 --- a/pkg/client/clientcmd/validation_test.go +++ b/pkg/client/clientcmd/validation_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/util/errors" ) func TestConfirmUsableBadInfoButOkConfig(t *testing.T) { diff --git a/pkg/client/componentstatuses.go b/pkg/client/componentstatuses.go index d79422451e..a82b106962 100644 --- a/pkg/client/componentstatuses.go +++ b/pkg/client/componentstatuses.go @@ -17,9 +17,9 @@ limitations under the License. package client import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" ) type ComponentStatusesInterface interface { diff --git a/pkg/client/conditions.go b/pkg/client/conditions.go index c42ed810ca..accd5c2b49 100644 --- a/pkg/client/conditions.go +++ b/pkg/client/conditions.go @@ -17,8 +17,8 @@ limitations under the License. package client import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util/wait" ) // ControllerHasDesiredReplicas returns a condition that will be true iff the desired replica count diff --git a/pkg/client/debugging.go b/pkg/client/debugging.go index 75cce864b2..74596b522d 100644 --- a/pkg/client/debugging.go +++ b/pkg/client/debugging.go @@ -23,7 +23,7 @@ import ( "github.com/golang/glog" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) // RequestInfo keeps track of information about a request/response combination diff --git a/pkg/client/doc.go b/pkg/client/doc.go index 5e5a7bb3ee..b325efab82 100644 --- a/pkg/client/doc.go +++ b/pkg/client/doc.go @@ -22,10 +22,10 @@ and deleting pods, replication controllers, services, and minions. Most consumers should use the Config object to create a Client: import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" ) [...] diff --git a/pkg/client/endpoints.go b/pkg/client/endpoints.go index 788c2fc003..8060615558 100644 --- a/pkg/client/endpoints.go +++ b/pkg/client/endpoints.go @@ -19,10 +19,10 @@ package client import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // EndpointsNamespacer has methods to work with Endpoints resources in a namespace diff --git a/pkg/client/endpoints_test.go b/pkg/client/endpoints_test.go index 4c091cf8a7..1be263cb3d 100644 --- a/pkg/client/endpoints_test.go +++ b/pkg/client/endpoints_test.go @@ -19,9 +19,9 @@ package client import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/labels" ) func TestListEndpoints(t *testing.T) { diff --git a/pkg/client/events.go b/pkg/client/events.go index fbaebc465c..a481c61f03 100644 --- a/pkg/client/events.go +++ b/pkg/client/events.go @@ -19,11 +19,11 @@ package client import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) // EventNamespacer can return an EventInterface for the given namespace. diff --git a/pkg/client/events_test.go b/pkg/client/events_test.go index f8a59b3139..05be98f91b 100644 --- a/pkg/client/events_test.go +++ b/pkg/client/events_test.go @@ -21,11 +21,11 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" ) func TestEventSearch(t *testing.T) { diff --git a/pkg/client/fake.go b/pkg/client/fake.go index a5f4c3eac2..6e1099b0be 100644 --- a/pkg/client/fake.go +++ b/pkg/client/fake.go @@ -20,9 +20,9 @@ import ( "net/http" "net/url" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/runtime" ) type HTTPClientFunc func(*http.Request) (*http.Response, error) diff --git a/pkg/client/flags_test.go b/pkg/client/flags_test.go index f464bc8a93..d85f77a350 100644 --- a/pkg/client/flags_test.go +++ b/pkg/client/flags_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) type fakeFlagSet struct { diff --git a/pkg/client/helper.go b/pkg/client/helper.go index d29a7db800..83eac1a457 100644 --- a/pkg/client/helper.go +++ b/pkg/client/helper.go @@ -29,11 +29,11 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/version" "github.com/golang/glog" ) diff --git a/pkg/client/helper_test.go b/pkg/client/helper_test.go index a222f616dd..6556fb2e34 100644 --- a/pkg/client/helper_test.go +++ b/pkg/client/helper_test.go @@ -26,9 +26,9 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/testapi" ) const ( diff --git a/pkg/client/kubelet.go b/pkg/client/kubelet.go index 20bb78ffc4..7c6c9ea38a 100644 --- a/pkg/client/kubelet.go +++ b/pkg/client/kubelet.go @@ -23,8 +23,8 @@ import ( "net/url" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" - httprobe "github.com/GoogleCloudPlatform/kubernetes/pkg/probe/http" + "k8s.io/kubernetes/pkg/probe" + httprobe "k8s.io/kubernetes/pkg/probe/http" ) // KubeletClient is an interface for all kubelet functionality diff --git a/pkg/client/kubelet_test.go b/pkg/client/kubelet_test.go index a4c005e147..bba7ed88d1 100644 --- a/pkg/client/kubelet_test.go +++ b/pkg/client/kubelet_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/util" ) func TestHTTPKubeletClient(t *testing.T) { diff --git a/pkg/client/limit_ranges.go b/pkg/client/limit_ranges.go index 2acf705d33..e1ad2f67cc 100644 --- a/pkg/client/limit_ranges.go +++ b/pkg/client/limit_ranges.go @@ -19,10 +19,10 @@ package client import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // LimitRangesNamespacer has methods to work with LimitRange resources in a namespace diff --git a/pkg/client/limit_ranges_test.go b/pkg/client/limit_ranges_test.go index 79ed6bdd48..b18ba63ded 100644 --- a/pkg/client/limit_ranges_test.go +++ b/pkg/client/limit_ranges_test.go @@ -20,11 +20,11 @@ import ( "net/url" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" ) func getLimitRangesResourceName() string { diff --git a/pkg/client/namespaces.go b/pkg/client/namespaces.go index 13d3b6144e..239c70e862 100644 --- a/pkg/client/namespaces.go +++ b/pkg/client/namespaces.go @@ -19,10 +19,10 @@ package client import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) type NamespacesInterface interface { diff --git a/pkg/client/namespaces_test.go b/pkg/client/namespaces_test.go index 9b3aae186b..c124d79e3f 100644 --- a/pkg/client/namespaces_test.go +++ b/pkg/client/namespaces_test.go @@ -20,10 +20,10 @@ import ( "net/url" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" ) func TestNamespaceCreate(t *testing.T) { diff --git a/pkg/client/nodes.go b/pkg/client/nodes.go index ae9c7ce165..1a0020b6c1 100644 --- a/pkg/client/nodes.go +++ b/pkg/client/nodes.go @@ -19,10 +19,10 @@ package client import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) type NodesInterface interface { diff --git a/pkg/client/nodes_test.go b/pkg/client/nodes_test.go index 065aadcf32..ff8a2be8da 100644 --- a/pkg/client/nodes_test.go +++ b/pkg/client/nodes_test.go @@ -20,11 +20,11 @@ import ( "net/url" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" ) func getNodesResourceName() string { diff --git a/pkg/client/persistentvolume_test.go b/pkg/client/persistentvolume_test.go index 7c37a9aaf6..8b68420103 100644 --- a/pkg/client/persistentvolume_test.go +++ b/pkg/client/persistentvolume_test.go @@ -20,11 +20,11 @@ import ( "net/url" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" ) func getPersistentVolumesResoureName() string { diff --git a/pkg/client/persistentvolumeclaim.go b/pkg/client/persistentvolumeclaim.go index c5ccab6169..23d21a8e41 100644 --- a/pkg/client/persistentvolumeclaim.go +++ b/pkg/client/persistentvolumeclaim.go @@ -19,10 +19,10 @@ package client import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // PersistentVolumeClaimsNamespacer has methods to work with PersistentVolumeClaim resources in a namespace diff --git a/pkg/client/persistentvolumeclaim_test.go b/pkg/client/persistentvolumeclaim_test.go index a91149b031..2078cf988e 100644 --- a/pkg/client/persistentvolumeclaim_test.go +++ b/pkg/client/persistentvolumeclaim_test.go @@ -20,11 +20,11 @@ import ( "net/url" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" ) func getPersistentVolumeClaimsResoureName() string { diff --git a/pkg/client/persistentvolumes.go b/pkg/client/persistentvolumes.go index 3ef6aeda73..af493ad76e 100644 --- a/pkg/client/persistentvolumes.go +++ b/pkg/client/persistentvolumes.go @@ -19,10 +19,10 @@ package client import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) type PersistentVolumesInterface interface { diff --git a/pkg/client/pod_templates.go b/pkg/client/pod_templates.go index 585dedb218..aa8edcfeae 100644 --- a/pkg/client/pod_templates.go +++ b/pkg/client/pod_templates.go @@ -17,10 +17,10 @@ limitations under the License. package client import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // PodTemplatesNamespacer has methods to work with PodTemplate resources in a namespace diff --git a/pkg/client/pod_templates_test.go b/pkg/client/pod_templates_test.go index 012c8e8525..8b262cea1b 100644 --- a/pkg/client/pod_templates_test.go +++ b/pkg/client/pod_templates_test.go @@ -20,10 +20,10 @@ import ( "net/url" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" ) func getPodTemplatesResoureName() string { diff --git a/pkg/client/pods.go b/pkg/client/pods.go index 84bae5c2c2..51ea05dec8 100644 --- a/pkg/client/pods.go +++ b/pkg/client/pods.go @@ -17,10 +17,10 @@ limitations under the License. package client import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // PodsNamespacer has methods to work with Pod resources in a namespace diff --git a/pkg/client/pods_test.go b/pkg/client/pods_test.go index 18a0021287..818397e71c 100644 --- a/pkg/client/pods_test.go +++ b/pkg/client/pods_test.go @@ -20,10 +20,10 @@ import ( "net/url" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" ) func TestListEmptyPods(t *testing.T) { diff --git a/pkg/client/portforward/portforward.go b/pkg/client/portforward/portforward.go index 88d66384ee..057b4f979a 100644 --- a/pkg/client/portforward/portforward.go +++ b/pkg/client/portforward/portforward.go @@ -26,10 +26,10 @@ import ( "strconv" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream/spdy" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/util/httpstream" + "k8s.io/kubernetes/pkg/util/httpstream/spdy" "github.com/golang/glog" ) diff --git a/pkg/client/portforward/portforward_test.go b/pkg/client/portforward/portforward_test.go index ab6e8f1ab4..06886ca438 100644 --- a/pkg/client/portforward/portforward_test.go +++ b/pkg/client/portforward/portforward_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/util/httpstream" ) func TestParsePortsAndNew(t *testing.T) { diff --git a/pkg/client/record/event.go b/pkg/client/record/event.go index d44970c752..bc7071eb64 100644 --- a/pkg/client/record/event.go +++ b/pkg/client/record/event.go @@ -21,12 +21,12 @@ import ( "math/rand" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" "github.com/golang/glog" ) diff --git a/pkg/client/record/event_test.go b/pkg/client/record/event_test.go index 1f5dd71457..13054f2ffc 100644 --- a/pkg/client/record/event_test.go +++ b/pkg/client/record/event_test.go @@ -23,11 +23,11 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) func init() { diff --git a/pkg/client/record/events_cache.go b/pkg/client/record/events_cache.go index ec60ccfe34..bcf3987245 100644 --- a/pkg/client/record/events_cache.go +++ b/pkg/client/record/events_cache.go @@ -19,8 +19,8 @@ package record import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" "github.com/golang/groupcache/lru" ) diff --git a/pkg/client/record/events_cache_test.go b/pkg/client/record/events_cache_test.go index de1e37b092..282122029b 100644 --- a/pkg/client/record/events_cache_test.go +++ b/pkg/client/record/events_cache_test.go @@ -19,8 +19,8 @@ package record import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" ) func TestAddOrUpdateEventNoExisting(t *testing.T) { diff --git a/pkg/client/record/fake.go b/pkg/client/record/fake.go index fcc3b8adea..25d0ab3e63 100644 --- a/pkg/client/record/fake.go +++ b/pkg/client/record/fake.go @@ -17,8 +17,8 @@ limitations under the License. package record import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) // FakeRecorder is used as a fake during tests. diff --git a/pkg/client/remotecommand/remotecommand.go b/pkg/client/remotecommand/remotecommand.go index 666b706514..639bd0131f 100644 --- a/pkg/client/remotecommand/remotecommand.go +++ b/pkg/client/remotecommand/remotecommand.go @@ -22,12 +22,12 @@ import ( "io/ioutil" "net/http" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion/queryparams" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream/spdy" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/conversion/queryparams" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/httpstream" + "k8s.io/kubernetes/pkg/util/httpstream/spdy" "github.com/golang/glog" ) diff --git a/pkg/client/remotecommand/remotecommand_test.go b/pkg/client/remotecommand/remotecommand_test.go index 9e247fe37d..90f091e144 100644 --- a/pkg/client/remotecommand/remotecommand_test.go +++ b/pkg/client/remotecommand/remotecommand_test.go @@ -26,10 +26,10 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream/spdy" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/util/httpstream" + "k8s.io/kubernetes/pkg/util/httpstream/spdy" ) func fakeExecServer(t *testing.T, i int, stdinData, stdoutData, stderrData, errorData string, tty bool) http.HandlerFunc { diff --git a/pkg/client/replication_controllers.go b/pkg/client/replication_controllers.go index f29086a9e8..a742c1239e 100644 --- a/pkg/client/replication_controllers.go +++ b/pkg/client/replication_controllers.go @@ -17,10 +17,10 @@ limitations under the License. package client import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // ReplicationControllersNamespacer has methods to work with ReplicationController resources in a namespace diff --git a/pkg/client/replication_controllers_test.go b/pkg/client/replication_controllers_test.go index 93e78e1716..bc37244379 100644 --- a/pkg/client/replication_controllers_test.go +++ b/pkg/client/replication_controllers_test.go @@ -19,9 +19,9 @@ package client import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/labels" ) func getRCResourceName() string { diff --git a/pkg/client/request.go b/pkg/client/request.go index dea79c06fb..ff6068f6ec 100644 --- a/pkg/client/request.go +++ b/pkg/client/request.go @@ -30,16 +30,16 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/metrics" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" - watchjson "github.com/GoogleCloudPlatform/kubernetes/pkg/watch/json" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client/metrics" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/httpstream" + "k8s.io/kubernetes/pkg/watch" + watchjson "k8s.io/kubernetes/pkg/watch/json" "github.com/golang/glog" ) diff --git a/pkg/client/request_test.go b/pkg/client/request_test.go index fa1f459818..73fd887fde 100644 --- a/pkg/client/request_test.go +++ b/pkg/client/request_test.go @@ -32,16 +32,16 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" - watchjson "github.com/GoogleCloudPlatform/kubernetes/pkg/watch/json" + "k8s.io/kubernetes/pkg/api" + apierrors "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/httpstream" + "k8s.io/kubernetes/pkg/watch" + watchjson "k8s.io/kubernetes/pkg/watch/json" ) func TestRequestWithErrorWontChange(t *testing.T) { diff --git a/pkg/client/resource_quotas.go b/pkg/client/resource_quotas.go index 7a4fb9e8a4..af3b9e9276 100644 --- a/pkg/client/resource_quotas.go +++ b/pkg/client/resource_quotas.go @@ -17,10 +17,10 @@ limitations under the License. package client import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // ResourceQuotasNamespacer has methods to work with ResourceQuota resources in a namespace diff --git a/pkg/client/resource_quotas_test.go b/pkg/client/resource_quotas_test.go index c27108c5f4..63fc2e1af7 100644 --- a/pkg/client/resource_quotas_test.go +++ b/pkg/client/resource_quotas_test.go @@ -20,11 +20,11 @@ import ( "net/url" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" ) func getResourceQuotasResoureName() string { diff --git a/pkg/client/restclient.go b/pkg/client/restclient.go index 2433b5c331..a31369a9d1 100644 --- a/pkg/client/restclient.go +++ b/pkg/client/restclient.go @@ -21,9 +21,9 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) // RESTClient imposes common Kubernetes API conventions on a set of resource paths. diff --git a/pkg/client/restclient_test.go b/pkg/client/restclient_test.go index f03523dc49..fb7cfd694d 100644 --- a/pkg/client/restclient_test.go +++ b/pkg/client/restclient_test.go @@ -22,11 +22,11 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) func TestSetsCodec(t *testing.T) { diff --git a/pkg/client/secrets.go b/pkg/client/secrets.go index 3a671f89b4..cbf7e58e9a 100644 --- a/pkg/client/secrets.go +++ b/pkg/client/secrets.go @@ -17,10 +17,10 @@ limitations under the License. package client import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) type SecretsNamespacer interface { diff --git a/pkg/client/service_accounts.go b/pkg/client/service_accounts.go index 96a98c4ec7..033b53b487 100644 --- a/pkg/client/service_accounts.go +++ b/pkg/client/service_accounts.go @@ -17,10 +17,10 @@ limitations under the License. package client import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) type ServiceAccountsNamespacer interface { diff --git a/pkg/client/services.go b/pkg/client/services.go index 6990189307..5e30ead6c9 100644 --- a/pkg/client/services.go +++ b/pkg/client/services.go @@ -17,10 +17,10 @@ limitations under the License. package client import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // ServicesNamespacer has methods to work with Service resources in a namespace diff --git a/pkg/client/services_test.go b/pkg/client/services_test.go index ac5b6dfb69..6848478c31 100644 --- a/pkg/client/services_test.go +++ b/pkg/client/services_test.go @@ -20,9 +20,9 @@ import ( "net/url" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/labels" ) func TestListServices(t *testing.T) { diff --git a/pkg/client/testclient/actions.go b/pkg/client/testclient/actions.go index 509fdcc073..838dc0db98 100644 --- a/pkg/client/testclient/actions.go +++ b/pkg/client/testclient/actions.go @@ -19,9 +19,9 @@ package testclient import ( "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" ) func NewRootGetAction(resource, name string) GetActionImpl { diff --git a/pkg/client/testclient/fake_componentstatuses.go b/pkg/client/testclient/fake_componentstatuses.go index 0fd0c344a4..d259948ab8 100644 --- a/pkg/client/testclient/fake_componentstatuses.go +++ b/pkg/client/testclient/fake_componentstatuses.go @@ -17,9 +17,9 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" ) // Fake implements ComponentStatusInterface. diff --git a/pkg/client/testclient/fake_endpoints.go b/pkg/client/testclient/fake_endpoints.go index 0d5ead739b..65b554016b 100644 --- a/pkg/client/testclient/fake_endpoints.go +++ b/pkg/client/testclient/fake_endpoints.go @@ -17,10 +17,10 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // FakeEndpoints implements EndpointInterface. Meant to be embedded into a struct to get a default diff --git a/pkg/client/testclient/fake_events.go b/pkg/client/testclient/fake_events.go index edfe0a158a..5b5b9bf07f 100644 --- a/pkg/client/testclient/fake_events.go +++ b/pkg/client/testclient/fake_events.go @@ -17,11 +17,11 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) // FakeEvents implements EventInterface. Meant to be embedded into a struct to get a default diff --git a/pkg/client/testclient/fake_limit_ranges.go b/pkg/client/testclient/fake_limit_ranges.go index 956da026ab..4045daef4d 100644 --- a/pkg/client/testclient/fake_limit_ranges.go +++ b/pkg/client/testclient/fake_limit_ranges.go @@ -17,10 +17,10 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // FakeLimitRanges implements PodsInterface. Meant to be embedded into a struct to get a default diff --git a/pkg/client/testclient/fake_namespaces.go b/pkg/client/testclient/fake_namespaces.go index b313bbfda1..aef0dd3448 100644 --- a/pkg/client/testclient/fake_namespaces.go +++ b/pkg/client/testclient/fake_namespaces.go @@ -17,10 +17,10 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // FakeNamespaces implements NamespacesInterface. Meant to be embedded into a struct to get a default diff --git a/pkg/client/testclient/fake_nodes.go b/pkg/client/testclient/fake_nodes.go index 2a25aef4eb..fdbe218ec5 100644 --- a/pkg/client/testclient/fake_nodes.go +++ b/pkg/client/testclient/fake_nodes.go @@ -17,10 +17,10 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // FakeNodes implements MinionInterface. Meant to be embedded into a struct to get a default diff --git a/pkg/client/testclient/fake_persistent_volume_claims.go b/pkg/client/testclient/fake_persistent_volume_claims.go index 2f40b23451..c97c73539e 100644 --- a/pkg/client/testclient/fake_persistent_volume_claims.go +++ b/pkg/client/testclient/fake_persistent_volume_claims.go @@ -17,10 +17,10 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) type FakePersistentVolumeClaims struct { diff --git a/pkg/client/testclient/fake_persistent_volumes.go b/pkg/client/testclient/fake_persistent_volumes.go index ad395a4a6a..262fdbbf35 100644 --- a/pkg/client/testclient/fake_persistent_volumes.go +++ b/pkg/client/testclient/fake_persistent_volumes.go @@ -17,10 +17,10 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) type FakePersistentVolumes struct { diff --git a/pkg/client/testclient/fake_pod_templates.go b/pkg/client/testclient/fake_pod_templates.go index c15a349622..8c70e37cc3 100644 --- a/pkg/client/testclient/fake_pod_templates.go +++ b/pkg/client/testclient/fake_pod_templates.go @@ -17,10 +17,10 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // FakePodTemplates implements PodTemplatesInterface. Meant to be embedded into a struct to get a default diff --git a/pkg/client/testclient/fake_pods.go b/pkg/client/testclient/fake_pods.go index 25e3bff096..7e72e50b81 100644 --- a/pkg/client/testclient/fake_pods.go +++ b/pkg/client/testclient/fake_pods.go @@ -17,10 +17,10 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // FakePods implements PodsInterface. Meant to be embedded into a struct to get a default diff --git a/pkg/client/testclient/fake_replication_controllers.go b/pkg/client/testclient/fake_replication_controllers.go index 55a92d718f..b5f365c4d1 100644 --- a/pkg/client/testclient/fake_replication_controllers.go +++ b/pkg/client/testclient/fake_replication_controllers.go @@ -17,10 +17,10 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // FakeReplicationControllers implements ReplicationControllerInterface. Meant to be embedded into a struct to get a default diff --git a/pkg/client/testclient/fake_resource_quotas.go b/pkg/client/testclient/fake_resource_quotas.go index b82f466c8f..f1386c714d 100644 --- a/pkg/client/testclient/fake_resource_quotas.go +++ b/pkg/client/testclient/fake_resource_quotas.go @@ -17,10 +17,10 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // FakeResourceQuotas implements ResourceQuotaInterface. Meant to be embedded into a struct to get a default diff --git a/pkg/client/testclient/fake_secrets.go b/pkg/client/testclient/fake_secrets.go index ea2251874b..73d1c3aba2 100644 --- a/pkg/client/testclient/fake_secrets.go +++ b/pkg/client/testclient/fake_secrets.go @@ -17,10 +17,10 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Fake implements SecretInterface. Meant to be embedded into a struct to get a default diff --git a/pkg/client/testclient/fake_service_accounts.go b/pkg/client/testclient/fake_service_accounts.go index 43e558c618..9510c1bdd1 100644 --- a/pkg/client/testclient/fake_service_accounts.go +++ b/pkg/client/testclient/fake_service_accounts.go @@ -17,10 +17,10 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // FakeServiceAccounts implements ServiceAccountsInterface. Meant to be embedded into a struct to get a default diff --git a/pkg/client/testclient/fake_services.go b/pkg/client/testclient/fake_services.go index d6672a5180..5e137cf4e3 100644 --- a/pkg/client/testclient/fake_services.go +++ b/pkg/client/testclient/fake_services.go @@ -17,10 +17,10 @@ limitations under the License. package testclient import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Fake implements ServiceInterface. Meant to be embedded into a struct to get a default diff --git a/pkg/client/testclient/fake_test.go b/pkg/client/testclient/fake_test.go index ea92add7a3..753a9431d5 100644 --- a/pkg/client/testclient/fake_test.go +++ b/pkg/client/testclient/fake_test.go @@ -19,7 +19,7 @@ package testclient import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client" ) // This test file just ensures that Fake and structs it is embedded in diff --git a/pkg/client/testclient/fixture.go b/pkg/client/testclient/fixture.go index 9b13ea9c8c..fa393222c2 100644 --- a/pkg/client/testclient/fixture.go +++ b/pkg/client/testclient/fixture.go @@ -22,11 +22,11 @@ import ( "reflect" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/yaml" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/yaml" ) // ObjectRetriever abstracts the implementation for retrieving or setting generic diff --git a/pkg/client/testclient/testclient.go b/pkg/client/testclient/testclient.go index ede02d8a98..6b630c5641 100644 --- a/pkg/client/testclient/testclient.go +++ b/pkg/client/testclient/testclient.go @@ -19,13 +19,13 @@ package testclient import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/registered" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/registered" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/version" + "k8s.io/kubernetes/pkg/watch" ) // NewSimpleFake returns a client that will respond with the provided objects diff --git a/pkg/client/testclient/testclient_test.go b/pkg/client/testclient/testclient_test.go index feff78d3ad..54b949d880 100644 --- a/pkg/client/testclient/testclient_test.go +++ b/pkg/client/testclient/testclient_test.go @@ -19,11 +19,11 @@ package testclient import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" ) func TestNewClient(t *testing.T) { diff --git a/pkg/clientauth/clientauth.go b/pkg/clientauth/clientauth.go index 980aad1a58..7fb683f661 100644 --- a/pkg/clientauth/clientauth.go +++ b/pkg/clientauth/clientauth.go @@ -68,7 +68,7 @@ import ( "io/ioutil" "os" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client" ) // Info holds Kubernetes API authorization config. It is intended diff --git a/pkg/clientauth/clientauth_test.go b/pkg/clientauth/clientauth_test.go index 5c1d493b09..d0047e81bd 100644 --- a/pkg/clientauth/clientauth_test.go +++ b/pkg/clientauth/clientauth_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/clientauth" + "k8s.io/kubernetes/pkg/clientauth" ) func TestLoadFromFile(t *testing.T) { diff --git a/pkg/cloudprovider/aws/aws.go b/pkg/cloudprovider/aws/aws.go index b738a3530a..a521e6cfc1 100644 --- a/pkg/cloudprovider/aws/aws.go +++ b/pkg/cloudprovider/aws/aws.go @@ -38,9 +38,9 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/elb" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/cloudprovider" "github.com/golang/glog" ) diff --git a/pkg/cloudprovider/aws/aws_routes.go b/pkg/cloudprovider/aws/aws_routes.go index cca1eb0b85..c0156fd43f 100644 --- a/pkg/cloudprovider/aws/aws_routes.go +++ b/pkg/cloudprovider/aws/aws_routes.go @@ -18,7 +18,7 @@ package aws_cloud import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/cloudprovider" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" ) diff --git a/pkg/cloudprovider/aws/aws_test.go b/pkg/cloudprovider/aws/aws_test.go index c765ac1c69..c8c7a1676b 100644 --- a/pkg/cloudprovider/aws/aws_test.go +++ b/pkg/cloudprovider/aws/aws_test.go @@ -26,8 +26,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/elb" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/golang/glog" ) diff --git a/pkg/cloudprovider/cloud.go b/pkg/cloudprovider/cloud.go index 8c4faf5d76..ae67ad8fc5 100644 --- a/pkg/cloudprovider/cloud.go +++ b/pkg/cloudprovider/cloud.go @@ -22,7 +22,7 @@ import ( "net" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // Interface is an abstract, pluggable interface for cloud providers. diff --git a/pkg/cloudprovider/fake/fake.go b/pkg/cloudprovider/fake/fake.go index 29393b3467..6d699cd038 100644 --- a/pkg/cloudprovider/fake/fake.go +++ b/pkg/cloudprovider/fake/fake.go @@ -23,8 +23,8 @@ import ( "regexp" "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/cloudprovider" ) const ProviderName = "fake" diff --git a/pkg/cloudprovider/gce/gce.go b/pkg/cloudprovider/gce/gce.go index e746aa7f1a..475f1bddd0 100644 --- a/pkg/cloudprovider/gce/gce.go +++ b/pkg/cloudprovider/gce/gce.go @@ -27,11 +27,11 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" "code.google.com/p/gcfg" "github.com/golang/glog" diff --git a/pkg/cloudprovider/gce/token_source.go b/pkg/cloudprovider/gce/token_source.go index 01d194c9d9..4bf33246ca 100644 --- a/pkg/cloudprovider/gce/token_source.go +++ b/pkg/cloudprovider/gce/token_source.go @@ -21,7 +21,7 @@ import ( "net/http" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" "github.com/prometheus/client_golang/prometheus" "golang.org/x/oauth2" diff --git a/pkg/cloudprovider/mesos/client.go b/pkg/cloudprovider/mesos/client.go index 6fa8237372..860b2e15f4 100644 --- a/pkg/cloudprovider/mesos/client.go +++ b/pkg/cloudprovider/mesos/client.go @@ -26,8 +26,8 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" log "github.com/golang/glog" "github.com/mesos/mesos-go/detector" mesos "github.com/mesos/mesos-go/mesosproto" diff --git a/pkg/cloudprovider/mesos/mesos.go b/pkg/cloudprovider/mesos/mesos.go index 266fd80f98..da11153f77 100644 --- a/pkg/cloudprovider/mesos/mesos.go +++ b/pkg/cloudprovider/mesos/mesos.go @@ -23,8 +23,8 @@ import ( "net" "regexp" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/cloudprovider" log "github.com/golang/glog" "github.com/mesos/mesos-go/detector" "golang.org/x/net/context" diff --git a/pkg/cloudprovider/openstack/openstack.go b/pkg/cloudprovider/openstack/openstack.go index 4c4c07dfce..9f5f4d1d37 100644 --- a/pkg/cloudprovider/openstack/openstack.go +++ b/pkg/cloudprovider/openstack/openstack.go @@ -36,9 +36,9 @@ import ( "github.com/rackspace/gophercloud/openstack/networking/v2/extensions/lbaas/vips" "github.com/rackspace/gophercloud/pagination" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/cloudprovider" "github.com/golang/glog" ) diff --git a/pkg/cloudprovider/ovirt/ovirt.go b/pkg/cloudprovider/ovirt/ovirt.go index 6b4682411d..c94a6515f1 100644 --- a/pkg/cloudprovider/ovirt/ovirt.go +++ b/pkg/cloudprovider/ovirt/ovirt.go @@ -30,8 +30,8 @@ import ( "strings" "code.google.com/p/gcfg" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/cloudprovider" ) const ProviderName = "ovirt" diff --git a/pkg/cloudprovider/ovirt/ovirt_test.go b/pkg/cloudprovider/ovirt/ovirt_test.go index 3681b21280..d5d769c3a3 100644 --- a/pkg/cloudprovider/ovirt/ovirt_test.go +++ b/pkg/cloudprovider/ovirt/ovirt_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/cloudprovider" ) func TestOVirtCloudConfiguration(t *testing.T) { diff --git a/pkg/cloudprovider/rackspace/rackspace.go b/pkg/cloudprovider/rackspace/rackspace.go index e3fc2b4f3b..f05ecb03ba 100644 --- a/pkg/cloudprovider/rackspace/rackspace.go +++ b/pkg/cloudprovider/rackspace/rackspace.go @@ -32,9 +32,9 @@ import ( "github.com/rackspace/gophercloud/rackspace/compute/v2/flavors" "github.com/rackspace/gophercloud/rackspace/compute/v2/servers" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/cloudprovider" "github.com/golang/glog" ) diff --git a/pkg/cloudprovider/vagrant/vagrant.go b/pkg/cloudprovider/vagrant/vagrant.go index ed0bf2c91e..9233c7ab9b 100644 --- a/pkg/cloudprovider/vagrant/vagrant.go +++ b/pkg/cloudprovider/vagrant/vagrant.go @@ -27,8 +27,8 @@ import ( neturl "net/url" "sort" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/cloudprovider" ) const ProviderName = "vagrant" diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index cee971b28c..9e253c211f 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -20,15 +20,15 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/controller/framework" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" "github.com/golang/glog" "sync/atomic" ) diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index f51d23d553..dd6a1ee294 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -26,14 +26,14 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/securitycontext" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/securitycontext" + "k8s.io/kubernetes/pkg/util" ) // NewFakeControllerExpectationsLookup creates a fake store for PodExpectations. diff --git a/pkg/controller/endpoint/endpoints_controller.go b/pkg/controller/endpoint/endpoints_controller.go index f61066abbb..d4962cf1df 100644 --- a/pkg/controller/endpoint/endpoints_controller.go +++ b/pkg/controller/endpoint/endpoints_controller.go @@ -23,18 +23,18 @@ import ( "reflect" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/endpoints" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/workqueue" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/endpoints" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/controller/framework" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/workqueue" + "k8s.io/kubernetes/pkg/watch" "github.com/golang/glog" ) diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index 7400155756..d14907f4c0 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -22,14 +22,14 @@ import ( "net/http/httptest" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - endptspkg "github.com/GoogleCloudPlatform/kubernetes/pkg/api/endpoints" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + endptspkg "k8s.io/kubernetes/pkg/api/endpoints" + _ "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) func addPods(store cache.Store, namespace string, nPods int, nPorts int) { diff --git a/pkg/controller/framework/controller.go b/pkg/controller/framework/controller.go index 84d6b5ef09..bb839b3cd9 100644 --- a/pkg/controller/framework/controller.go +++ b/pkg/controller/framework/controller.go @@ -20,9 +20,9 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) // Config contains all the settings for a Controller. diff --git a/pkg/controller/framework/controller_test.go b/pkg/controller/framework/controller_test.go index 9f35c23304..1e3abaa22b 100644 --- a/pkg/controller/framework/controller_test.go +++ b/pkg/controller/framework/controller_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/controller/framework" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" "github.com/google/gofuzz" ) diff --git a/pkg/controller/framework/fake_controller_source.go b/pkg/controller/framework/fake_controller_source.go index dcbaff9cbf..1a71f07ae5 100644 --- a/pkg/controller/framework/fake_controller_source.go +++ b/pkg/controller/framework/fake_controller_source.go @@ -22,10 +22,10 @@ import ( "strconv" "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/watch" ) func NewFakeControllerSource() *FakeControllerSource { diff --git a/pkg/controller/framework/fake_controller_source_test.go b/pkg/controller/framework/fake_controller_source_test.go index c4fbf87f17..409b73c837 100644 --- a/pkg/controller/framework/fake_controller_source_test.go +++ b/pkg/controller/framework/fake_controller_source_test.go @@ -19,7 +19,7 @@ package framework import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) func TestRCNumber(t *testing.T) { diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index 9fe0f466c2..40f33e1c18 100644 --- a/pkg/controller/namespace/namespace_controller.go +++ b/pkg/controller/namespace/namespace_controller.go @@ -19,16 +19,16 @@ package namespacecontroller import ( "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/controller/framework" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" "github.com/golang/glog" ) diff --git a/pkg/controller/namespace/namespace_controller_test.go b/pkg/controller/namespace/namespace_controller_test.go index 36a74e08a9..fce7af85b3 100644 --- a/pkg/controller/namespace/namespace_controller_test.go +++ b/pkg/controller/namespace/namespace_controller_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/util" ) func TestFinalized(t *testing.T) { diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index bcd9737cf7..e6b72bf70c 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -22,14 +22,14 @@ import ( "net" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/controller/node/nodecontroller_test.go b/pkg/controller/node/nodecontroller_test.go index 6f8b911302..4648a3529e 100644 --- a/pkg/controller/node/nodecontroller_test.go +++ b/pkg/controller/node/nodecontroller_test.go @@ -24,15 +24,15 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + apierrors "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" ) const ( diff --git a/pkg/controller/node/podevictor.go b/pkg/controller/node/podevictor.go index 64bced4f49..1c66d0a211 100644 --- a/pkg/controller/node/podevictor.go +++ b/pkg/controller/node/podevictor.go @@ -19,7 +19,7 @@ package nodecontroller import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/controller/node/podevictor_test.go b/pkg/controller/node/podevictor_test.go index cc03e5afac..b7ae8ea3e8 100644 --- a/pkg/controller/node/podevictor_test.go +++ b/pkg/controller/node/podevictor_test.go @@ -19,7 +19,7 @@ package nodecontroller import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) func CheckQueueEq(lhs, rhs []string) bool { diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index a0d3d54e3a..4dafe4d9b9 100644 --- a/pkg/controller/replication/replication_controller.go +++ b/pkg/controller/replication/replication_controller.go @@ -22,18 +22,18 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/workqueue" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/controller" + "k8s.io/kubernetes/pkg/controller/framework" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/workqueue" + "k8s.io/kubernetes/pkg/watch" "github.com/golang/glog" ) diff --git a/pkg/controller/replication/replication_controller_test.go b/pkg/controller/replication/replication_controller_test.go index 68647af5a3..5a27aac8b6 100644 --- a/pkg/controller/replication/replication_controller_test.go +++ b/pkg/controller/replication/replication_controller_test.go @@ -25,18 +25,18 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/securitycontext" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/controller" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/securitycontext" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/watch" ) type FakePodControl struct { diff --git a/pkg/controller/replication/replication_controller_utils.go b/pkg/controller/replication/replication_controller_utils.go index 7639e174ea..45f50c34ac 100644 --- a/pkg/controller/replication/replication_controller_utils.go +++ b/pkg/controller/replication/replication_controller_utils.go @@ -17,8 +17,8 @@ limitations under the License. package replicationcontroller import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" "github.com/golang/glog" ) diff --git a/pkg/controller/resourcequota/resource_quota_controller.go b/pkg/controller/resourcequota/resource_quota_controller.go index 9a2311aed7..07880262f4 100644 --- a/pkg/controller/resourcequota/resource_quota_controller.go +++ b/pkg/controller/resourcequota/resource_quota_controller.go @@ -19,12 +19,12 @@ package resourcequotacontroller import ( "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/controller/resourcequota/resource_quota_controller_test.go b/pkg/controller/resourcequota/resource_quota_controller_test.go index 95049d0f88..a6575de8b4 100644 --- a/pkg/controller/resourcequota/resource_quota_controller_test.go +++ b/pkg/controller/resourcequota/resource_quota_controller_test.go @@ -19,10 +19,10 @@ package resourcequotacontroller import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/util" ) func getResourceRequirements(cpu, memory string) api.ResourceRequirements { diff --git a/pkg/controller/route/routecontroller.go b/pkg/controller/route/routecontroller.go index 2f461e9c8c..d666928021 100644 --- a/pkg/controller/route/routecontroller.go +++ b/pkg/controller/route/routecontroller.go @@ -21,12 +21,12 @@ import ( "net" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/controller/route/routecontroller_test.go b/pkg/controller/route/routecontroller_test.go index 5f337cf2a5..1811363927 100644 --- a/pkg/controller/route/routecontroller_test.go +++ b/pkg/controller/route/routecontroller_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/fake" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/cloudprovider/fake" ) func TestIsResponsibleForRoute(t *testing.T) { diff --git a/pkg/controller/service/servicecontroller.go b/pkg/controller/service/servicecontroller.go index 88efcb36c7..9a218b3013 100644 --- a/pkg/controller/service/servicecontroller.go +++ b/pkg/controller/service/servicecontroller.go @@ -23,15 +23,15 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/controller/service/servicecontroller_test.go b/pkg/controller/service/servicecontroller_test.go index 60996398d1..854a770c06 100644 --- a/pkg/controller/service/servicecontroller_test.go +++ b/pkg/controller/service/servicecontroller_test.go @@ -20,10 +20,10 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - fake_cloud "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/fake" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/testclient" + fake_cloud "k8s.io/kubernetes/pkg/cloudprovider/fake" + "k8s.io/kubernetes/pkg/types" ) const region = "us-central" diff --git a/pkg/controller/serviceaccount/jwt.go b/pkg/controller/serviceaccount/jwt.go index 4e447089c2..bd0b54e935 100644 --- a/pkg/controller/serviceaccount/jwt.go +++ b/pkg/controller/serviceaccount/jwt.go @@ -23,9 +23,9 @@ import ( "fmt" "io/ioutil" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/auth/authenticator" + "k8s.io/kubernetes/pkg/auth/user" jwt "github.com/dgrijalva/jwt-go" "github.com/golang/glog" diff --git a/pkg/controller/serviceaccount/jwt_test.go b/pkg/controller/serviceaccount/jwt_test.go index cf41039de6..8ff21d8968 100644 --- a/pkg/controller/serviceaccount/jwt_test.go +++ b/pkg/controller/serviceaccount/jwt_test.go @@ -23,9 +23,9 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/testclient" "github.com/dgrijalva/jwt-go" ) diff --git a/pkg/controller/serviceaccount/serviceaccounts_controller.go b/pkg/controller/serviceaccount/serviceaccounts_controller.go index 3da154c4a4..31e5428f11 100644 --- a/pkg/controller/serviceaccount/serviceaccounts_controller.go +++ b/pkg/controller/serviceaccount/serviceaccounts_controller.go @@ -20,16 +20,16 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/controller/framework" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" "github.com/golang/glog" ) diff --git a/pkg/controller/serviceaccount/serviceaccounts_controller_test.go b/pkg/controller/serviceaccount/serviceaccounts_controller_test.go index 49a8a1495b..5bb771c002 100644 --- a/pkg/controller/serviceaccount/serviceaccounts_controller_test.go +++ b/pkg/controller/serviceaccount/serviceaccounts_controller_test.go @@ -21,11 +21,11 @@ import ( "net/http/httptest" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) type serverResponse struct { diff --git a/pkg/controller/serviceaccount/tokengetter.go b/pkg/controller/serviceaccount/tokengetter.go index 458f9ab6c4..4909030e47 100644 --- a/pkg/controller/serviceaccount/tokengetter.go +++ b/pkg/controller/serviceaccount/tokengetter.go @@ -17,13 +17,13 @@ limitations under the License. package serviceaccount import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/secret" - secretetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/secret/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/serviceaccount" - serviceaccountetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/serviceaccount/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/registry/secret" + secretetcd "k8s.io/kubernetes/pkg/registry/secret/etcd" + "k8s.io/kubernetes/pkg/registry/serviceaccount" + serviceaccountetcd "k8s.io/kubernetes/pkg/registry/serviceaccount/etcd" + "k8s.io/kubernetes/pkg/storage" ) // ServiceAccountTokenGetter defines functions to retrieve a named service account and secret diff --git a/pkg/controller/serviceaccount/tokens_controller.go b/pkg/controller/serviceaccount/tokens_controller.go index a680f38e64..de5918131a 100644 --- a/pkg/controller/serviceaccount/tokens_controller.go +++ b/pkg/controller/serviceaccount/tokens_controller.go @@ -21,17 +21,17 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/secret" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + apierrors "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/controller/framework" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/secret" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" "github.com/golang/glog" ) diff --git a/pkg/controller/serviceaccount/tokens_controller_test.go b/pkg/controller/serviceaccount/tokens_controller_test.go index d7fb3c3bb6..bbf8155e77 100644 --- a/pkg/controller/serviceaccount/tokens_controller_test.go +++ b/pkg/controller/serviceaccount/tokens_controller_test.go @@ -20,10 +20,10 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - utilrand "github.com/GoogleCloudPlatform/kubernetes/pkg/util/rand" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/runtime" + utilrand "k8s.io/kubernetes/pkg/util/rand" ) type testGenerator struct { diff --git a/pkg/controller/serviceaccount/util.go b/pkg/controller/serviceaccount/util.go index 988af22bb6..6f7e3e7505 100644 --- a/pkg/controller/serviceaccount/util.go +++ b/pkg/controller/serviceaccount/util.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/auth/user" ) const ( diff --git a/pkg/conversion/deep_equal.go b/pkg/conversion/deep_equal.go index 5fc542c5f0..7c3ed7cda1 100644 --- a/pkg/conversion/deep_equal.go +++ b/pkg/conversion/deep_equal.go @@ -17,7 +17,7 @@ limitations under the License. package conversion import ( - "github.com/GoogleCloudPlatform/kubernetes/third_party/forked/reflect" + "k8s.io/kubernetes/third_party/forked/reflect" ) // The code for this type must be located in third_party, since it forks from diff --git a/pkg/conversion/queryparams/convert.go b/pkg/conversion/queryparams/convert.go index 943eeab4a4..a9ef5b9796 100644 --- a/pkg/conversion/queryparams/convert.go +++ b/pkg/conversion/queryparams/convert.go @@ -22,7 +22,7 @@ import ( "reflect" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" ) func jsonTag(field reflect.StructField) (string, bool) { diff --git a/pkg/conversion/queryparams/convert_test.go b/pkg/conversion/queryparams/convert_test.go index 2a124482c0..88390a5dcd 100644 --- a/pkg/conversion/queryparams/convert_test.go +++ b/pkg/conversion/queryparams/convert_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" ) type namedString string diff --git a/pkg/conversion/scheme_test.go b/pkg/conversion/scheme_test.go index dec6805bd6..9a94c6f5b3 100644 --- a/pkg/conversion/scheme_test.go +++ b/pkg/conversion/scheme_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" "github.com/ghodss/yaml" "github.com/google/gofuzz" diff --git a/pkg/credentialprovider/gcp/jwt.go b/pkg/credentialprovider/gcp/jwt.go index 470cb24700..dfa88f6c69 100644 --- a/pkg/credentialprovider/gcp/jwt.go +++ b/pkg/credentialprovider/gcp/jwt.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/credentialprovider" + "k8s.io/kubernetes/pkg/credentialprovider" "github.com/golang/glog" "golang.org/x/oauth2" "golang.org/x/oauth2/google" diff --git a/pkg/credentialprovider/gcp/jwt_test.go b/pkg/credentialprovider/gcp/jwt_test.go index a99a16f762..4066d02af9 100644 --- a/pkg/credentialprovider/gcp/jwt_test.go +++ b/pkg/credentialprovider/gcp/jwt_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/credentialprovider" + "k8s.io/kubernetes/pkg/credentialprovider" ) const email = "foo@bar.com" diff --git a/pkg/credentialprovider/gcp/metadata.go b/pkg/credentialprovider/gcp/metadata.go index ad24921dd9..146f1931b6 100644 --- a/pkg/credentialprovider/gcp/metadata.go +++ b/pkg/credentialprovider/gcp/metadata.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/credentialprovider" + "k8s.io/kubernetes/pkg/credentialprovider" "github.com/golang/glog" ) diff --git a/pkg/credentialprovider/gcp/metadata_test.go b/pkg/credentialprovider/gcp/metadata_test.go index 5c41315bdc..0187700e1c 100644 --- a/pkg/credentialprovider/gcp/metadata_test.go +++ b/pkg/credentialprovider/gcp/metadata_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/credentialprovider" + "k8s.io/kubernetes/pkg/credentialprovider" ) func TestDockerKeyringFromGoogleDockerConfigMetadata(t *testing.T) { diff --git a/pkg/credentialprovider/keyring.go b/pkg/credentialprovider/keyring.go index 5ca9c55cf1..87a8c862e7 100644 --- a/pkg/credentialprovider/keyring.go +++ b/pkg/credentialprovider/keyring.go @@ -27,8 +27,8 @@ import ( docker "github.com/fsouza/go-dockerclient" "github.com/golang/glog" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" ) // DockerKeyring tracks a set of docker registry credentials, maintaining a diff --git a/pkg/expapi/latest/latest.go b/pkg/expapi/latest/latest.go index 628b84c00a..4470465e84 100644 --- a/pkg/expapi/latest/latest.go +++ b/pkg/expapi/latest/latest.go @@ -20,13 +20,13 @@ import ( "fmt" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/registered" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/expapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/expapi/v1" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/registered" + _ "k8s.io/kubernetes/pkg/expapi" + "k8s.io/kubernetes/pkg/expapi/v1" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) var ( @@ -39,7 +39,7 @@ var ( RESTMapper meta.RESTMapper ) -const importPrefix = "github.com/GoogleCloudPlatform/kubernetes/pkg/expapi" +const importPrefix = "k8s.io/kubernetes/pkg/expapi" func init() { Version = registered.RegisteredVersions[0] diff --git a/pkg/expapi/v1/register.go b/pkg/expapi/v1/register.go index c3ab661be2..aaa8d4c060 100644 --- a/pkg/expapi/v1/register.go +++ b/pkg/expapi/v1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" ) var Codec = runtime.CodecFor(api.Scheme, "v1") diff --git a/pkg/fieldpath/fieldpath.go b/pkg/fieldpath/fieldpath.go index 36b0eed1d5..d6b9a27a7a 100644 --- a/pkg/fieldpath/fieldpath.go +++ b/pkg/fieldpath/fieldpath.go @@ -19,7 +19,7 @@ package fieldpath import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/meta" ) // ExtractFieldPathAsString extracts the field from the given object diff --git a/pkg/fieldpath/fieldpath_test.go b/pkg/fieldpath/fieldpath_test.go index 9949d9c7a9..2df99e1c38 100644 --- a/pkg/fieldpath/fieldpath_test.go +++ b/pkg/fieldpath/fieldpath_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) func TestExtractFieldPathAsString(t *testing.T) { diff --git a/pkg/kubectl/bash_comp_utils.go b/pkg/kubectl/bash_comp_utils.go index dcd1b85b38..c3b31a4268 100644 --- a/pkg/kubectl/bash_comp_utils.go +++ b/pkg/kubectl/bash_comp_utils.go @@ -19,7 +19,7 @@ limitations under the License. package kubectl import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/pkg/kubectl/cmd/annotation.go b/pkg/kubectl/cmd/annotation.go index f988a06a41..63c8bd37fe 100644 --- a/pkg/kubectl/cmd/annotation.go +++ b/pkg/kubectl/cmd/annotation.go @@ -22,10 +22,10 @@ import ( "io" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/runtime" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/annotation_test.go b/pkg/kubectl/cmd/annotation_test.go index 5b3718e689..9572823842 100644 --- a/pkg/kubectl/cmd/annotation_test.go +++ b/pkg/kubectl/cmd/annotation_test.go @@ -23,10 +23,10 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/runtime" ) func TestValidateAnnotationOverwrites(t *testing.T) { diff --git a/pkg/kubectl/cmd/apiversions.go b/pkg/kubectl/cmd/apiversions.go index b9f08a3138..ba21309e02 100644 --- a/pkg/kubectl/cmd/apiversions.go +++ b/pkg/kubectl/cmd/apiversions.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" ) func NewCmdApiVersions(f *cmdutil.Factory, out io.Writer) *cobra.Command { diff --git a/pkg/kubectl/cmd/attach.go b/pkg/kubectl/cmd/attach.go index 17e9e50290..ef60fcfcd1 100644 --- a/pkg/kubectl/cmd/attach.go +++ b/pkg/kubectl/cmd/attach.go @@ -23,10 +23,10 @@ import ( "os/signal" "syscall" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/remotecommand" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/remotecommand" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "github.com/docker/docker/pkg/term" "github.com/golang/glog" "github.com/spf13/cobra" diff --git a/pkg/kubectl/cmd/attach_test.go b/pkg/kubectl/cmd/attach_test.go index ab2f610ca4..2ba468a580 100644 --- a/pkg/kubectl/cmd/attach_test.go +++ b/pkg/kubectl/cmd/attach_test.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" ) type fakeRemoteAttach struct { diff --git a/pkg/kubectl/cmd/clusterinfo.go b/pkg/kubectl/cmd/clusterinfo.go index dd10f479d6..2141e1b2bc 100644 --- a/pkg/kubectl/cmd/clusterinfo.go +++ b/pkg/kubectl/cmd/clusterinfo.go @@ -22,9 +22,9 @@ import ( "os" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/api" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" "github.com/daviddengcn/go-colortext" "github.com/spf13/cobra" diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index 92e793af1c..1c3579ef9a 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -19,9 +19,9 @@ package cmd import ( "io" - cmdconfig "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/config" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + cmdconfig "k8s.io/kubernetes/pkg/kubectl/cmd/config" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" "github.com/spf13/cobra" diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go index a20a119e63..2823337e7c 100644 --- a/pkg/kubectl/cmd/cmd_test.go +++ b/pkg/kubectl/cmd/cmd_test.go @@ -27,17 +27,17 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) type internalType struct { diff --git a/pkg/kubectl/cmd/config/config.go b/pkg/kubectl/cmd/config/config.go index 9876f48dad..e775a3e44a 100644 --- a/pkg/kubectl/cmd/config/config.go +++ b/pkg/kubectl/cmd/config/config.go @@ -28,8 +28,8 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/client/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" ) type PathOptions struct { diff --git a/pkg/kubectl/cmd/config/config_test.go b/pkg/kubectl/cmd/config/config_test.go index 5e25b3e53c..18d701b9ae 100644 --- a/pkg/kubectl/cmd/config/config_test.go +++ b/pkg/kubectl/cmd/config/config_test.go @@ -26,11 +26,11 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/util" ) func newRedFederalCowHammerConfig() clientcmdapi.Config { diff --git a/pkg/kubectl/cmd/config/create_authinfo.go b/pkg/kubectl/cmd/config/create_authinfo.go index 8d4811a9ff..b27425c499 100644 --- a/pkg/kubectl/cmd/config/create_authinfo.go +++ b/pkg/kubectl/cmd/config/create_authinfo.go @@ -26,9 +26,9 @@ import ( "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/client/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/util" ) type createAuthInfoOptions struct { diff --git a/pkg/kubectl/cmd/config/create_cluster.go b/pkg/kubectl/cmd/config/create_cluster.go index 063bb2c98b..976c8b8524 100644 --- a/pkg/kubectl/cmd/config/create_cluster.go +++ b/pkg/kubectl/cmd/config/create_cluster.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/client/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/util" ) type createClusterOptions struct { diff --git a/pkg/kubectl/cmd/config/create_context.go b/pkg/kubectl/cmd/config/create_context.go index fe7874f120..71194018d5 100644 --- a/pkg/kubectl/cmd/config/create_context.go +++ b/pkg/kubectl/cmd/config/create_context.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/client/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/util" ) type createContextOptions struct { diff --git a/pkg/kubectl/cmd/config/navigation_step_parser.go b/pkg/kubectl/cmd/config/navigation_step_parser.go index 1e0bca9ed5..c50625a1cb 100644 --- a/pkg/kubectl/cmd/config/navigation_step_parser.go +++ b/pkg/kubectl/cmd/config/navigation_step_parser.go @@ -21,8 +21,8 @@ import ( "reflect" "strings" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/util" ) type navigationSteps struct { diff --git a/pkg/kubectl/cmd/config/navigation_step_parser_test.go b/pkg/kubectl/cmd/config/navigation_step_parser_test.go index 4e4a11b0e7..a855fb31e9 100644 --- a/pkg/kubectl/cmd/config/navigation_step_parser_test.go +++ b/pkg/kubectl/cmd/config/navigation_step_parser_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/util" ) type stepParserTest struct { diff --git a/pkg/kubectl/cmd/config/use_context.go b/pkg/kubectl/cmd/config/use_context.go index 409f64daf1..6321fc558b 100644 --- a/pkg/kubectl/cmd/config/use_context.go +++ b/pkg/kubectl/cmd/config/use_context.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" ) type useContextOptions struct { diff --git a/pkg/kubectl/cmd/config/view.go b/pkg/kubectl/cmd/config/view.go index 0f3e3af8ff..d3cdb64945 100644 --- a/pkg/kubectl/cmd/config/view.go +++ b/pkg/kubectl/cmd/config/view.go @@ -23,12 +23,12 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/client/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/client/clientcmd/api/latest" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/util" ) type ViewOptions struct { diff --git a/pkg/kubectl/cmd/create.go b/pkg/kubectl/cmd/create.go index ab19e70012..4eb096bb74 100644 --- a/pkg/kubectl/cmd/create.go +++ b/pkg/kubectl/cmd/create.go @@ -23,12 +23,12 @@ import ( "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) const ( diff --git a/pkg/kubectl/cmd/create_test.go b/pkg/kubectl/cmd/create_test.go index 4532835275..bf1b0d81af 100644 --- a/pkg/kubectl/cmd/create_test.go +++ b/pkg/kubectl/cmd/create_test.go @@ -21,9 +21,9 @@ import ( "net/http" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/runtime" ) func TestExtraArgsFail(t *testing.T) { diff --git a/pkg/kubectl/cmd/delete.go b/pkg/kubectl/cmd/delete.go index cf9893634e..5bdef1a7bc 100644 --- a/pkg/kubectl/cmd/delete.go +++ b/pkg/kubectl/cmd/delete.go @@ -23,13 +23,13 @@ import ( "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/util" ) const ( diff --git a/pkg/kubectl/cmd/delete_test.go b/pkg/kubectl/cmd/delete_test.go index d4467c713b..60838984bc 100644 --- a/pkg/kubectl/cmd/delete_test.go +++ b/pkg/kubectl/cmd/delete_test.go @@ -22,11 +22,11 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/util" ) func TestDeleteObjectByTuple(t *testing.T) { diff --git a/pkg/kubectl/cmd/describe.go b/pkg/kubectl/cmd/describe.go index 98cd0072fc..61e1ff914f 100644 --- a/pkg/kubectl/cmd/describe.go +++ b/pkg/kubectl/cmd/describe.go @@ -23,12 +23,12 @@ import ( "github.com/spf13/cobra" - apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + apierrors "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/runtime" ) const ( diff --git a/pkg/kubectl/cmd/describe_test.go b/pkg/kubectl/cmd/describe_test.go index 3fce05e466..2e21d4c38d 100644 --- a/pkg/kubectl/cmd/describe_test.go +++ b/pkg/kubectl/cmd/describe_test.go @@ -22,7 +22,7 @@ import ( "net/http" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client" ) // Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get. diff --git a/pkg/kubectl/cmd/exec.go b/pkg/kubectl/cmd/exec.go index d66d0cbf61..90256ffaca 100644 --- a/pkg/kubectl/cmd/exec.go +++ b/pkg/kubectl/cmd/exec.go @@ -23,10 +23,10 @@ import ( "os/signal" "syscall" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/remotecommand" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/remotecommand" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "github.com/docker/docker/pkg/term" "github.com/golang/glog" "github.com/spf13/cobra" diff --git a/pkg/kubectl/cmd/exec_test.go b/pkg/kubectl/cmd/exec_test.go index 67d6b41f9f..9bb5478ee2 100644 --- a/pkg/kubectl/cmd/exec_test.go +++ b/pkg/kubectl/cmd/exec_test.go @@ -26,9 +26,9 @@ import ( "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" ) type fakeRemoteExecutor struct { diff --git a/pkg/kubectl/cmd/expose.go b/pkg/kubectl/cmd/expose.go index 079c14f4f9..a0b04f025d 100644 --- a/pkg/kubectl/cmd/expose.go +++ b/pkg/kubectl/cmd/expose.go @@ -20,9 +20,9 @@ import ( "fmt" "io" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/expose_test.go b/pkg/kubectl/cmd/expose_test.go index 903c8de0b1..5e5db53ce5 100644 --- a/pkg/kubectl/cmd/expose_test.go +++ b/pkg/kubectl/cmd/expose_test.go @@ -22,10 +22,10 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) func TestRunExposeService(t *testing.T) { diff --git a/pkg/kubectl/cmd/get.go b/pkg/kubectl/cmd/get.go index 9b2ef020c0..54c3bf351c 100644 --- a/pkg/kubectl/cmd/get.go +++ b/pkg/kubectl/cmd/get.go @@ -20,11 +20,11 @@ import ( "fmt" "io" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/get_test.go b/pkg/kubectl/cmd/get_test.go index fa0fbbbe69..c5b068a723 100644 --- a/pkg/kubectl/cmd/get_test.go +++ b/pkg/kubectl/cmd/get_test.go @@ -27,14 +27,14 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch/json" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/watch/json" ) func testData() (*api.PodList, *api.ServiceList, *api.ReplicationControllerList) { diff --git a/pkg/kubectl/cmd/label.go b/pkg/kubectl/cmd/label.go index 89b8e41179..80432048a2 100644 --- a/pkg/kubectl/cmd/label.go +++ b/pkg/kubectl/cmd/label.go @@ -21,11 +21,11 @@ import ( "io" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/label_test.go b/pkg/kubectl/cmd/label_test.go index 2907788138..f354526a03 100644 --- a/pkg/kubectl/cmd/label_test.go +++ b/pkg/kubectl/cmd/label_test.go @@ -23,10 +23,10 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/runtime" ) func TestValidateLabels(t *testing.T) { diff --git a/pkg/kubectl/cmd/log.go b/pkg/kubectl/cmd/log.go index 6c23a38ed4..76d763c575 100644 --- a/pkg/kubectl/cmd/log.go +++ b/pkg/kubectl/cmd/log.go @@ -22,9 +22,9 @@ import ( "os" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - libutil "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + libutil "k8s.io/kubernetes/pkg/util" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/log_test.go b/pkg/kubectl/cmd/log_test.go index d77d562dd5..d086d236d5 100644 --- a/pkg/kubectl/cmd/log_test.go +++ b/pkg/kubectl/cmd/log_test.go @@ -22,8 +22,8 @@ import ( "net/http" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" ) func TestSelectContainer(t *testing.T) { diff --git a/pkg/kubectl/cmd/namespace.go b/pkg/kubectl/cmd/namespace.go index c4e1343f21..38e4e6a339 100644 --- a/pkg/kubectl/cmd/namespace.go +++ b/pkg/kubectl/cmd/namespace.go @@ -20,7 +20,7 @@ import ( "fmt" "io" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/cmd/util" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/patch.go b/pkg/kubectl/cmd/patch.go index 765270168a..bb30372d91 100644 --- a/pkg/kubectl/cmd/patch.go +++ b/pkg/kubectl/cmd/patch.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/api" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" ) const ( diff --git a/pkg/kubectl/cmd/patch_test.go b/pkg/kubectl/cmd/patch_test.go index 15cbc154a8..0cc5f93dfb 100644 --- a/pkg/kubectl/cmd/patch_test.go +++ b/pkg/kubectl/cmd/patch_test.go @@ -21,7 +21,7 @@ import ( "net/http" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client" ) func TestPatchObject(t *testing.T) { diff --git a/pkg/kubectl/cmd/portforward.go b/pkg/kubectl/cmd/portforward.go index 065fed59af..53b6f70174 100644 --- a/pkg/kubectl/cmd/portforward.go +++ b/pkg/kubectl/cmd/portforward.go @@ -20,10 +20,10 @@ import ( "os" "os/signal" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/portforward" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/portforward" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "github.com/golang/glog" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/portforward_test.go b/pkg/kubectl/cmd/portforward_test.go index 69fad51f1d..9a7ce55aaf 100644 --- a/pkg/kubectl/cmd/portforward_test.go +++ b/pkg/kubectl/cmd/portforward_test.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" ) type fakePortForwarder struct { diff --git a/pkg/kubectl/cmd/proxy.go b/pkg/kubectl/cmd/proxy.go index 16ced295bc..b277546c91 100644 --- a/pkg/kubectl/cmd/proxy.go +++ b/pkg/kubectl/cmd/proxy.go @@ -21,8 +21,8 @@ import ( "io" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "github.com/golang/glog" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/replace.go b/pkg/kubectl/cmd/replace.go index 94c575634e..c69513af9b 100644 --- a/pkg/kubectl/cmd/replace.go +++ b/pkg/kubectl/cmd/replace.go @@ -25,10 +25,10 @@ import ( "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/kubectl/cmd/replace_test.go b/pkg/kubectl/cmd/replace_test.go index b2117fc551..cca78a9ff4 100644 --- a/pkg/kubectl/cmd/replace_test.go +++ b/pkg/kubectl/cmd/replace_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client" ) func TestReplaceObject(t *testing.T) { diff --git a/pkg/kubectl/cmd/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate.go index 789bb81449..0ede91da05 100644 --- a/pkg/kubectl/cmd/rollingupdate.go +++ b/pkg/kubectl/cmd/rollingupdate.go @@ -24,12 +24,12 @@ import ( "github.com/golang/glog" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/run.go b/pkg/kubectl/cmd/run.go index 8c296c9f97..8c9bf3b9bd 100644 --- a/pkg/kubectl/cmd/run.go +++ b/pkg/kubectl/cmd/run.go @@ -21,9 +21,9 @@ import ( "io" "os" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/scale.go b/pkg/kubectl/cmd/scale.go index e1381fc34a..deba354e4d 100644 --- a/pkg/kubectl/cmd/scale.go +++ b/pkg/kubectl/cmd/scale.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/util/errors" ) const ( diff --git a/pkg/kubectl/cmd/stop.go b/pkg/kubectl/cmd/stop.go index fc71ce1b08..ad24ae5cb6 100644 --- a/pkg/kubectl/cmd/stop.go +++ b/pkg/kubectl/cmd/stop.go @@ -19,10 +19,10 @@ package cmd import ( "io" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/util" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/util/clientcache.go b/pkg/kubectl/cmd/util/clientcache.go index 9b8a2e36f8..2d6f2c4abf 100644 --- a/pkg/kubectl/cmd/util/clientcache.go +++ b/pkg/kubectl/cmd/util/clientcache.go @@ -17,9 +17,9 @@ limitations under the License. package util import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/registered" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" + "k8s.io/kubernetes/pkg/api/registered" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/clientcmd" ) func NewClientCache(loader clientcmd.ClientConfig) *clientCache { diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index a76981b989..869e385a4c 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -26,17 +26,17 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/registered" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/registered" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/clientcmd" + "k8s.io/kubernetes/pkg/kubectl" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) const ( diff --git a/pkg/kubectl/cmd/util/factory_test.go b/pkg/kubectl/cmd/util/factory_test.go index e24609d416..18db7e3ba8 100644 --- a/pkg/kubectl/cmd/util/factory_test.go +++ b/pkg/kubectl/cmd/util/factory_test.go @@ -20,12 +20,12 @@ import ( "sort" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/kubectl" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) func TestNewFactoryDefaultFlagBindings(t *testing.T) { diff --git a/pkg/kubectl/cmd/util/helpers.go b/pkg/kubectl/cmd/util/helpers.go index 1fd2861b76..d2cf988c25 100644 --- a/pkg/kubectl/cmd/util/helpers.go +++ b/pkg/kubectl/cmd/util/helpers.go @@ -29,15 +29,15 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - utilerrors "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/clientcmd" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + utilerrors "k8s.io/kubernetes/pkg/util/errors" "github.com/evanphx/json-patch" "github.com/golang/glog" diff --git a/pkg/kubectl/cmd/util/helpers_test.go b/pkg/kubectl/cmd/util/helpers_test.go index d57114d616..2bb0fb6c20 100644 --- a/pkg/kubectl/cmd/util/helpers_test.go +++ b/pkg/kubectl/cmd/util/helpers_test.go @@ -26,11 +26,11 @@ import ( "syscall" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/fielderrors" ) func TestMerge(t *testing.T) { diff --git a/pkg/kubectl/cmd/util/printing.go b/pkg/kubectl/cmd/util/printing.go index 41390ae708..2dd2d577c2 100644 --- a/pkg/kubectl/cmd/util/printing.go +++ b/pkg/kubectl/cmd/util/printing.go @@ -20,8 +20,8 @@ import ( "fmt" "io" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/kubectl" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/version.go b/pkg/kubectl/cmd/version.go index 2d0df56725..83a41d400e 100644 --- a/pkg/kubectl/cmd/version.go +++ b/pkg/kubectl/cmd/version.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" ) func NewCmdVersion(f *cmdutil.Factory, out io.Writer) *cobra.Command { diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index b1014679a1..bf0a0400e3 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -25,14 +25,14 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fieldpath" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fieldpath" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/kubectl/describe_test.go b/pkg/kubectl/describe_test.go index f97a01d5ba..a5e63d6f50 100644 --- a/pkg/kubectl/describe_test.go +++ b/pkg/kubectl/describe_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/util" ) type describeClient struct { diff --git a/pkg/kubectl/generate.go b/pkg/kubectl/generate.go index 5fe3b29365..13e18cb316 100644 --- a/pkg/kubectl/generate.go +++ b/pkg/kubectl/generate.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/interfaces.go b/pkg/kubectl/interfaces.go index 9d8aaba780..ad862982cb 100644 --- a/pkg/kubectl/interfaces.go +++ b/pkg/kubectl/interfaces.go @@ -17,8 +17,8 @@ limitations under the License. package kubectl import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" ) // RESTClient is a client helper for dealing with RESTful resources diff --git a/pkg/kubectl/kubectl.go b/pkg/kubectl/kubectl.go index 8670166a8e..537e9d52e4 100644 --- a/pkg/kubectl/kubectl.go +++ b/pkg/kubectl/kubectl.go @@ -21,9 +21,9 @@ import ( "fmt" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/labels" ) const kubectlAnnotationPrefix = "kubectl.kubernetes.io/" diff --git a/pkg/kubectl/proxy_server.go b/pkg/kubectl/proxy_server.go index 9a468e3895..af0731ed70 100644 --- a/pkg/kubectl/proxy_server.go +++ b/pkg/kubectl/proxy_server.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client" "github.com/golang/glog" ) diff --git a/pkg/kubectl/proxy_server_test.go b/pkg/kubectl/proxy_server_test.go index a943c528b7..a8d44e14cb 100644 --- a/pkg/kubectl/proxy_server_test.go +++ b/pkg/kubectl/proxy_server_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client" ) func TestAccept(t *testing.T) { diff --git a/pkg/kubectl/resource/builder.go b/pkg/kubectl/resource/builder.go index af30e1d962..35c8cbad4e 100644 --- a/pkg/kubectl/resource/builder.go +++ b/pkg/kubectl/resource/builder.go @@ -23,13 +23,13 @@ import ( "os" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/errors" ) // Builder provides convenience functions for taking arguments and parameters diff --git a/pkg/kubectl/resource/builder_test.go b/pkg/kubectl/resource/builder_test.go index 4336cc8569..ebe480c3f3 100644 --- a/pkg/kubectl/resource/builder_test.go +++ b/pkg/kubectl/resource/builder_test.go @@ -28,16 +28,16 @@ import ( "github.com/ghodss/yaml" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" - watchjson "github.com/GoogleCloudPlatform/kubernetes/pkg/watch/json" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/watch" + watchjson "k8s.io/kubernetes/pkg/watch/json" ) func stringBody(body string) io.ReadCloser { diff --git a/pkg/kubectl/resource/helper.go b/pkg/kubectl/resource/helper.go index f8bffa08b0..42fa9a9ae1 100644 --- a/pkg/kubectl/resource/helper.go +++ b/pkg/kubectl/resource/helper.go @@ -17,12 +17,12 @@ limitations under the License. package resource import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) // Helper provides methods for retrieving or mutating a RESTful diff --git a/pkg/kubectl/resource/helper_test.go b/pkg/kubectl/resource/helper_test.go index 9d4e003960..d40da3d271 100644 --- a/pkg/kubectl/resource/helper_test.go +++ b/pkg/kubectl/resource/helper_test.go @@ -26,11 +26,11 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" ) func objBody(obj runtime.Object) io.ReadCloser { diff --git a/pkg/kubectl/resource/interfaces.go b/pkg/kubectl/resource/interfaces.go index 264a3d53bc..99f8df8d73 100644 --- a/pkg/kubectl/resource/interfaces.go +++ b/pkg/kubectl/resource/interfaces.go @@ -17,9 +17,9 @@ limitations under the License. package resource import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/client" ) // RESTClient is a client helper for dealing with RESTful resources diff --git a/pkg/kubectl/resource/mapper.go b/pkg/kubectl/resource/mapper.go index a04cacc306..77458a877a 100644 --- a/pkg/kubectl/resource/mapper.go +++ b/pkg/kubectl/resource/mapper.go @@ -20,11 +20,11 @@ import ( "fmt" "reflect" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/registered" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/yaml" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/registered" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/yaml" ) // Mapper is a convenience struct for holding references to the three interfaces diff --git a/pkg/kubectl/resource/result.go b/pkg/kubectl/resource/result.go index 1f6c145fcb..1e9e09a74d 100644 --- a/pkg/kubectl/resource/result.go +++ b/pkg/kubectl/resource/result.go @@ -20,13 +20,13 @@ import ( "fmt" "reflect" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/watch" ) // ErrMatchFunc can be used to filter errors that may not be true failures. diff --git a/pkg/kubectl/resource/selector.go b/pkg/kubectl/resource/selector.go index 0a5ca56a72..d7861fd215 100644 --- a/pkg/kubectl/resource/selector.go +++ b/pkg/kubectl/resource/selector.go @@ -19,11 +19,11 @@ package resource import ( "github.com/golang/glog" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Selector is a Visitor for resources that match a label selector. diff --git a/pkg/kubectl/resource/visitor.go b/pkg/kubectl/resource/visitor.go index 3107ed16f7..6dd82c24d7 100644 --- a/pkg/kubectl/resource/visitor.go +++ b/pkg/kubectl/resource/visitor.go @@ -28,12 +28,12 @@ import ( "github.com/golang/glog" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/yaml" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/util/yaml" + "k8s.io/kubernetes/pkg/watch" ) const constSTDINstr string = "STDIN" diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index 9f2e280973..dd829bc09e 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -29,11 +29,11 @@ import ( "text/template" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/volume" "github.com/ghodss/yaml" "github.com/golang/glog" ) diff --git a/pkg/kubectl/resource_printer_test.go b/pkg/kubectl/resource_printer_test.go index 700f325795..0e6c6bd915 100644 --- a/pkg/kubectl/resource_printer_test.go +++ b/pkg/kubectl/resource_printer_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" "github.com/ghodss/yaml" ) diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index 880299ff21..fe55d8a018 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -25,12 +25,12 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util/wait" ) // RollingUpdater provides methods for updating replicated pods in a predictable, diff --git a/pkg/kubectl/rolling_updater_test.go b/pkg/kubectl/rolling_updater_test.go index 4016b1db4a..827b40777e 100644 --- a/pkg/kubectl/rolling_updater_test.go +++ b/pkg/kubectl/rolling_updater_test.go @@ -26,14 +26,14 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" ) type updaterFake struct { diff --git a/pkg/kubectl/run.go b/pkg/kubectl/run.go index 6c7c1c20bb..90195cc90a 100644 --- a/pkg/kubectl/run.go +++ b/pkg/kubectl/run.go @@ -20,8 +20,8 @@ import ( "fmt" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" ) type BasicReplicationController struct{} diff --git a/pkg/kubectl/run_test.go b/pkg/kubectl/run_test.go index 7ef8782a12..886f5b008e 100644 --- a/pkg/kubectl/run_test.go +++ b/pkg/kubectl/run_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) func TestGenerate(t *testing.T) { diff --git a/pkg/kubectl/scale.go b/pkg/kubectl/scale.go index 80064caa95..a2acda7541 100644 --- a/pkg/kubectl/scale.go +++ b/pkg/kubectl/scale.go @@ -21,9 +21,9 @@ import ( "strconv" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/util/wait" ) // ScalePrecondition describes a condition that must be true for the scale to take place diff --git a/pkg/kubectl/scale_test.go b/pkg/kubectl/scale_test.go index 9397eba16a..0aa6cbe8d1 100644 --- a/pkg/kubectl/scale_test.go +++ b/pkg/kubectl/scale_test.go @@ -20,9 +20,9 @@ import ( "errors" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/testclient" ) type ErrorReplicationControllers struct { diff --git a/pkg/kubectl/service.go b/pkg/kubectl/service.go index cd08d7379b..78266d06b8 100644 --- a/pkg/kubectl/service.go +++ b/pkg/kubectl/service.go @@ -20,9 +20,9 @@ import ( "fmt" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) // The only difference between ServiceGeneratorV1 and V2 is that the service port is named "default" in V1, while it is left unnamed in V2. diff --git a/pkg/kubectl/service_test.go b/pkg/kubectl/service_test.go index a00d7b23c9..347ec787c5 100644 --- a/pkg/kubectl/service_test.go +++ b/pkg/kubectl/service_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" ) func TestGenerateService(t *testing.T) { diff --git a/pkg/kubectl/sorted_event_list.go b/pkg/kubectl/sorted_event_list.go index 4647f6160d..568c46d6d1 100644 --- a/pkg/kubectl/sorted_event_list.go +++ b/pkg/kubectl/sorted_event_list.go @@ -17,7 +17,7 @@ limitations under the License. package kubectl import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // SortableEvents implements sort.Interface for []api.Event based on the Timestamp field diff --git a/pkg/kubectl/sorted_event_list_test.go b/pkg/kubectl/sorted_event_list_test.go index df21ae75ee..e243497818 100644 --- a/pkg/kubectl/sorted_event_list_test.go +++ b/pkg/kubectl/sorted_event_list_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" ) // VerifyDatesInOrder checks the start of each line for a RFC1123Z date diff --git a/pkg/kubectl/sorted_resource_name_list.go b/pkg/kubectl/sorted_resource_name_list.go index f245d76e38..6df122eaca 100644 --- a/pkg/kubectl/sorted_resource_name_list.go +++ b/pkg/kubectl/sorted_resource_name_list.go @@ -17,7 +17,7 @@ limitations under the License. package kubectl import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) type SortableResourceNames []api.ResourceName diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go index 35a9317a2c..7d407debe5 100644 --- a/pkg/kubectl/stop.go +++ b/pkg/kubectl/stop.go @@ -21,10 +21,10 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/labels" ) const ( diff --git a/pkg/kubectl/stop_test.go b/pkg/kubectl/stop_test.go index 20fde3e16b..459a6a7fe9 100644 --- a/pkg/kubectl/stop_test.go +++ b/pkg/kubectl/stop_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/testclient" ) func TestReplicationControllerStop(t *testing.T) { diff --git a/pkg/kubectl/version.go b/pkg/kubectl/version.go index 6fc7c2cadf..0f2390f406 100644 --- a/pkg/kubectl/version.go +++ b/pkg/kubectl/version.go @@ -21,8 +21,8 @@ import ( "io" "os" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/version" ) func GetVersion(w io.Writer, kubeClient client.Interface) { diff --git a/pkg/kubectl/watchloop.go b/pkg/kubectl/watchloop.go index fabf28f0f3..d2920dd7d2 100644 --- a/pkg/kubectl/watchloop.go +++ b/pkg/kubectl/watchloop.go @@ -20,7 +20,7 @@ import ( "os" "os/signal" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/watch" ) // WatchLoop loops, passing events in w to fn. diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index 1c1535fed8..561d3a01dd 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -23,7 +23,7 @@ import ( "net/http" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" "github.com/google/cadvisor/cache/memory" "github.com/google/cadvisor/events" diff --git a/pkg/kubelet/config/apiserver.go b/pkg/kubelet/config/apiserver.go index 88bb84b48a..5b4d6ad421 100644 --- a/pkg/kubelet/config/apiserver.go +++ b/pkg/kubelet/config/apiserver.go @@ -18,11 +18,11 @@ limitations under the License. package config import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/kubelet" ) // NewSourceApiserver creates a config source that watches and pulls from the apiserver. diff --git a/pkg/kubelet/config/apiserver_test.go b/pkg/kubelet/config/apiserver_test.go index 65dfc6e013..11b3f98287 100644 --- a/pkg/kubelet/config/apiserver_test.go +++ b/pkg/kubelet/config/apiserver_test.go @@ -19,11 +19,11 @@ package config import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) type fakePodLW struct { diff --git a/pkg/kubelet/config/common.go b/pkg/kubelet/config/common.go index 5f73d1d012..b1f075b3be 100644 --- a/pkg/kubelet/config/common.go +++ b/pkg/kubelet/config/common.go @@ -22,13 +22,13 @@ import ( "encoding/hex" "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - utilyaml "github.com/GoogleCloudPlatform/kubernetes/pkg/util/yaml" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + utilyaml "k8s.io/kubernetes/pkg/util/yaml" "github.com/golang/glog" ) diff --git a/pkg/kubelet/config/common_test.go b/pkg/kubelet/config/common_test.go index b2a2eb9d75..9ec02de37c 100644 --- a/pkg/kubelet/config/common_test.go +++ b/pkg/kubelet/config/common_test.go @@ -20,10 +20,10 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/registered" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/securitycontext" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/registered" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/securitycontext" "github.com/ghodss/yaml" ) diff --git a/pkg/kubelet/config/config.go b/pkg/kubelet/config/config.go index 3a68ec76a9..0d45715caa 100644 --- a/pkg/kubelet/config/config.go +++ b/pkg/kubelet/config/config.go @@ -21,17 +21,17 @@ import ( "reflect" "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - kubeletTypes "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/types" - kubeletUtil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/config" - utilerrors "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/kubelet" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" + kubeletUtil "k8s.io/kubernetes/pkg/kubelet/util" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/config" + utilerrors "k8s.io/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/util/fielderrors" "github.com/golang/glog" ) diff --git a/pkg/kubelet/config/config_test.go b/pkg/kubelet/config/config_test.go index d397bcd374..7c71d6aea8 100644 --- a/pkg/kubelet/config/config_test.go +++ b/pkg/kubelet/config/config_test.go @@ -20,11 +20,11 @@ import ( "sort" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - "github.com/GoogleCloudPlatform/kubernetes/pkg/securitycontext" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/securitycontext" + "k8s.io/kubernetes/pkg/types" ) const ( diff --git a/pkg/kubelet/config/file.go b/pkg/kubelet/config/file.go index 3d73010dd2..b933326191 100644 --- a/pkg/kubelet/config/file.go +++ b/pkg/kubelet/config/file.go @@ -25,9 +25,9 @@ import ( "sort" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/kubelet/config/file_test.go b/pkg/kubelet/config/file_test.go index 9f9d423dfc..440761e326 100644 --- a/pkg/kubelet/config/file_test.go +++ b/pkg/kubelet/config/file_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/securitycontext" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/securitycontext" ) func TestExtractFromNonExistentFile(t *testing.T) { diff --git a/pkg/kubelet/config/http.go b/pkg/kubelet/config/http.go index 9467915b96..5a2b11c900 100644 --- a/pkg/kubelet/config/http.go +++ b/pkg/kubelet/config/http.go @@ -24,9 +24,9 @@ import ( "net/http" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/kubelet/config/http_test.go b/pkg/kubelet/config/http_test.go index 69e3faaa14..184ef57c4a 100644 --- a/pkg/kubelet/config/http_test.go +++ b/pkg/kubelet/config/http_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/errors" ) func TestURLErrorNotExistNoUpdate(t *testing.T) { diff --git a/pkg/kubelet/container/container_reference_manager.go b/pkg/kubelet/container/container_reference_manager.go index b468b3c7db..0bcec8861e 100644 --- a/pkg/kubelet/container/container_reference_manager.go +++ b/pkg/kubelet/container/container_reference_manager.go @@ -19,7 +19,7 @@ package container import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // RefManager manages the references for the containers. diff --git a/pkg/kubelet/container/fake_runtime.go b/pkg/kubelet/container/fake_runtime.go index 18b19bf5ce..03d65e50a3 100644 --- a/pkg/kubelet/container/fake_runtime.go +++ b/pkg/kubelet/container/fake_runtime.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/volume" ) // FakeRuntime is a fake container runtime for testing. diff --git a/pkg/kubelet/container/helpers.go b/pkg/kubelet/container/helpers.go index 647f789816..346c0fdd9d 100644 --- a/pkg/kubelet/container/helpers.go +++ b/pkg/kubelet/container/helpers.go @@ -20,9 +20,9 @@ import ( "hash/adler32" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/third_party/golang/expansion" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/third_party/golang/expansion" "github.com/golang/glog" ) diff --git a/pkg/kubelet/container/helpers_test.go b/pkg/kubelet/container/helpers_test.go index 19f34a7c00..fb792c1580 100644 --- a/pkg/kubelet/container/helpers_test.go +++ b/pkg/kubelet/container/helpers_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) func TestEnvVarsToMap(t *testing.T) { diff --git a/pkg/kubelet/container/ref.go b/pkg/kubelet/container/ref.go index 45035c570a..1cfc6f2ce3 100644 --- a/pkg/kubelet/container/ref.go +++ b/pkg/kubelet/container/ref.go @@ -19,7 +19,7 @@ package container import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // GenerateContainerRef returns an *api.ObjectReference which references the given container diff --git a/pkg/kubelet/container/ref_test.go b/pkg/kubelet/container/ref_test.go index 032bd49dd0..8f0f6f335d 100644 --- a/pkg/kubelet/container/ref_test.go +++ b/pkg/kubelet/container/ref_test.go @@ -19,8 +19,8 @@ package container import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" ) func TestFieldPath(t *testing.T) { diff --git a/pkg/kubelet/container/runtime.go b/pkg/kubelet/container/runtime.go index 58a8235838..c7d77e5567 100644 --- a/pkg/kubelet/container/runtime.go +++ b/pkg/kubelet/container/runtime.go @@ -22,9 +22,9 @@ import ( "reflect" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/volume" ) type Version interface { diff --git a/pkg/kubelet/container_bridge.go b/pkg/kubelet/container_bridge.go index 4155b3ffd4..1f7f6328fb 100644 --- a/pkg/kubelet/container_bridge.go +++ b/pkg/kubelet/container_bridge.go @@ -23,7 +23,7 @@ import ( "os/exec" "regexp" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/kubelet/container_gc.go b/pkg/kubelet/container_gc.go index 5d891ebd89..ad56ef4e45 100644 --- a/pkg/kubelet/container_gc.go +++ b/pkg/kubelet/container_gc.go @@ -24,8 +24,8 @@ import ( "sort" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/types" docker "github.com/fsouza/go-dockerclient" "github.com/golang/glog" ) diff --git a/pkg/kubelet/container_gc_test.go b/pkg/kubelet/container_gc_test.go index f4f1ed6f05..4ffe5648c3 100644 --- a/pkg/kubelet/container_gc_test.go +++ b/pkg/kubelet/container_gc_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/kubelet/dockertools" docker "github.com/fsouza/go-dockerclient" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/kubelet/container_manager.go b/pkg/kubelet/container_manager.go index 0f53368358..de7260b132 100644 --- a/pkg/kubelet/container_manager.go +++ b/pkg/kubelet/container_manager.go @@ -17,7 +17,7 @@ limitations under the License. package kubelet import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // Manages the containers running on a machine. diff --git a/pkg/kubelet/container_manager_linux.go b/pkg/kubelet/container_manager_linux.go index 362227db4a..c3cda623af 100644 --- a/pkg/kubelet/container_manager_linux.go +++ b/pkg/kubelet/container_manager_linux.go @@ -26,11 +26,11 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/errors" "github.com/docker/libcontainer/cgroups" "github.com/docker/libcontainer/cgroups/fs" "github.com/docker/libcontainer/configs" diff --git a/pkg/kubelet/container_manager_unsupported.go b/pkg/kubelet/container_manager_unsupported.go index 23f7bf2ce8..8444852d0a 100644 --- a/pkg/kubelet/container_manager_unsupported.go +++ b/pkg/kubelet/container_manager_unsupported.go @@ -21,8 +21,8 @@ package kubelet import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" ) type unsupportedContainerManager struct { diff --git a/pkg/kubelet/disk_manager.go b/pkg/kubelet/disk_manager.go index 5b784bbd7b..e1e710ba2a 100644 --- a/pkg/kubelet/disk_manager.go +++ b/pkg/kubelet/disk_manager.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" "github.com/golang/glog" cadvisorApi "github.com/google/cadvisor/info/v2" ) diff --git a/pkg/kubelet/disk_manager_test.go b/pkg/kubelet/disk_manager_test.go index 7bb1c031fe..278d96ebd3 100644 --- a/pkg/kubelet/disk_manager_test.go +++ b/pkg/kubelet/disk_manager_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" cadvisorApi "github.com/google/cadvisor/info/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/kubelet/dockertools/convert.go b/pkg/kubelet/dockertools/convert.go index 31fe5aa7c6..05fb9a5eb4 100644 --- a/pkg/kubelet/dockertools/convert.go +++ b/pkg/kubelet/dockertools/convert.go @@ -19,8 +19,8 @@ package dockertools import ( "fmt" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/types" docker "github.com/fsouza/go-dockerclient" ) diff --git a/pkg/kubelet/dockertools/convert_test.go b/pkg/kubelet/dockertools/convert_test.go index 7afa56d9fe..92217df835 100644 --- a/pkg/kubelet/dockertools/convert_test.go +++ b/pkg/kubelet/dockertools/convert_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/types" docker "github.com/fsouza/go-dockerclient" ) diff --git a/pkg/kubelet/dockertools/docker.go b/pkg/kubelet/dockertools/docker.go index bf3dfe338d..9f20e91b93 100644 --- a/pkg/kubelet/dockertools/docker.go +++ b/pkg/kubelet/dockertools/docker.go @@ -25,14 +25,14 @@ import ( "strconv" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/credentialprovider" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/leaky" - kubeletTypes "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - utilerrors "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/credentialprovider" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/leaky" + kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + utilerrors "k8s.io/kubernetes/pkg/util/errors" "github.com/docker/docker/pkg/jsonmessage" "github.com/docker/docker/pkg/parsers" docker "github.com/fsouza/go-dockerclient" diff --git a/pkg/kubelet/dockertools/docker_test.go b/pkg/kubelet/dockertools/docker_test.go index 98e23a1538..6a9bca3dfb 100644 --- a/pkg/kubelet/dockertools/docker_test.go +++ b/pkg/kubelet/dockertools/docker_test.go @@ -25,13 +25,13 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/credentialprovider" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/network" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/credentialprovider" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" "github.com/docker/docker/pkg/jsonmessage" docker "github.com/fsouza/go-dockerclient" ) diff --git a/pkg/kubelet/dockertools/exec.go b/pkg/kubelet/dockertools/exec.go index c7bc583a71..234b5ae156 100644 --- a/pkg/kubelet/dockertools/exec.go +++ b/pkg/kubelet/dockertools/exec.go @@ -23,7 +23,7 @@ import ( "os/exec" "time" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" docker "github.com/fsouza/go-dockerclient" "github.com/golang/glog" ) diff --git a/pkg/kubelet/dockertools/fake_docker_client.go b/pkg/kubelet/dockertools/fake_docker_client.go index 2cb9ce8af4..b63cae0e2f 100644 --- a/pkg/kubelet/dockertools/fake_docker_client.go +++ b/pkg/kubelet/dockertools/fake_docker_client.go @@ -26,8 +26,8 @@ import ( docker "github.com/fsouza/go-dockerclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" ) // FakeDockerClient is a simple fake docker client, so that kubelet can be run for testing without requiring a real docker setup. diff --git a/pkg/kubelet/dockertools/fake_manager.go b/pkg/kubelet/dockertools/fake_manager.go index d0b7ffe874..95c54174bd 100644 --- a/pkg/kubelet/dockertools/fake_manager.go +++ b/pkg/kubelet/dockertools/fake_manager.go @@ -17,11 +17,11 @@ limitations under the License. package dockertools import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/network" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/prober" - kubeletTypes "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/types" + "k8s.io/kubernetes/pkg/client/record" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/kubelet/prober" + kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" ) func NewFakeDockerManager( diff --git a/pkg/kubelet/dockertools/instrumented_docker.go b/pkg/kubelet/dockertools/instrumented_docker.go index 2d8af57070..c3c16e4a25 100644 --- a/pkg/kubelet/dockertools/instrumented_docker.go +++ b/pkg/kubelet/dockertools/instrumented_docker.go @@ -19,7 +19,7 @@ package dockertools import ( "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/metrics" + "k8s.io/kubernetes/pkg/kubelet/metrics" docker "github.com/fsouza/go-dockerclient" ) diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go index 609345537c..e79f85779c 100644 --- a/pkg/kubelet/dockertools/manager.go +++ b/pkg/kubelet/dockertools/manager.go @@ -31,19 +31,19 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/lifecycle" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/metrics" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/network" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/prober" - kubeletTypes "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" - "github.com/GoogleCloudPlatform/kubernetes/pkg/securitycontext" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/client/record" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/lifecycle" + "k8s.io/kubernetes/pkg/kubelet/metrics" + "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/kubelet/prober" + kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" + "k8s.io/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/securitycontext" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" docker "github.com/fsouza/go-dockerclient" "github.com/golang/glog" "github.com/golang/groupcache/lru" diff --git a/pkg/kubelet/dockertools/manager_test.go b/pkg/kubelet/dockertools/manager_test.go index 061a8daa38..6b3fd3b40b 100644 --- a/pkg/kubelet/dockertools/manager_test.go +++ b/pkg/kubelet/dockertools/manager_test.go @@ -30,16 +30,16 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/network" - kubeprober "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/prober" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - uexec "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client/record" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/network" + kubeprober "k8s.io/kubernetes/pkg/kubelet/prober" + "k8s.io/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + uexec "k8s.io/kubernetes/pkg/util/exec" docker "github.com/fsouza/go-dockerclient" ) diff --git a/pkg/kubelet/envvars/envvars.go b/pkg/kubelet/envvars/envvars.go index ac918aac21..5a1de0f35c 100644 --- a/pkg/kubelet/envvars/envvars.go +++ b/pkg/kubelet/envvars/envvars.go @@ -21,7 +21,7 @@ import ( "strconv" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // FromServices builds environment variables that a container is started with, diff --git a/pkg/kubelet/envvars/envvars_test.go b/pkg/kubelet/envvars/envvars_test.go index 0c9eba3045..7feaf065da 100644 --- a/pkg/kubelet/envvars/envvars_test.go +++ b/pkg/kubelet/envvars/envvars_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/envvars" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/kubelet/envvars" ) func TestFromServices(t *testing.T) { diff --git a/pkg/kubelet/fake_pod_workers.go b/pkg/kubelet/fake_pod_workers.go index ffc68b5f2c..e25b5505f0 100644 --- a/pkg/kubelet/fake_pod_workers.go +++ b/pkg/kubelet/fake_pod_workers.go @@ -17,9 +17,9 @@ limitations under the License. package kubelet import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/api" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/types" ) // fakePodWorkers runs sync pod function in serial, so we can have diff --git a/pkg/kubelet/image_manager.go b/pkg/kubelet/image_manager.go index 4aa13c318f..95ae380309 100644 --- a/pkg/kubelet/image_manager.go +++ b/pkg/kubelet/image_manager.go @@ -22,11 +22,11 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/util" docker "github.com/fsouza/go-dockerclient" "github.com/golang/glog" ) diff --git a/pkg/kubelet/image_manager_test.go b/pkg/kubelet/image_manager_test.go index 1b5b30089a..c215ef6767 100644 --- a/pkg/kubelet/image_manager_test.go +++ b/pkg/kubelet/image_manager_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/util" docker "github.com/fsouza/go-dockerclient" cadvisorApiV2 "github.com/google/cadvisor/info/v2" "github.com/stretchr/testify/assert" diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index e05b15853a..969e28596a 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -33,37 +33,37 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fieldpath" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/envvars" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/metrics" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/network" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/rkt" - kubeletTypes "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/types" - kubeletUtil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - utilErrors "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - nodeutil "github.com/GoogleCloudPlatform/kubernetes/pkg/util/node" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - "github.com/GoogleCloudPlatform/kubernetes/third_party/golang/expansion" + "k8s.io/kubernetes/pkg/api" + apierrors "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/fieldpath" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/kubelet/envvars" + "k8s.io/kubernetes/pkg/kubelet/metrics" + "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/kubelet/rkt" + kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" + kubeletUtil "k8s.io/kubernetes/pkg/kubelet/util" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + utilErrors "k8s.io/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/util/mount" + nodeutil "k8s.io/kubernetes/pkg/util/node" + "k8s.io/kubernetes/pkg/version" + "k8s.io/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/watch" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/third_party/golang/expansion" "github.com/golang/glog" cadvisorApi "github.com/google/cadvisor/info/v1" diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index e586bc954e..ec601d8c82 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -31,23 +31,23 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/network" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/host_path" + "k8s.io/kubernetes/pkg/api" + apierrors "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/capabilities" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" + "k8s.io/kubernetes/pkg/kubelet/container" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/version" + "k8s.io/kubernetes/pkg/volume" + _ "k8s.io/kubernetes/pkg/volume/host_path" cadvisorApi "github.com/google/cadvisor/info/v1" cadvisorApiv2 "github.com/google/cadvisor/info/v2" ) diff --git a/pkg/kubelet/lifecycle/handlers.go b/pkg/kubelet/lifecycle/handlers.go index be44b3aa43..0084197237 100644 --- a/pkg/kubelet/lifecycle/handlers.go +++ b/pkg/kubelet/lifecycle/handlers.go @@ -21,10 +21,10 @@ import ( "net" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - kubeletTypes "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/kubelet/lifecycle/handlers_test.go b/pkg/kubelet/lifecycle/handlers_test.go index af05bd4df2..12c3fa2984 100644 --- a/pkg/kubelet/lifecycle/handlers_test.go +++ b/pkg/kubelet/lifecycle/handlers_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/util" ) func TestResolvePortInt(t *testing.T) { diff --git a/pkg/kubelet/metrics/metrics.go b/pkg/kubelet/metrics/metrics.go index d703ddd46b..e94078f846 100644 --- a/pkg/kubelet/metrics/metrics.go +++ b/pkg/kubelet/metrics/metrics.go @@ -20,7 +20,7 @@ import ( "sync" "time" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "github.com/golang/glog" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/kubelet/mirror_client.go b/pkg/kubelet/mirror_client.go index 03ef82b23e..a190a172b7 100644 --- a/pkg/kubelet/mirror_client.go +++ b/pkg/kubelet/mirror_client.go @@ -19,9 +19,9 @@ package kubelet import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "github.com/golang/glog" ) diff --git a/pkg/kubelet/mirror_client_test.go b/pkg/kubelet/mirror_client_test.go index a5321cae0c..2ae9c845b2 100644 --- a/pkg/kubelet/mirror_client_test.go +++ b/pkg/kubelet/mirror_client_test.go @@ -20,9 +20,9 @@ import ( "sync" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/util" ) type fakeMirrorClient struct { diff --git a/pkg/kubelet/network/exec/exec.go b/pkg/kubelet/network/exec/exec.go index 79c4a8737d..ee1fdbceea 100644 --- a/pkg/kubelet/network/exec/exec.go +++ b/pkg/kubelet/network/exec/exec.go @@ -54,9 +54,9 @@ import ( "path" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/network" - kubeletTypes "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/types" - utilexec "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/kubelet/network" + kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" + utilexec "k8s.io/kubernetes/pkg/util/exec" "github.com/golang/glog" ) diff --git a/pkg/kubelet/network/exec/exec_test.go b/pkg/kubelet/network/exec/exec_test.go index bc42a3d773..e646ff36d6 100644 --- a/pkg/kubelet/network/exec/exec_test.go +++ b/pkg/kubelet/network/exec/exec_test.go @@ -26,7 +26,7 @@ import ( "path" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/kubelet/network" ) // The temp dir where test plugins will be stored. diff --git a/pkg/kubelet/network/plugins.go b/pkg/kubelet/network/plugins.go index fe078a3735..c84514ff21 100644 --- a/pkg/kubelet/network/plugins.go +++ b/pkg/kubelet/network/plugins.go @@ -20,11 +20,11 @@ import ( "fmt" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - kubeletTypes "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/errors" "github.com/golang/glog" ) diff --git a/pkg/kubelet/network/testing.go b/pkg/kubelet/network/testing.go index 1855394d19..67c60f7fd6 100644 --- a/pkg/kubelet/network/testing.go +++ b/pkg/kubelet/network/testing.go @@ -20,8 +20,8 @@ package network // a fake host is created here that can be used by plugins for testing import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" ) type fakeNetworkHost struct { diff --git a/pkg/kubelet/networks.go b/pkg/kubelet/networks.go index f77abf18ef..a41bd2044f 100644 --- a/pkg/kubelet/networks.go +++ b/pkg/kubelet/networks.go @@ -17,8 +17,8 @@ limitations under the License. package kubelet import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" ) // This just exports required functions from kubelet proper, for use by network diff --git a/pkg/kubelet/oom_watcher.go b/pkg/kubelet/oom_watcher.go index 58a95783cd..bc38cbf66b 100644 --- a/pkg/kubelet/oom_watcher.go +++ b/pkg/kubelet/oom_watcher.go @@ -17,10 +17,10 @@ limitations under the License. package kubelet import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" "github.com/google/cadvisor/events" cadvisorApi "github.com/google/cadvisor/info/v1" diff --git a/pkg/kubelet/oom_watcher_test.go b/pkg/kubelet/oom_watcher_test.go index 57e9aaea25..fbb8d7b608 100644 --- a/pkg/kubelet/oom_watcher_test.go +++ b/pkg/kubelet/oom_watcher_test.go @@ -20,10 +20,10 @@ import ( "fmt" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) type fakeEvent struct { diff --git a/pkg/kubelet/pod_manager.go b/pkg/kubelet/pod_manager.go index 28501abbca..f959f368dc 100644 --- a/pkg/kubelet/pod_manager.go +++ b/pkg/kubelet/pod_manager.go @@ -19,10 +19,10 @@ package kubelet import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/types" "github.com/golang/glog" ) diff --git a/pkg/kubelet/pod_manager_test.go b/pkg/kubelet/pod_manager_test.go index 633891282d..b658330d7e 100644 --- a/pkg/kubelet/pod_manager_test.go +++ b/pkg/kubelet/pod_manager_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // Stub out mirror client for testing purpose. diff --git a/pkg/kubelet/pod_workers.go b/pkg/kubelet/pod_workers.go index e6af4c65c7..7b993e859d 100644 --- a/pkg/kubelet/pod_workers.go +++ b/pkg/kubelet/pod_workers.go @@ -20,11 +20,11 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/record" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/kubelet/pod_workers_test.go b/pkg/kubelet/pod_workers_test.go index 16867b1916..468c039ed8 100644 --- a/pkg/kubelet/pod_workers_test.go +++ b/pkg/kubelet/pod_workers_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/network" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/record" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/types" docker "github.com/fsouza/go-dockerclient" ) diff --git a/pkg/kubelet/prober/prober.go b/pkg/kubelet/prober/prober.go index 2aa26953c1..495648e17d 100644 --- a/pkg/kubelet/prober/prober.go +++ b/pkg/kubelet/prober/prober.go @@ -24,15 +24,15 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" - execprobe "github.com/GoogleCloudPlatform/kubernetes/pkg/probe/exec" - httprobe "github.com/GoogleCloudPlatform/kubernetes/pkg/probe/http" - tcprobe "github.com/GoogleCloudPlatform/kubernetes/pkg/probe/tcp" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/record" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/probe" + execprobe "k8s.io/kubernetes/pkg/probe/exec" + httprobe "k8s.io/kubernetes/pkg/probe/http" + tcprobe "k8s.io/kubernetes/pkg/probe/tcp" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/exec" "github.com/golang/glog" ) diff --git a/pkg/kubelet/prober/prober_fake.go b/pkg/kubelet/prober/prober_fake.go index ce07399ae9..ad933ccf9b 100644 --- a/pkg/kubelet/prober/prober_fake.go +++ b/pkg/kubelet/prober/prober_fake.go @@ -17,8 +17,8 @@ limitations under the License. package prober import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/probe" ) var _ Prober = &FakeProber{} diff --git a/pkg/kubelet/prober/prober_test.go b/pkg/kubelet/prober/prober_test.go index b22baa8484..eda0035eac 100644 --- a/pkg/kubelet/prober/prober_test.go +++ b/pkg/kubelet/prober/prober_test.go @@ -19,10 +19,10 @@ package prober import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/exec" ) func TestFormatURL(t *testing.T) { diff --git a/pkg/kubelet/rkt/cap.go b/pkg/kubelet/rkt/cap.go index 8cec6964a6..376215fb08 100644 --- a/pkg/kubelet/rkt/cap.go +++ b/pkg/kubelet/rkt/cap.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // TODO(yifan): Export this to higher level package. diff --git a/pkg/kubelet/rkt/pod_info.go b/pkg/kubelet/rkt/pod_info.go index 207541734d..2a15f31b54 100644 --- a/pkg/kubelet/rkt/pod_info.go +++ b/pkg/kubelet/rkt/pod_info.go @@ -21,9 +21,9 @@ import ( "strconv" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index 985b5b5e16..482b03f196 100644 --- a/pkg/kubelet/rkt/rkt.go +++ b/pkg/kubelet/rkt/rkt.go @@ -30,14 +30,14 @@ import ( "syscall" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/credentialprovider" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/prober" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" - "github.com/GoogleCloudPlatform/kubernetes/pkg/securitycontext" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/credentialprovider" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/prober" + "k8s.io/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/securitycontext" + "k8s.io/kubernetes/pkg/types" appcschema "github.com/appc/spec/schema" appctypes "github.com/appc/spec/schema/types" "github.com/coreos/go-systemd/dbus" diff --git a/pkg/kubelet/runonce.go b/pkg/kubelet/runonce.go index a34fd8ee53..5b4e904b6b 100644 --- a/pkg/kubelet/runonce.go +++ b/pkg/kubelet/runonce.go @@ -20,9 +20,9 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/kubelet/container" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "github.com/golang/glog" ) diff --git a/pkg/kubelet/runonce_test.go b/pkg/kubelet/runonce_test.go index 23429cf104..cf8534aa67 100644 --- a/pkg/kubelet/runonce_test.go +++ b/pkg/kubelet/runonce_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/cadvisor" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/network" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/kubelet/cadvisor" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/kubelet/network" docker "github.com/fsouza/go-dockerclient" cadvisorApi "github.com/google/cadvisor/info/v1" ) diff --git a/pkg/kubelet/runtime_hooks.go b/pkg/kubelet/runtime_hooks.go index 67ad085fc2..59c7be9b3f 100644 --- a/pkg/kubelet/runtime_hooks.go +++ b/pkg/kubelet/runtime_hooks.go @@ -17,9 +17,9 @@ limitations under the License. package kubelet import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/record" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "github.com/golang/glog" ) diff --git a/pkg/kubelet/server.go b/pkg/kubelet/server.go index 55e54ed1e7..7cdfd89a86 100644 --- a/pkg/kubelet/server.go +++ b/pkg/kubelet/server.go @@ -32,15 +32,15 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz" - "github.com/GoogleCloudPlatform/kubernetes/pkg/httplog" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/flushwriter" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream/spdy" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/healthz" + "k8s.io/kubernetes/pkg/httplog" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/flushwriter" + "k8s.io/kubernetes/pkg/util/httpstream" + "k8s.io/kubernetes/pkg/util/httpstream/spdy" "github.com/golang/glog" cadvisorApi "github.com/google/cadvisor/info/v1" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/kubelet/server_test.go b/pkg/kubelet/server_test.go index d02754149f..f1068f5d89 100644 --- a/pkg/kubelet/server_test.go +++ b/pkg/kubelet/server_test.go @@ -32,12 +32,12 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/dockertools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream/spdy" + "k8s.io/kubernetes/pkg/api" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/kubelet/dockertools" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/httpstream" + "k8s.io/kubernetes/pkg/util/httpstream/spdy" cadvisorApi "github.com/google/cadvisor/info/v1" ) diff --git a/pkg/kubelet/status_manager.go b/pkg/kubelet/status_manager.go index 3a4244c26f..6f9d8513e6 100644 --- a/pkg/kubelet/status_manager.go +++ b/pkg/kubelet/status_manager.go @@ -22,12 +22,12 @@ import ( "sort" "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - kubeletTypes "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/types" - kubeletUtil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" + kubeletUtil "k8s.io/kubernetes/pkg/kubelet/util" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/kubelet/status_manager_test.go b/pkg/kubelet/status_manager_test.go index c2313c7b77..585d2ffd34 100644 --- a/pkg/kubelet/status_manager_test.go +++ b/pkg/kubelet/status_manager_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/testclient" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/util" ) var testPod *api.Pod = &api.Pod{ diff --git a/pkg/kubelet/types.go b/pkg/kubelet/types.go index c4a7c50b39..63db74864d 100644 --- a/pkg/kubelet/types.go +++ b/pkg/kubelet/types.go @@ -19,7 +19,7 @@ package kubelet import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) const ConfigSourceAnnotationKey = "kubernetes.io/config.source" diff --git a/pkg/kubelet/types/types.go b/pkg/kubelet/types/types.go index 55ba55c839..23e494eef4 100644 --- a/pkg/kubelet/types/types.go +++ b/pkg/kubelet/types/types.go @@ -20,7 +20,7 @@ import ( "net/http" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // TODO: Reconcile custom types in kubelet/types and this subpackage diff --git a/pkg/kubelet/util.go b/pkg/kubelet/util.go index d86ba8f5f2..77bb4c6aeb 100644 --- a/pkg/kubelet/util.go +++ b/pkg/kubelet/util.go @@ -19,10 +19,10 @@ package kubelet import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities" - "github.com/GoogleCloudPlatform/kubernetes/pkg/securitycontext" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/capabilities" + "k8s.io/kubernetes/pkg/securitycontext" cadvisorApi "github.com/google/cadvisor/info/v1" ) diff --git a/pkg/kubelet/util/format.go b/pkg/kubelet/util/format.go index bd0ffab09b..9c1ce16ff2 100644 --- a/pkg/kubelet/util/format.go +++ b/pkg/kubelet/util/format.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // FormatPodName returns a string representating a pod in a human readable diff --git a/pkg/kubelet/volume_manager.go b/pkg/kubelet/volume_manager.go index d615f5b340..d724325188 100644 --- a/pkg/kubelet/volume_manager.go +++ b/pkg/kubelet/volume_manager.go @@ -19,8 +19,8 @@ package kubelet import ( "sync" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/types" ) // volumeManager manages the volumes for the pods running on the kubelet. diff --git a/pkg/kubelet/volumes.go b/pkg/kubelet/volumes.go index 8cd767ef6f..78421d5ab1 100644 --- a/pkg/kubelet/volumes.go +++ b/pkg/kubelet/volumes.go @@ -21,13 +21,13 @@ import ( "io/ioutil" "path" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - kubecontainer "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/container" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" "github.com/davecgh/go-spew/spew" "github.com/golang/glog" ) diff --git a/pkg/labels/selector.go b/pkg/labels/selector.go index a1ca9a1eb6..462217a850 100644 --- a/pkg/labels/selector.go +++ b/pkg/labels/selector.go @@ -22,8 +22,8 @@ import ( "sort" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // Selector represents a label selector. diff --git a/pkg/labels/selector_test.go b/pkg/labels/selector_test.go index 8f29969fdd..b9dbeaa026 100644 --- a/pkg/labels/selector_test.go +++ b/pkg/labels/selector_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) func TestSelectorParse(t *testing.T) { diff --git a/pkg/master/controller.go b/pkg/master/controller.go index a5f02a5421..b0c1704d16 100644 --- a/pkg/master/controller.go +++ b/pkg/master/controller.go @@ -21,16 +21,16 @@ import ( "net" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/endpoints" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/endpoint" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/namespace" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service" - servicecontroller "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/ipallocator/controller" - portallocatorcontroller "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/portallocator/controller" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/endpoints" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/registry/endpoint" + "k8s.io/kubernetes/pkg/registry/namespace" + "k8s.io/kubernetes/pkg/registry/service" + servicecontroller "k8s.io/kubernetes/pkg/registry/service/ipallocator/controller" + portallocatorcontroller "k8s.io/kubernetes/pkg/registry/service/portallocator/controller" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/master/controller_test.go b/pkg/master/controller_test.go index 47fa082416..4e5497d7a3 100644 --- a/pkg/master/controller_test.go +++ b/pkg/master/controller_test.go @@ -21,8 +21,8 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/registrytest" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/registry/registrytest" ) func TestSetEndpoints(t *testing.T) { diff --git a/pkg/master/master.go b/pkg/master/master.go index a66e7dd5ad..d486480354 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -33,52 +33,52 @@ import ( "sync/atomic" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1" - "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authorizer" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/handlers" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - explatest "github.com/GoogleCloudPlatform/kubernetes/pkg/expapi/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/componentstatus" - controlleretcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/controller/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/endpoint" - endpointsetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/endpoint/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/event" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/limitrange" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/minion" - nodeetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/minion/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/namespace" - namespaceetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/namespace/etcd" - pvetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/persistentvolume/etcd" - pvcetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/persistentvolumeclaim/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/pod" - podetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/pod/etcd" - podtemplateetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/podtemplate/etcd" - resourcequotaetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/resourcequota/etcd" - secretetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/secret/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service" - etcdallocator "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/allocator/etcd" - ipallocator "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/ipallocator" - serviceaccountetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/serviceaccount/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/ui" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/apiserver" + "k8s.io/kubernetes/pkg/auth/authenticator" + "k8s.io/kubernetes/pkg/auth/authorizer" + "k8s.io/kubernetes/pkg/auth/handlers" + "k8s.io/kubernetes/pkg/client" + explatest "k8s.io/kubernetes/pkg/expapi/latest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/healthz" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/registry/componentstatus" + controlleretcd "k8s.io/kubernetes/pkg/registry/controller/etcd" + "k8s.io/kubernetes/pkg/registry/endpoint" + endpointsetcd "k8s.io/kubernetes/pkg/registry/endpoint/etcd" + "k8s.io/kubernetes/pkg/registry/etcd" + "k8s.io/kubernetes/pkg/registry/event" + "k8s.io/kubernetes/pkg/registry/limitrange" + "k8s.io/kubernetes/pkg/registry/minion" + nodeetcd "k8s.io/kubernetes/pkg/registry/minion/etcd" + "k8s.io/kubernetes/pkg/registry/namespace" + namespaceetcd "k8s.io/kubernetes/pkg/registry/namespace/etcd" + pvetcd "k8s.io/kubernetes/pkg/registry/persistentvolume/etcd" + pvcetcd "k8s.io/kubernetes/pkg/registry/persistentvolumeclaim/etcd" + "k8s.io/kubernetes/pkg/registry/pod" + podetcd "k8s.io/kubernetes/pkg/registry/pod/etcd" + podtemplateetcd "k8s.io/kubernetes/pkg/registry/podtemplate/etcd" + resourcequotaetcd "k8s.io/kubernetes/pkg/registry/resourcequota/etcd" + secretetcd "k8s.io/kubernetes/pkg/registry/secret/etcd" + "k8s.io/kubernetes/pkg/registry/service" + etcdallocator "k8s.io/kubernetes/pkg/registry/service/allocator/etcd" + ipallocator "k8s.io/kubernetes/pkg/registry/service/ipallocator" + serviceaccountetcd "k8s.io/kubernetes/pkg/registry/serviceaccount/etcd" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/ui" + "k8s.io/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/allocator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/portallocator" + "k8s.io/kubernetes/pkg/registry/service/allocator" + "k8s.io/kubernetes/pkg/registry/service/portallocator" "github.com/emicklei/go-restful" "github.com/emicklei/go-restful/swagger" "github.com/golang/glog" diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 0f4ef37487..779f7ffcf0 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -19,13 +19,13 @@ package master import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - explatest "github.com/GoogleCloudPlatform/kubernetes/pkg/expapi/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/registrytest" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + explatest "k8s.io/kubernetes/pkg/expapi/latest" + "k8s.io/kubernetes/pkg/registry/registrytest" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" ) func TestGetServersToValidate(t *testing.T) { diff --git a/pkg/probe/exec/exec.go b/pkg/probe/exec/exec.go index d1cd934a54..a8ea0f6e3c 100644 --- a/pkg/probe/exec/exec.go +++ b/pkg/probe/exec/exec.go @@ -17,8 +17,8 @@ limitations under the License. package exec import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/util/exec" "github.com/golang/glog" ) diff --git a/pkg/probe/exec/exec_test.go b/pkg/probe/exec/exec_test.go index e3219dcdb2..4e0452a711 100644 --- a/pkg/probe/exec/exec_test.go +++ b/pkg/probe/exec/exec_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/probe" ) type FakeCmd struct { diff --git a/pkg/probe/http/http.go b/pkg/probe/http/http.go index 47c3f35ad5..6d35e285d3 100644 --- a/pkg/probe/http/http.go +++ b/pkg/probe/http/http.go @@ -23,7 +23,7 @@ import ( "net/url" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/probe" "github.com/golang/glog" ) diff --git a/pkg/probe/http/http_test.go b/pkg/probe/http/http_test.go index 763593a644..987f3103f8 100644 --- a/pkg/probe/http/http_test.go +++ b/pkg/probe/http/http_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/probe" ) func TestHTTPProbeChecker(t *testing.T) { diff --git a/pkg/probe/tcp/tcp.go b/pkg/probe/tcp/tcp.go index 4230c1816a..8e3676fbd6 100644 --- a/pkg/probe/tcp/tcp.go +++ b/pkg/probe/tcp/tcp.go @@ -21,7 +21,7 @@ import ( "strconv" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/probe" "github.com/golang/glog" ) diff --git a/pkg/probe/tcp/tcp_test.go b/pkg/probe/tcp/tcp_test.go index 5d6a14a5b7..d30f088a78 100644 --- a/pkg/probe/tcp/tcp_test.go +++ b/pkg/probe/tcp/tcp_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/probe" ) func TestTcpHealthChecker(t *testing.T) { diff --git a/pkg/proxy/config/api.go b/pkg/proxy/config/api.go index 19c9437636..d78c1254d5 100644 --- a/pkg/proxy/config/api.go +++ b/pkg/proxy/config/api.go @@ -19,10 +19,10 @@ package config import ( "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/fields" ) // NewSourceAPIserver creates config source that watches for changes to the services and endpoints. diff --git a/pkg/proxy/config/api_test.go b/pkg/proxy/config/api_test.go index dbaccd90fa..fa4fa122b2 100644 --- a/pkg/proxy/config/api_test.go +++ b/pkg/proxy/config/api_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) type fakeLW struct { diff --git a/pkg/proxy/config/config.go b/pkg/proxy/config/config.go index 57f1bf64d6..58dbc343e8 100644 --- a/pkg/proxy/config/config.go +++ b/pkg/proxy/config/config.go @@ -19,9 +19,9 @@ package config import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/config" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/config" "github.com/golang/glog" ) diff --git a/pkg/proxy/config/config_test.go b/pkg/proxy/config/config_test.go index 4b6774d8a1..7d070c6982 100644 --- a/pkg/proxy/config/config_test.go +++ b/pkg/proxy/config/config_test.go @@ -22,8 +22,8 @@ import ( "sync" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - . "github.com/GoogleCloudPlatform/kubernetes/pkg/proxy/config" + "k8s.io/kubernetes/pkg/api" + . "k8s.io/kubernetes/pkg/proxy/config" ) const TomcatPort int = 8080 diff --git a/pkg/proxy/loadbalancer.go b/pkg/proxy/loadbalancer.go index 0e4c6b4ae5..d03c4285bf 100644 --- a/pkg/proxy/loadbalancer.go +++ b/pkg/proxy/loadbalancer.go @@ -20,8 +20,8 @@ import ( "fmt" "net" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" ) // LoadBalancer is an interface for distributing incoming requests to service endpoints. diff --git a/pkg/proxy/port_allocator.go b/pkg/proxy/port_allocator.go index c767c3e8bf..7b8872d903 100644 --- a/pkg/proxy/port_allocator.go +++ b/pkg/proxy/port_allocator.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) var ( diff --git a/pkg/proxy/port_allocator_test.go b/pkg/proxy/port_allocator_test.go index 9028758779..0a6c8c3ab3 100644 --- a/pkg/proxy/port_allocator_test.go +++ b/pkg/proxy/port_allocator_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) func TestRangeAllocatorEmpty(t *testing.T) { diff --git a/pkg/proxy/proxier.go b/pkg/proxy/proxier.go index 62b2e0028f..81c4065ba0 100644 --- a/pkg/proxy/proxier.go +++ b/pkg/proxy/proxier.go @@ -25,11 +25,11 @@ import ( "sync/atomic" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/iptables" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/util/iptables" "github.com/golang/glog" ) diff --git a/pkg/proxy/proxier_test.go b/pkg/proxy/proxier_test.go index 0cb3db0a3c..8214de3cf4 100644 --- a/pkg/proxy/proxier_test.go +++ b/pkg/proxy/proxier_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/iptables" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/iptables" ) func joinHostPort(host string, port int) string { diff --git a/pkg/proxy/proxysocket.go b/pkg/proxy/proxysocket.go index 4513fa95e3..eecd5f055e 100644 --- a/pkg/proxy/proxysocket.go +++ b/pkg/proxy/proxysocket.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/proxy/roundrobin.go b/pkg/proxy/roundrobin.go index 1c6e7c427f..714f4b815f 100644 --- a/pkg/proxy/roundrobin.go +++ b/pkg/proxy/roundrobin.go @@ -25,9 +25,9 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/slice" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/slice" "github.com/golang/glog" ) diff --git a/pkg/proxy/roundrobin_test.go b/pkg/proxy/roundrobin_test.go index ca549b51d0..d7863bf351 100644 --- a/pkg/proxy/roundrobin_test.go +++ b/pkg/proxy/roundrobin_test.go @@ -20,8 +20,8 @@ import ( "net" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" ) func TestValidateWorks(t *testing.T) { diff --git a/pkg/registry/componentstatus/rest.go b/pkg/registry/componentstatus/rest.go index 243ce1fefb..517f73b1df 100644 --- a/pkg/registry/componentstatus/rest.go +++ b/pkg/registry/componentstatus/rest.go @@ -20,12 +20,12 @@ import ( "fmt" "net/http" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/probe" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/apiserver" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/runtime" ) type REST struct { diff --git a/pkg/registry/componentstatus/rest_test.go b/pkg/registry/componentstatus/rest_test.go index b3e4231f8c..9accaeff28 100644 --- a/pkg/registry/componentstatus/rest_test.go +++ b/pkg/registry/componentstatus/rest_test.go @@ -25,11 +25,11 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/apiserver" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" ) type fakeRoundTripper struct { diff --git a/pkg/registry/controller/etcd/etcd.go b/pkg/registry/controller/etcd/etcd.go index 75a08e1f02..50334d2fb9 100644 --- a/pkg/registry/controller/etcd/etcd.go +++ b/pkg/registry/controller/etcd/etcd.go @@ -17,14 +17,14 @@ limitations under the License. package etcd import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/controller" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/controller" + "k8s.io/kubernetes/pkg/registry/generic" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" ) // rest implements a RESTStorage for replication controllers against etcd diff --git a/pkg/registry/controller/etcd/etcd_test.go b/pkg/registry/controller/etcd/etcd_test.go index 3477892a86..5a740c5dcd 100644 --- a/pkg/registry/controller/etcd/etcd_test.go +++ b/pkg/registry/controller/etcd/etcd_test.go @@ -22,18 +22,18 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest/resttest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/rest/resttest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" "github.com/coreos/go-etcd/etcd" ) diff --git a/pkg/registry/controller/registry.go b/pkg/registry/controller/registry.go index 2c6dff5ab9..78e1b61e45 100644 --- a/pkg/registry/controller/registry.go +++ b/pkg/registry/controller/registry.go @@ -19,11 +19,11 @@ package controller import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Registry is an interface for things that know how to store ReplicationControllers. diff --git a/pkg/registry/controller/rest.go b/pkg/registry/controller/rest.go index bee7f00d45..1abd72deef 100644 --- a/pkg/registry/controller/rest.go +++ b/pkg/registry/controller/rest.go @@ -21,13 +21,13 @@ import ( "reflect" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // rcStrategy implements verification logic for Replication Controllers. diff --git a/pkg/registry/endpoint/etcd/etcd.go b/pkg/registry/endpoint/etcd/etcd.go index 0068487a33..6ce1505d25 100644 --- a/pkg/registry/endpoint/etcd/etcd.go +++ b/pkg/registry/endpoint/etcd/etcd.go @@ -17,14 +17,14 @@ limitations under the License. package etcd import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/endpoint" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/endpoint" + "k8s.io/kubernetes/pkg/registry/generic" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" ) // rest implements a RESTStorage for endpoints against etcd diff --git a/pkg/registry/endpoint/etcd/etcd_test.go b/pkg/registry/endpoint/etcd/etcd_test.go index 9ad3a9cd62..08b834f401 100644 --- a/pkg/registry/endpoint/etcd/etcd_test.go +++ b/pkg/registry/endpoint/etcd/etcd_test.go @@ -19,17 +19,17 @@ package etcd import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest/resttest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/rest/resttest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/util" "github.com/coreos/go-etcd/etcd" ) diff --git a/pkg/registry/endpoint/registry.go b/pkg/registry/endpoint/registry.go index b1ccf6ad27..775ef78bb5 100644 --- a/pkg/registry/endpoint/registry.go +++ b/pkg/registry/endpoint/registry.go @@ -17,11 +17,11 @@ limitations under the License. package endpoint import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Registry is an interface for things that know how to store endpoints. diff --git a/pkg/registry/endpoint/rest.go b/pkg/registry/endpoint/rest.go index 72ae60cddc..faa1c79671 100644 --- a/pkg/registry/endpoint/rest.go +++ b/pkg/registry/endpoint/rest.go @@ -19,14 +19,14 @@ package endpoint import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - endptspkg "github.com/GoogleCloudPlatform/kubernetes/pkg/api/endpoints" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + endptspkg "k8s.io/kubernetes/pkg/api/endpoints" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // endpointsStrategy implements behavior for Endpoints diff --git a/pkg/registry/etcd/etcd.go b/pkg/registry/etcd/etcd.go index b9acedff0c..1d8f045ea8 100644 --- a/pkg/registry/etcd/etcd.go +++ b/pkg/registry/etcd/etcd.go @@ -19,15 +19,15 @@ package etcd import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - etcderr "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/endpoint" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/pod" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + etcderr "k8s.io/kubernetes/pkg/api/errors/etcd" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/endpoint" + "k8s.io/kubernetes/pkg/registry/pod" + "k8s.io/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/watch" ) const ( diff --git a/pkg/registry/etcd/etcd_test.go b/pkg/registry/etcd/etcd_test.go index 57ad7bc101..38a37dfef0 100644 --- a/pkg/registry/etcd/etcd_test.go +++ b/pkg/registry/etcd/etcd_test.go @@ -20,20 +20,20 @@ import ( "strconv" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/endpoint" - endpointetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/endpoint/etcd" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/pod" - podetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/pod/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/endpoint" + endpointetcd "k8s.io/kubernetes/pkg/registry/endpoint/etcd" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/registry/pod" + podetcd "k8s.io/kubernetes/pkg/registry/pod/etcd" + "k8s.io/kubernetes/pkg/runtime" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" "github.com/coreos/go-etcd/etcd" ) diff --git a/pkg/registry/event/registry.go b/pkg/registry/event/registry.go index c3025fd2ba..0f12adeeaf 100644 --- a/pkg/registry/event/registry.go +++ b/pkg/registry/event/registry.go @@ -17,11 +17,11 @@ limitations under the License. package event import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/registry/generic" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" ) // registry implements custom changes to generic.Etcd. diff --git a/pkg/registry/event/registry_test.go b/pkg/registry/event/registry_test.go index c54fbad9e2..c199af51e9 100644 --- a/pkg/registry/event/registry_test.go +++ b/pkg/registry/event/registry_test.go @@ -20,16 +20,16 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/registry/generic" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/runtime" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/util" "github.com/coreos/go-etcd/etcd" ) diff --git a/pkg/registry/event/rest.go b/pkg/registry/event/rest.go index edb514c0a0..4be0d92e2e 100644 --- a/pkg/registry/event/rest.go +++ b/pkg/registry/event/rest.go @@ -19,14 +19,14 @@ package event import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) // REST adapts an event registry into apiserver's RESTStorage model. diff --git a/pkg/registry/event/rest_test.go b/pkg/registry/event/rest_test.go index b45d56fd9c..d9ee2622c6 100644 --- a/pkg/registry/event/rest_test.go +++ b/pkg/registry/event/rest_test.go @@ -20,14 +20,14 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/registrytest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/registrytest" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" ) type testRegistry struct { diff --git a/pkg/registry/generic/etcd/etcd.go b/pkg/registry/generic/etcd/etcd.go index 2429c340b5..ed7787e421 100644 --- a/pkg/registry/generic/etcd/etcd.go +++ b/pkg/registry/generic/etcd/etcd.go @@ -21,17 +21,17 @@ import ( "reflect" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - kubeerr "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - etcderr "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + kubeerr "k8s.io/kubernetes/pkg/api/errors" + etcderr "k8s.io/kubernetes/pkg/api/errors/etcd" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" "github.com/golang/glog" ) diff --git a/pkg/registry/generic/etcd/etcd_test.go b/pkg/registry/generic/etcd/etcd_test.go index 7b0b960326..c8f2ce5a07 100644 --- a/pkg/registry/generic/etcd/etcd_test.go +++ b/pkg/registry/generic/etcd/etcd_test.go @@ -21,16 +21,16 @@ import ( "path" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/fielderrors" "github.com/coreos/go-etcd/etcd" ) diff --git a/pkg/registry/generic/registry.go b/pkg/registry/generic/registry.go index a745695337..312edf81d1 100644 --- a/pkg/registry/generic/registry.go +++ b/pkg/registry/generic/registry.go @@ -17,11 +17,11 @@ limitations under the License. package generic import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) // AttrFunc returns label and field sets for List or Watch to compare against, or an error. diff --git a/pkg/registry/generic/registry_test.go b/pkg/registry/generic/registry_test.go index 4779ef19f5..669f15b5f8 100644 --- a/pkg/registry/generic/registry_test.go +++ b/pkg/registry/generic/registry_test.go @@ -21,9 +21,9 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" ) type Ignored struct { diff --git a/pkg/registry/generic/rest/proxy.go b/pkg/registry/generic/rest/proxy.go index 12d34b250c..1ccaa2322b 100644 --- a/pkg/registry/generic/rest/proxy.go +++ b/pkg/registry/generic/rest/proxy.go @@ -28,11 +28,11 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/proxy" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/util/httpstream" + "k8s.io/kubernetes/pkg/util/proxy" - "github.com/GoogleCloudPlatform/kubernetes/third_party/golang/netutil" + "k8s.io/kubernetes/third_party/golang/netutil" "github.com/golang/glog" "github.com/mxk/go-flowrate/flowrate" ) diff --git a/pkg/registry/generic/rest/proxy_test.go b/pkg/registry/generic/rest/proxy_test.go index 0aadeb3e79..9f03595890 100644 --- a/pkg/registry/generic/rest/proxy_test.go +++ b/pkg/registry/generic/rest/proxy_test.go @@ -27,7 +27,7 @@ import ( "golang.org/x/net/websocket" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/proxy" + "k8s.io/kubernetes/pkg/util/proxy" ) type SimpleBackendHandler struct { diff --git a/pkg/registry/generic/rest/streamer.go b/pkg/registry/generic/rest/streamer.go index cbb2758efd..ee303dbb86 100644 --- a/pkg/registry/generic/rest/streamer.go +++ b/pkg/registry/generic/rest/streamer.go @@ -22,7 +22,7 @@ import ( "net/url" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/api/rest" ) // LocationStreamer is a resource that streams the contents of a particular diff --git a/pkg/registry/limitrange/registry.go b/pkg/registry/limitrange/registry.go index b6efa9e6fe..84e24c3475 100644 --- a/pkg/registry/limitrange/registry.go +++ b/pkg/registry/limitrange/registry.go @@ -17,11 +17,11 @@ limitations under the License. package limitrange import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/registry/generic" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" ) // registry implements custom changes to generic.Etcd. diff --git a/pkg/registry/limitrange/registry_test.go b/pkg/registry/limitrange/registry_test.go index ea5d6020a6..4933b065a7 100644 --- a/pkg/registry/limitrange/registry_test.go +++ b/pkg/registry/limitrange/registry_test.go @@ -20,17 +20,17 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/registry/generic" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/runtime" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/util" "github.com/coreos/go-etcd/etcd" ) diff --git a/pkg/registry/limitrange/rest.go b/pkg/registry/limitrange/rest.go index 7bc19947d0..f5a5926431 100644 --- a/pkg/registry/limitrange/rest.go +++ b/pkg/registry/limitrange/rest.go @@ -19,15 +19,15 @@ package limitrange import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" ) // REST provides the RESTStorage access patterns to work with LimitRange objects. diff --git a/pkg/registry/minion/etcd/etcd.go b/pkg/registry/minion/etcd/etcd.go index 48388ed6ed..d552d3ff4b 100644 --- a/pkg/registry/minion/etcd/etcd.go +++ b/pkg/registry/minion/etcd/etcd.go @@ -20,13 +20,13 @@ import ( "net/http" "net/url" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/minion" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/client" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/registry/minion" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" ) type REST struct { diff --git a/pkg/registry/minion/etcd/etcd_test.go b/pkg/registry/minion/etcd/etcd_test.go index 884c4fa027..088b7b2af7 100644 --- a/pkg/registry/minion/etcd/etcd_test.go +++ b/pkg/registry/minion/etcd/etcd_test.go @@ -21,18 +21,18 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest/resttest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/rest/resttest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" "github.com/coreos/go-etcd/etcd" ) diff --git a/pkg/registry/minion/registry.go b/pkg/registry/minion/registry.go index a8afb69bfc..d67f983e28 100644 --- a/pkg/registry/minion/registry.go +++ b/pkg/registry/minion/registry.go @@ -17,11 +17,11 @@ limitations under the License. package minion import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Registry is an interface for things that know how to store node. diff --git a/pkg/registry/minion/rest.go b/pkg/registry/minion/rest.go index 3d2504c967..83421b4261 100644 --- a/pkg/registry/minion/rest.go +++ b/pkg/registry/minion/rest.go @@ -23,18 +23,18 @@ import ( "net/url" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" - nodeutil "github.com/GoogleCloudPlatform/kubernetes/pkg/util/node" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/fielderrors" + nodeutil "k8s.io/kubernetes/pkg/util/node" ) // nodeStrategy implements behavior for nodes diff --git a/pkg/registry/minion/rest_test.go b/pkg/registry/minion/rest_test.go index 35ccd073dd..08cd73f4f5 100644 --- a/pkg/registry/minion/rest_test.go +++ b/pkg/registry/minion/rest_test.go @@ -19,8 +19,8 @@ package minion import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" ) func TestMatchNode(t *testing.T) { diff --git a/pkg/registry/namespace/etcd/etcd.go b/pkg/registry/namespace/etcd/etcd.go index e5c77f6ca2..ec42030954 100644 --- a/pkg/registry/namespace/etcd/etcd.go +++ b/pkg/registry/namespace/etcd/etcd.go @@ -20,16 +20,16 @@ import ( "fmt" "path" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/namespace" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + apierrors "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/registry/namespace" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/util" ) // rest implements a RESTStorage for namespaces against etcd diff --git a/pkg/registry/namespace/etcd/etcd_test.go b/pkg/registry/namespace/etcd/etcd_test.go index 864210e192..09542df6d6 100644 --- a/pkg/registry/namespace/etcd/etcd_test.go +++ b/pkg/registry/namespace/etcd/etcd_test.go @@ -19,18 +19,18 @@ package etcd import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest/resttest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/namespace" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/rest/resttest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/namespace" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/util" "github.com/coreos/go-etcd/etcd" ) diff --git a/pkg/registry/namespace/registry.go b/pkg/registry/namespace/registry.go index 83d23d05f0..a24dc14a56 100644 --- a/pkg/registry/namespace/registry.go +++ b/pkg/registry/namespace/registry.go @@ -17,11 +17,11 @@ limitations under the License. package namespace import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Registry is an interface implemented by things that know how to store Namespace objects. diff --git a/pkg/registry/namespace/rest.go b/pkg/registry/namespace/rest.go index ce19617bbf..9f81bf2e45 100644 --- a/pkg/registry/namespace/rest.go +++ b/pkg/registry/namespace/rest.go @@ -19,13 +19,13 @@ package namespace import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // namespaceStrategy implements behavior for Namespaces diff --git a/pkg/registry/namespace/rest_test.go b/pkg/registry/namespace/rest_test.go index 3afc064178..2dba004546 100644 --- a/pkg/registry/namespace/rest_test.go +++ b/pkg/registry/namespace/rest_test.go @@ -19,8 +19,8 @@ package namespace import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" ) func TestNamespaceStrategy(t *testing.T) { diff --git a/pkg/registry/persistentvolume/etcd/etcd.go b/pkg/registry/persistentvolume/etcd/etcd.go index acb3362280..6e5258e63d 100644 --- a/pkg/registry/persistentvolume/etcd/etcd.go +++ b/pkg/registry/persistentvolume/etcd/etcd.go @@ -19,14 +19,14 @@ package etcd import ( "path" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/persistentvolume" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/registry/persistentvolume" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" ) // rest implements a RESTStorage for persistentvolumes against etcd diff --git a/pkg/registry/persistentvolume/etcd/etcd_test.go b/pkg/registry/persistentvolume/etcd/etcd_test.go index bfd71f0e1d..0be86d61d2 100644 --- a/pkg/registry/persistentvolume/etcd/etcd_test.go +++ b/pkg/registry/persistentvolume/etcd/etcd_test.go @@ -19,19 +19,19 @@ package etcd import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest/resttest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/registrytest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/rest/resttest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/registrytest" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/util" "github.com/coreos/go-etcd/etcd" ) diff --git a/pkg/registry/persistentvolume/registry.go b/pkg/registry/persistentvolume/registry.go index 48a9f9f815..88cd963ab0 100644 --- a/pkg/registry/persistentvolume/registry.go +++ b/pkg/registry/persistentvolume/registry.go @@ -17,11 +17,11 @@ limitations under the License. package persistentvolume import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Registry is an interface implemented by things that know how to store PersistentVolume objects. diff --git a/pkg/registry/persistentvolume/rest.go b/pkg/registry/persistentvolume/rest.go index c9b8000eb5..d7056cedca 100644 --- a/pkg/registry/persistentvolume/rest.go +++ b/pkg/registry/persistentvolume/rest.go @@ -19,13 +19,13 @@ package persistentvolume import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // persistentvolumeStrategy implements behavior for PersistentVolume objects diff --git a/pkg/registry/persistentvolumeclaim/etcd/etcd.go b/pkg/registry/persistentvolumeclaim/etcd/etcd.go index 384601976e..18ff134b4b 100644 --- a/pkg/registry/persistentvolumeclaim/etcd/etcd.go +++ b/pkg/registry/persistentvolumeclaim/etcd/etcd.go @@ -17,14 +17,14 @@ limitations under the License. package etcd import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/persistentvolumeclaim" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/registry/persistentvolumeclaim" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" ) // rest implements a RESTStorage for persistentvolumeclaims against etcd diff --git a/pkg/registry/persistentvolumeclaim/etcd/etcd_test.go b/pkg/registry/persistentvolumeclaim/etcd/etcd_test.go index 6f298d5a73..4acafbe270 100644 --- a/pkg/registry/persistentvolumeclaim/etcd/etcd_test.go +++ b/pkg/registry/persistentvolumeclaim/etcd/etcd_test.go @@ -19,19 +19,19 @@ package etcd import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest/resttest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/registrytest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/rest/resttest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/registrytest" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/util" "github.com/coreos/go-etcd/etcd" ) diff --git a/pkg/registry/persistentvolumeclaim/registry.go b/pkg/registry/persistentvolumeclaim/registry.go index 7be28e7421..fdca5eb633 100644 --- a/pkg/registry/persistentvolumeclaim/registry.go +++ b/pkg/registry/persistentvolumeclaim/registry.go @@ -17,11 +17,11 @@ limitations under the License. package persistentvolumeclaim import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Registry is an interface implemented by things that know how to store PersistentVolumeClaim objects. diff --git a/pkg/registry/persistentvolumeclaim/rest.go b/pkg/registry/persistentvolumeclaim/rest.go index b565759b5f..193b57a016 100644 --- a/pkg/registry/persistentvolumeclaim/rest.go +++ b/pkg/registry/persistentvolumeclaim/rest.go @@ -19,13 +19,13 @@ package persistentvolumeclaim import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // persistentvolumeclaimStrategy implements behavior for PersistentVolumeClaim objects diff --git a/pkg/registry/pod/etcd/etcd.go b/pkg/registry/pod/etcd/etcd.go index 1c8391bda2..f0e4b3b4fa 100644 --- a/pkg/registry/pod/etcd/etcd.go +++ b/pkg/registry/pod/etcd/etcd.go @@ -22,21 +22,21 @@ import ( "net/url" "path" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - etcderr "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/capabilities" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - genericrest "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/pod" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + etcderr "k8s.io/kubernetes/pkg/api/errors/etcd" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/capabilities" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + genericrest "k8s.io/kubernetes/pkg/registry/generic/rest" + "k8s.io/kubernetes/pkg/registry/pod" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // PodStorage includes storage for pods and all sub resources diff --git a/pkg/registry/pod/etcd/etcd_test.go b/pkg/registry/pod/etcd/etcd_test.go index e8999e63a6..dad7e53843 100644 --- a/pkg/registry/pod/etcd/etcd_test.go +++ b/pkg/registry/pod/etcd/etcd_test.go @@ -22,22 +22,22 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - etcderrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest/resttest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/pod" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/securitycontext" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + etcderrors "k8s.io/kubernetes/pkg/api/errors/etcd" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/api/rest/resttest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/pod" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/securitycontext" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/util" "github.com/coreos/go-etcd/etcd" ) diff --git a/pkg/registry/pod/registry.go b/pkg/registry/pod/registry.go index 2d03dd559b..23cebb09bf 100644 --- a/pkg/registry/pod/registry.go +++ b/pkg/registry/pod/registry.go @@ -17,11 +17,11 @@ limitations under the License. package pod import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Registry is an interface implemented by things that know how to store Pod objects. diff --git a/pkg/registry/pod/rest.go b/pkg/registry/pod/rest.go index e5bcd5807d..e62d7ab27a 100644 --- a/pkg/registry/pod/rest.go +++ b/pkg/registry/pod/rest.go @@ -22,16 +22,16 @@ import ( "net/http" "net/url" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // podStrategy implements behavior for Pods diff --git a/pkg/registry/podtemplate/etcd/etcd.go b/pkg/registry/podtemplate/etcd/etcd.go index 96d49695b9..82d2686ff7 100644 --- a/pkg/registry/podtemplate/etcd/etcd.go +++ b/pkg/registry/podtemplate/etcd/etcd.go @@ -17,14 +17,14 @@ limitations under the License. package etcd import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/podtemplate" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/registry/podtemplate" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" ) // rest implements a RESTStorage for pod templates against etcd diff --git a/pkg/registry/podtemplate/etcd/etcd_test.go b/pkg/registry/podtemplate/etcd/etcd_test.go index f6277c9ae8..da3ab828e4 100644 --- a/pkg/registry/podtemplate/etcd/etcd_test.go +++ b/pkg/registry/podtemplate/etcd/etcd_test.go @@ -19,13 +19,13 @@ package etcd import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest/resttest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest/resttest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" ) func newEtcdStorage(t *testing.T) (*tools.FakeEtcdClient, storage.Interface) { diff --git a/pkg/registry/podtemplate/rest.go b/pkg/registry/podtemplate/rest.go index 982f516d84..d28300e986 100644 --- a/pkg/registry/podtemplate/rest.go +++ b/pkg/registry/podtemplate/rest.go @@ -19,13 +19,13 @@ package podtemplate import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - errs "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + errs "k8s.io/kubernetes/pkg/util/fielderrors" ) // podTemplateStrategy implements behavior for PodTemplates diff --git a/pkg/registry/registrytest/controller.go b/pkg/registry/registrytest/controller.go index 65a768b7e0..cfaf03ba60 100644 --- a/pkg/registry/registrytest/controller.go +++ b/pkg/registry/registrytest/controller.go @@ -19,10 +19,10 @@ package registrytest import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // TODO: Why do we have this AND MemoryRegistry? diff --git a/pkg/registry/registrytest/endpoint.go b/pkg/registry/registrytest/endpoint.go index fa01987532..22855f8a2b 100644 --- a/pkg/registry/registrytest/endpoint.go +++ b/pkg/registry/registrytest/endpoint.go @@ -20,11 +20,11 @@ import ( "fmt" "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Registry is an interface for things that know how to store endpoints. diff --git a/pkg/registry/registrytest/generic.go b/pkg/registry/registrytest/generic.go index d7183c590b..692d7da135 100644 --- a/pkg/registry/registrytest/generic.go +++ b/pkg/registry/registrytest/generic.go @@ -19,10 +19,10 @@ package registrytest import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) // GenericRegistry knows how to store & list any runtime.Object. diff --git a/pkg/registry/registrytest/minion.go b/pkg/registry/registrytest/minion.go index 15872f6c3b..7c0ba439e8 100644 --- a/pkg/registry/registrytest/minion.go +++ b/pkg/registry/registrytest/minion.go @@ -19,11 +19,11 @@ package registrytest import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // MinionRegistry implements minion.Registry interface. diff --git a/pkg/registry/registrytest/pod.go b/pkg/registry/registrytest/pod.go index 1e722a3796..5cefa4bccf 100644 --- a/pkg/registry/registrytest/pod.go +++ b/pkg/registry/registrytest/pod.go @@ -19,10 +19,10 @@ package registrytest import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) type PodRegistry struct { diff --git a/pkg/registry/registrytest/scheduler.go b/pkg/registry/registrytest/scheduler.go index 4502c47e35..93700b8a3e 100644 --- a/pkg/registry/registrytest/scheduler.go +++ b/pkg/registry/registrytest/scheduler.go @@ -17,8 +17,8 @@ limitations under the License. package registrytest import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) type Scheduler struct { diff --git a/pkg/registry/registrytest/service.go b/pkg/registry/registrytest/service.go index 2cbcdca482..3b49d39eb8 100644 --- a/pkg/registry/registrytest/service.go +++ b/pkg/registry/registrytest/service.go @@ -19,10 +19,10 @@ package registrytest import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) func NewServiceRegistry() *ServiceRegistry { diff --git a/pkg/registry/resourcequota/etcd/etcd.go b/pkg/registry/resourcequota/etcd/etcd.go index 11225fcf0a..29b9e7968c 100644 --- a/pkg/registry/resourcequota/etcd/etcd.go +++ b/pkg/registry/resourcequota/etcd/etcd.go @@ -17,14 +17,14 @@ limitations under the License. package etcd import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/resourcequota" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/registry/resourcequota" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" ) // rest implements a RESTStorage for resourcequotas against etcd diff --git a/pkg/registry/resourcequota/etcd/etcd_test.go b/pkg/registry/resourcequota/etcd/etcd_test.go index 1b195d50a6..912bc683db 100644 --- a/pkg/registry/resourcequota/etcd/etcd_test.go +++ b/pkg/registry/resourcequota/etcd/etcd_test.go @@ -22,20 +22,20 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest/resttest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/resourcequota" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/rest/resttest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/resourcequota" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/util" "github.com/coreos/go-etcd/etcd" ) diff --git a/pkg/registry/resourcequota/registry.go b/pkg/registry/resourcequota/registry.go index 45dfa7a852..899a731a09 100644 --- a/pkg/registry/resourcequota/registry.go +++ b/pkg/registry/resourcequota/registry.go @@ -17,11 +17,11 @@ limitations under the License. package resourcequota import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Registry is an interface implemented by things that know how to store ResourceQuota objects. diff --git a/pkg/registry/resourcequota/rest.go b/pkg/registry/resourcequota/rest.go index ae256e1f1a..5bcc36d86c 100644 --- a/pkg/registry/resourcequota/rest.go +++ b/pkg/registry/resourcequota/rest.go @@ -19,13 +19,13 @@ package resourcequota import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // resourcequotaStrategy implements behavior for ResourceQuota objects diff --git a/pkg/registry/resourcequota/rest_test.go b/pkg/registry/resourcequota/rest_test.go index f5901c1985..32d1f71a30 100644 --- a/pkg/registry/resourcequota/rest_test.go +++ b/pkg/registry/resourcequota/rest_test.go @@ -19,8 +19,8 @@ package resourcequota import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" ) func TestResourceQuotaStrategy(t *testing.T) { diff --git a/pkg/registry/secret/etcd/etcd.go b/pkg/registry/secret/etcd/etcd.go index 6d678c351e..9b8655840d 100644 --- a/pkg/registry/secret/etcd/etcd.go +++ b/pkg/registry/secret/etcd/etcd.go @@ -17,14 +17,14 @@ limitations under the License. package etcd import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/secret" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/registry/secret" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" ) // REST implements a RESTStorage for secrets against etcd diff --git a/pkg/registry/secret/etcd/etcd_test.go b/pkg/registry/secret/etcd/etcd_test.go index 6a32e5dee6..99535ef093 100644 --- a/pkg/registry/secret/etcd/etcd_test.go +++ b/pkg/registry/secret/etcd/etcd_test.go @@ -19,13 +19,13 @@ package etcd import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest/resttest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest/resttest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" ) func newEtcdStorage(t *testing.T) (*tools.FakeEtcdClient, storage.Interface) { diff --git a/pkg/registry/secret/registry.go b/pkg/registry/secret/registry.go index 1f6f67cd10..1ec4b8c244 100644 --- a/pkg/registry/secret/registry.go +++ b/pkg/registry/secret/registry.go @@ -17,11 +17,11 @@ limitations under the License. package secret import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Registry is an interface implemented by things that know how to store Secret objects. diff --git a/pkg/registry/secret/strategy.go b/pkg/registry/secret/strategy.go index 942d0be1d7..c4921808eb 100644 --- a/pkg/registry/secret/strategy.go +++ b/pkg/registry/secret/strategy.go @@ -19,14 +19,14 @@ package secret import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // strategy implements behavior for Secret objects diff --git a/pkg/registry/service/allocator/etcd/etcd.go b/pkg/registry/service/allocator/etcd/etcd.go index 57d45721b6..2a5b3e8aa7 100644 --- a/pkg/registry/service/allocator/etcd/etcd.go +++ b/pkg/registry/service/allocator/etcd/etcd.go @@ -21,14 +21,14 @@ import ( "fmt" "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - k8serr "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - etcderr "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/allocator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/api" + k8serr "k8s.io/kubernetes/pkg/api/errors" + etcderr "k8s.io/kubernetes/pkg/api/errors/etcd" + "k8s.io/kubernetes/pkg/registry/service" + "k8s.io/kubernetes/pkg/registry/service/allocator" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" ) var ( diff --git a/pkg/registry/service/allocator/etcd/etcd_test.go b/pkg/registry/service/allocator/etcd/etcd_test.go index a3ff425db5..8eaf5d08ad 100644 --- a/pkg/registry/service/allocator/etcd/etcd_test.go +++ b/pkg/registry/service/allocator/etcd/etcd_test.go @@ -22,14 +22,14 @@ import ( "github.com/coreos/go-etcd/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/allocator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/registry/service/allocator" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" ) func newEtcdStorage(t *testing.T) (*tools.FakeEtcdClient, storage.Interface) { diff --git a/pkg/registry/service/ipallocator/allocator.go b/pkg/registry/service/ipallocator/allocator.go index 40f12575da..7de40f49b8 100644 --- a/pkg/registry/service/ipallocator/allocator.go +++ b/pkg/registry/service/ipallocator/allocator.go @@ -19,8 +19,8 @@ package ipallocator import ( "errors" "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/allocator" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/registry/service/allocator" "math/big" "net" ) diff --git a/pkg/registry/service/ipallocator/allocator_test.go b/pkg/registry/service/ipallocator/allocator_test.go index 39c54f5744..3d84053449 100644 --- a/pkg/registry/service/ipallocator/allocator_test.go +++ b/pkg/registry/service/ipallocator/allocator_test.go @@ -20,8 +20,8 @@ import ( "net" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" ) func TestAllocate(t *testing.T) { diff --git a/pkg/registry/service/ipallocator/controller/repair.go b/pkg/registry/service/ipallocator/controller/repair.go index d3cfc1f821..3cc036cda3 100644 --- a/pkg/registry/service/ipallocator/controller/repair.go +++ b/pkg/registry/service/ipallocator/controller/repair.go @@ -21,10 +21,10 @@ import ( "net" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/ipallocator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/registry/service" + "k8s.io/kubernetes/pkg/registry/service/ipallocator" + "k8s.io/kubernetes/pkg/util" ) // Repair is a controller loop that periodically examines all service ClusterIP allocations diff --git a/pkg/registry/service/ipallocator/controller/repair_test.go b/pkg/registry/service/ipallocator/controller/repair_test.go index d944894470..4d80f10b55 100644 --- a/pkg/registry/service/ipallocator/controller/repair_test.go +++ b/pkg/registry/service/ipallocator/controller/repair_test.go @@ -22,9 +22,9 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/registrytest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/ipallocator" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/registry/registrytest" + "k8s.io/kubernetes/pkg/registry/service/ipallocator" ) type mockRangeRegistry struct { diff --git a/pkg/registry/service/ipallocator/etcd/etcd_test.go b/pkg/registry/service/ipallocator/etcd/etcd_test.go index e85d9119b8..d0cd0c865a 100644 --- a/pkg/registry/service/ipallocator/etcd/etcd_test.go +++ b/pkg/registry/service/ipallocator/etcd/etcd_test.go @@ -23,16 +23,16 @@ import ( "github.com/coreos/go-etcd/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/allocator" - allocator_etcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/allocator/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/ipallocator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/registry/service/allocator" + allocator_etcd "k8s.io/kubernetes/pkg/registry/service/allocator/etcd" + "k8s.io/kubernetes/pkg/registry/service/ipallocator" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" ) func newEtcdStorage(t *testing.T) (*tools.FakeEtcdClient, storage.Interface) { diff --git a/pkg/registry/service/portallocator/allocator.go b/pkg/registry/service/portallocator/allocator.go index 448cfd623a..c792b5728b 100644 --- a/pkg/registry/service/portallocator/allocator.go +++ b/pkg/registry/service/portallocator/allocator.go @@ -19,9 +19,9 @@ package portallocator import ( "errors" "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/allocator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/registry/service/allocator" + "k8s.io/kubernetes/pkg/util" ) // Interface manages the allocation of ports out of a range. Interface diff --git a/pkg/registry/service/portallocator/allocator_test.go b/pkg/registry/service/portallocator/allocator_test.go index 6a34024c28..f6890a61d7 100644 --- a/pkg/registry/service/portallocator/allocator_test.go +++ b/pkg/registry/service/portallocator/allocator_test.go @@ -19,8 +19,8 @@ package portallocator import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" "strconv" ) diff --git a/pkg/registry/service/portallocator/controller/repair.go b/pkg/registry/service/portallocator/controller/repair.go index c2c52da686..7ffb415ae7 100644 --- a/pkg/registry/service/portallocator/controller/repair.go +++ b/pkg/registry/service/portallocator/controller/repair.go @@ -20,10 +20,10 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/portallocator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/registry/service" + "k8s.io/kubernetes/pkg/registry/service/portallocator" + "k8s.io/kubernetes/pkg/util" ) // See ipallocator/controller/repair.go; this is a copy for ports. diff --git a/pkg/registry/service/registry.go b/pkg/registry/service/registry.go index 239fe47308..b918605bf1 100644 --- a/pkg/registry/service/registry.go +++ b/pkg/registry/service/registry.go @@ -17,10 +17,10 @@ limitations under the License. package service import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Registry is an interface for things that know how to store services. diff --git a/pkg/registry/service/rest.go b/pkg/registry/service/rest.go index fa8e972173..13106384f7 100644 --- a/pkg/registry/service/rest.go +++ b/pkg/registry/service/rest.go @@ -24,20 +24,20 @@ import ( "net/url" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/endpoint" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/minion" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/ipallocator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/portallocator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/endpoint" + "k8s.io/kubernetes/pkg/registry/minion" + "k8s.io/kubernetes/pkg/registry/service/ipallocator" + "k8s.io/kubernetes/pkg/registry/service/portallocator" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/watch" "github.com/golang/glog" ) diff --git a/pkg/registry/service/rest_test.go b/pkg/registry/service/rest_test.go index ec349e1b89..8c6b248cdf 100644 --- a/pkg/registry/service/rest_test.go +++ b/pkg/registry/service/rest_test.go @@ -21,16 +21,16 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest/resttest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/registrytest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/ipallocator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service/portallocator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/api/rest/resttest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/registrytest" + "k8s.io/kubernetes/pkg/registry/service/ipallocator" + "k8s.io/kubernetes/pkg/registry/service/portallocator" + "k8s.io/kubernetes/pkg/util" ) func NewTestREST(t *testing.T, endpoints *api.EndpointsList) (*REST, *registrytest.ServiceRegistry) { diff --git a/pkg/registry/serviceaccount/etcd/etcd.go b/pkg/registry/serviceaccount/etcd/etcd.go index 98e3bed856..30630586e2 100644 --- a/pkg/registry/serviceaccount/etcd/etcd.go +++ b/pkg/registry/serviceaccount/etcd/etcd.go @@ -17,14 +17,14 @@ limitations under the License. package etcd import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/serviceaccount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/registry/serviceaccount" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" ) // REST implements a RESTStorage for service accounts against etcd diff --git a/pkg/registry/serviceaccount/etcd/etcd_test.go b/pkg/registry/serviceaccount/etcd/etcd_test.go index 9f74985bd6..24d7d723c4 100644 --- a/pkg/registry/serviceaccount/etcd/etcd_test.go +++ b/pkg/registry/serviceaccount/etcd/etcd_test.go @@ -19,13 +19,13 @@ package etcd import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest/resttest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - etcdstorage "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest/resttest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/storage" + etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" ) func newEtcdStorage(t *testing.T) (*tools.FakeEtcdClient, storage.Interface) { diff --git a/pkg/registry/serviceaccount/registry.go b/pkg/registry/serviceaccount/registry.go index 9c79813e6e..85e5586dfa 100644 --- a/pkg/registry/serviceaccount/registry.go +++ b/pkg/registry/serviceaccount/registry.go @@ -17,11 +17,11 @@ limitations under the License. package serviceaccount import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/watch" ) // Registry is an interface implemented by things that know how to store ServiceAccount objects. diff --git a/pkg/registry/serviceaccount/strategy.go b/pkg/registry/serviceaccount/strategy.go index 54c593da35..85a0c493f3 100644 --- a/pkg/registry/serviceaccount/strategy.go +++ b/pkg/registry/serviceaccount/strategy.go @@ -19,13 +19,13 @@ package serviceaccount import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/validation" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/validation" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/generic" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/fielderrors" ) // strategy implements behavior for ServiceAccount objects diff --git a/pkg/runtime/codec.go b/pkg/runtime/codec.go index 03eb39a67c..8577b02dbb 100644 --- a/pkg/runtime/codec.go +++ b/pkg/runtime/codec.go @@ -17,7 +17,7 @@ limitations under the License. package runtime import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/yaml" + "k8s.io/kubernetes/pkg/util/yaml" ) // CodecFor returns a Codec that invokes Encode with the provided version. diff --git a/pkg/runtime/conversion.go b/pkg/runtime/conversion.go index bd2878ad92..c13d9d042d 100644 --- a/pkg/runtime/conversion.go +++ b/pkg/runtime/conversion.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/conversion" ) // JSONKeyMapper uses the struct tags on a conversion to determine the key value for diff --git a/pkg/runtime/conversion_generation_test.go b/pkg/runtime/conversion_generation_test.go index 1fd0c4da02..d6960cda54 100644 --- a/pkg/runtime/conversion_generation_test.go +++ b/pkg/runtime/conversion_generation_test.go @@ -26,17 +26,17 @@ import ( "path" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + _ "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) func generateConversions(t *testing.T, version string) bytes.Buffer { - g := runtime.NewConversionGenerator(api.Scheme.Raw(), path.Join("github.com/GoogleCloudPlatform/kubernetes/pkg/api", version)) - apiShort := g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api") - g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource") + g := runtime.NewConversionGenerator(api.Scheme.Raw(), path.Join("k8s.io/kubernetes/pkg/api", version)) + apiShort := g.AddImport("k8s.io/kubernetes/pkg/api") + g.AddImport("k8s.io/kubernetes/pkg/api/resource") // TODO(wojtek-t): Change the overwrites to a flag. g.OverwritePackage(version, "") for _, knownType := range api.Scheme.KnownTypes(version) { diff --git a/pkg/runtime/conversion_generator.go b/pkg/runtime/conversion_generator.go index a84a9893cc..be940893a4 100644 --- a/pkg/runtime/conversion_generator.go +++ b/pkg/runtime/conversion_generator.go @@ -24,8 +24,8 @@ import ( "sort" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/util" ) type ConversionGenerator interface { @@ -50,7 +50,7 @@ func NewConversionGenerator(scheme *conversion.Scheme, targetPkg string) Convers } g.targetPackage(targetPkg) g.AddImport("reflect") - g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/conversion") + g.AddImport("k8s.io/kubernetes/pkg/conversion") return g } diff --git a/pkg/runtime/conversion_test.go b/pkg/runtime/conversion_test.go index 54809911a7..b3dcc561c2 100644 --- a/pkg/runtime/conversion_test.go +++ b/pkg/runtime/conversion_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" ) type InternalComplex struct { diff --git a/pkg/runtime/deep_copy_generation_test.go b/pkg/runtime/deep_copy_generation_test.go index 06a042ecc4..239b4aa77f 100644 --- a/pkg/runtime/deep_copy_generation_test.go +++ b/pkg/runtime/deep_copy_generation_test.go @@ -25,11 +25,11 @@ import ( "path" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - _ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + _ "k8s.io/kubernetes/pkg/api/v1" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) @@ -42,8 +42,8 @@ func generateDeepCopies(t *testing.T, version string) bytes.Buffer { registerTo = "Scheme" } - g := runtime.NewDeepCopyGenerator(api.Scheme.Raw(), path.Join("github.com/GoogleCloudPlatform/kubernetes/pkg/api", testedVersion), util.NewStringSet("github.com/GoogleCloudPlatform/kubernetes")) - g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api") + g := runtime.NewDeepCopyGenerator(api.Scheme.Raw(), path.Join("k8s.io/kubernetes/pkg/api", testedVersion), util.NewStringSet("k8s.io/kubernetes")) + g.AddImport("k8s.io/kubernetes/pkg/api") g.OverwritePackage(version, "") for _, knownType := range api.Scheme.KnownTypes(testedVersion) { diff --git a/pkg/runtime/deep_copy_generator.go b/pkg/runtime/deep_copy_generator.go index 20d931caa0..0b05d1470f 100644 --- a/pkg/runtime/deep_copy_generator.go +++ b/pkg/runtime/deep_copy_generator.go @@ -24,8 +24,8 @@ import ( "sort" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/util" ) // TODO(wojtek-t): As suggested in #8320, we should consider the strategy @@ -81,7 +81,7 @@ func NewDeepCopyGenerator(scheme *conversion.Scheme, targetPkg string, include u include: include, } g.targetPackage(targetPkg) - g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/conversion") + g.AddImport("k8s.io/kubernetes/pkg/conversion") return g } diff --git a/pkg/runtime/embedded_test.go b/pkg/runtime/embedded_test.go index 8341fd9d66..8d1ab76665 100644 --- a/pkg/runtime/embedded_test.go +++ b/pkg/runtime/embedded_test.go @@ -21,9 +21,9 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" ) type EmbeddedTest struct { diff --git a/pkg/runtime/error.go b/pkg/runtime/error.go index 843a1f91af..40fa2437a6 100644 --- a/pkg/runtime/error.go +++ b/pkg/runtime/error.go @@ -17,7 +17,7 @@ limitations under the License. package runtime import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/conversion" ) // IsNotRegisteredError returns true if the error indicates the provided diff --git a/pkg/runtime/extension_test.go b/pkg/runtime/extension_test.go index 72361dd808..3d8a087a93 100644 --- a/pkg/runtime/extension_test.go +++ b/pkg/runtime/extension_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" ) func TestEmbeddedRawExtensionMarshal(t *testing.T) { diff --git a/pkg/runtime/helper.go b/pkg/runtime/helper.go index 8d4875fe14..7a3c266a78 100644 --- a/pkg/runtime/helper.go +++ b/pkg/runtime/helper.go @@ -20,7 +20,7 @@ import ( "fmt" "reflect" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/conversion" ) // IsListType returns true if the provided Object has a slice called Items diff --git a/pkg/runtime/helper_test.go b/pkg/runtime/helper_test.go index a321ac412b..c60ec310dd 100644 --- a/pkg/runtime/helper_test.go +++ b/pkg/runtime/helper_test.go @@ -20,10 +20,10 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" "github.com/google/gofuzz" ) diff --git a/pkg/runtime/scheme.go b/pkg/runtime/scheme.go index 5d0e9d3a81..a5620794c7 100644 --- a/pkg/runtime/scheme.go +++ b/pkg/runtime/scheme.go @@ -22,7 +22,7 @@ import ( "net/url" "reflect" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/conversion" ) // Scheme defines methods for serializing and deserializing API objects. It diff --git a/pkg/runtime/scheme_test.go b/pkg/runtime/scheme_test.go index eea34b64b1..8eaebcfa88 100644 --- a/pkg/runtime/scheme_test.go +++ b/pkg/runtime/scheme_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/runtime" ) type TypeMeta struct { diff --git a/pkg/runtime/unstructured.go b/pkg/runtime/unstructured.go index 13745f29f7..737026ea18 100644 --- a/pkg/runtime/unstructured.go +++ b/pkg/runtime/unstructured.go @@ -21,7 +21,7 @@ import ( "fmt" "reflect" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/conversion" ) // UnstructuredJSONScheme is capable of converting JSON data into the Unstructured diff --git a/pkg/runtime/unstructured_test.go b/pkg/runtime/unstructured_test.go index 2d16b33b84..2d9b884cfb 100644 --- a/pkg/runtime/unstructured_test.go +++ b/pkg/runtime/unstructured_test.go @@ -20,9 +20,9 @@ import ( "fmt" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/runtime" ) func TestDecodeUnstructured(t *testing.T) { diff --git a/pkg/securitycontext/fake.go b/pkg/securitycontext/fake.go index 02e4d746e6..5c77f525c6 100644 --- a/pkg/securitycontext/fake.go +++ b/pkg/securitycontext/fake.go @@ -17,7 +17,7 @@ limitations under the License. package securitycontext import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" docker "github.com/fsouza/go-dockerclient" ) diff --git a/pkg/securitycontext/provider.go b/pkg/securitycontext/provider.go index 5cdbf5aae0..9e5d6beb82 100644 --- a/pkg/securitycontext/provider.go +++ b/pkg/securitycontext/provider.go @@ -20,7 +20,7 @@ import ( "fmt" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" docker "github.com/fsouza/go-dockerclient" ) diff --git a/pkg/securitycontext/provider_test.go b/pkg/securitycontext/provider_test.go index 35b8c4d7d5..55cf634524 100644 --- a/pkg/securitycontext/provider_test.go +++ b/pkg/securitycontext/provider_test.go @@ -22,7 +22,7 @@ import ( "strconv" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" docker "github.com/fsouza/go-dockerclient" ) diff --git a/pkg/securitycontext/types.go b/pkg/securitycontext/types.go index d39f5344b0..0e262ba380 100644 --- a/pkg/securitycontext/types.go +++ b/pkg/securitycontext/types.go @@ -17,7 +17,7 @@ limitations under the License. package securitycontext import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" docker "github.com/fsouza/go-dockerclient" ) diff --git a/pkg/securitycontext/util.go b/pkg/securitycontext/util.go index fcdf0ae467..e9da03d13c 100644 --- a/pkg/securitycontext/util.go +++ b/pkg/securitycontext/util.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // HasPrivilegedRequest returns the value of SecurityContext.Privileged, taking into account diff --git a/pkg/securitycontext/util_test.go b/pkg/securitycontext/util_test.go index 978e1a6850..155707e5da 100644 --- a/pkg/securitycontext/util_test.go +++ b/pkg/securitycontext/util_test.go @@ -19,7 +19,7 @@ package securitycontext import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) func TestParseSELinuxOptions(t *testing.T) { diff --git a/pkg/storage/etcd/api_object_versioner.go b/pkg/storage/etcd/api_object_versioner.go index 41a605f33e..569a33fe80 100644 --- a/pkg/storage/etcd/api_object_versioner.go +++ b/pkg/storage/etcd/api_object_versioner.go @@ -20,10 +20,10 @@ import ( "strconv" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/util" ) // APIObjectVersioner implements versioning and extracting etcd node information diff --git a/pkg/storage/etcd/api_object_versioner_test.go b/pkg/storage/etcd/api_object_versioner_test.go index 3e3129ce1a..37d20d55fc 100644 --- a/pkg/storage/etcd/api_object_versioner_test.go +++ b/pkg/storage/etcd/api_object_versioner_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" ) func TestObjectVersioner(t *testing.T) { diff --git a/pkg/storage/etcd/etcd_helper.go b/pkg/storage/etcd/etcd_helper.go index 31704bd77c..19b453bb65 100644 --- a/pkg/storage/etcd/etcd_helper.go +++ b/pkg/storage/etcd/etcd_helper.go @@ -24,14 +24,14 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/metrics" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/metrics" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" "github.com/coreos/go-etcd/etcd" "github.com/golang/glog" diff --git a/pkg/storage/etcd/etcd_helper_test.go b/pkg/storage/etcd/etcd_helper_test.go index 4fa597fb0e..ff634d6fac 100644 --- a/pkg/storage/etcd/etcd_helper_test.go +++ b/pkg/storage/etcd/etcd_helper_test.go @@ -30,13 +30,13 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/conversion" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" "github.com/coreos/go-etcd/etcd" "github.com/stretchr/testify/assert" ) diff --git a/pkg/storage/etcd/etcd_util.go b/pkg/storage/etcd/etcd_util.go index c5f0231d05..cf5543c4de 100644 --- a/pkg/storage/etcd/etcd_util.go +++ b/pkg/storage/etcd/etcd_util.go @@ -23,7 +23,7 @@ import ( "net/http" "os/exec" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools" goetcd "github.com/coreos/go-etcd/etcd" "github.com/golang/glog" diff --git a/pkg/storage/etcd/etcd_watcher.go b/pkg/storage/etcd/etcd_watcher.go index 403709712b..7a92db7e8c 100644 --- a/pkg/storage/etcd/etcd_watcher.go +++ b/pkg/storage/etcd/etcd_watcher.go @@ -20,12 +20,12 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" "github.com/coreos/go-etcd/etcd" "github.com/golang/glog" diff --git a/pkg/storage/etcd/etcd_watcher_test.go b/pkg/storage/etcd/etcd_watcher_test.go index 5edfde8d69..9f812f7d57 100644 --- a/pkg/storage/etcd/etcd_watcher_test.go +++ b/pkg/storage/etcd/etcd_watcher_test.go @@ -21,13 +21,13 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/tools" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/watch" "github.com/coreos/go-etcd/etcd" ) diff --git a/pkg/storage/interfaces.go b/pkg/storage/interfaces.go index a30c4b1e2f..ccdff1ae4b 100644 --- a/pkg/storage/interfaces.go +++ b/pkg/storage/interfaces.go @@ -19,8 +19,8 @@ package storage import ( "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) // Versioner abstracts setting and retrieving metadata fields from database response diff --git a/pkg/storage/util.go b/pkg/storage/util.go index e95735e2ac..e1efca9bc7 100644 --- a/pkg/storage/util.go +++ b/pkg/storage/util.go @@ -19,9 +19,9 @@ package storage import ( "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/fielderrors" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/fielderrors" ) type SimpleUpdateFunc func(runtime.Object) (runtime.Object, error) diff --git a/pkg/storage/util_test.go b/pkg/storage/util_test.go index 4445b6c1db..1de4f10679 100644 --- a/pkg/storage/util_test.go +++ b/pkg/storage/util_test.go @@ -19,7 +19,7 @@ package storage import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/errors" ) func TestEtcdParseWatchResourceVersion(t *testing.T) { diff --git a/pkg/ui/installsupport.go b/pkg/ui/installsupport.go index 1503681ac2..d1c02dcb58 100644 --- a/pkg/ui/installsupport.go +++ b/pkg/ui/installsupport.go @@ -20,7 +20,7 @@ import ( "mime" "net/http" - "github.com/GoogleCloudPlatform/kubernetes/pkg/ui/data/swagger" + "k8s.io/kubernetes/pkg/ui/data/swagger" assetfs "github.com/elazarl/go-bindata-assetfs" ) diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index 2980f6e438..788773839d 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -19,7 +19,7 @@ package config import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) type Merger interface { diff --git a/pkg/util/fielderrors/fielderrors.go b/pkg/util/fielderrors/fielderrors.go index 328dea5bef..66383443af 100644 --- a/pkg/util/fielderrors/fielderrors.go +++ b/pkg/util/fielderrors/fielderrors.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/util/errors" "github.com/davecgh/go-spew/spew" "github.com/golang/glog" diff --git a/pkg/util/httpstream/spdy/connection.go b/pkg/util/httpstream/spdy/connection.go index 333094c934..24665235f5 100644 --- a/pkg/util/httpstream/spdy/connection.go +++ b/pkg/util/httpstream/spdy/connection.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" + "k8s.io/kubernetes/pkg/util/httpstream" "github.com/docker/spdystream" "github.com/golang/glog" ) diff --git a/pkg/util/httpstream/spdy/roundtripper.go b/pkg/util/httpstream/spdy/roundtripper.go index c875dca2c9..4629452858 100644 --- a/pkg/util/httpstream/spdy/roundtripper.go +++ b/pkg/util/httpstream/spdy/roundtripper.go @@ -25,10 +25,10 @@ import ( "net/http" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" - "github.com/GoogleCloudPlatform/kubernetes/third_party/golang/netutil" + "k8s.io/kubernetes/pkg/api" + apierrors "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/util/httpstream" + "k8s.io/kubernetes/third_party/golang/netutil" ) // SpdyRoundTripper knows how to upgrade an HTTP request to one that supports diff --git a/pkg/util/httpstream/spdy/roundtripper_test.go b/pkg/util/httpstream/spdy/roundtripper_test.go index 8713b73614..d7fd0efe5d 100644 --- a/pkg/util/httpstream/spdy/roundtripper_test.go +++ b/pkg/util/httpstream/spdy/roundtripper_test.go @@ -32,7 +32,7 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" + "k8s.io/kubernetes/pkg/util/httpstream" ) func TestRoundTripAndNewConnection(t *testing.T) { diff --git a/pkg/util/httpstream/spdy/upgrade.go b/pkg/util/httpstream/spdy/upgrade.go index 5b521261a5..a2e223132f 100644 --- a/pkg/util/httpstream/spdy/upgrade.go +++ b/pkg/util/httpstream/spdy/upgrade.go @@ -21,7 +21,7 @@ import ( "net/http" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/httpstream" + "k8s.io/kubernetes/pkg/util/httpstream" "github.com/golang/glog" ) diff --git a/pkg/util/iptables/iptables.go b/pkg/util/iptables/iptables.go index abf3fbb475..2f3996f2e2 100644 --- a/pkg/util/iptables/iptables.go +++ b/pkg/util/iptables/iptables.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - utilexec "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util" + utilexec "k8s.io/kubernetes/pkg/util/exec" "github.com/golang/glog" ) diff --git a/pkg/util/iptables/iptables_test.go b/pkg/util/iptables/iptables_test.go index 63478a000a..b64f25e476 100644 --- a/pkg/util/iptables/iptables_test.go +++ b/pkg/util/iptables/iptables_test.go @@ -19,8 +19,8 @@ package iptables import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/exec" ) func getIptablesCommand(protocol Protocol) string { diff --git a/pkg/util/jsonpath/jsonpath.go b/pkg/util/jsonpath/jsonpath.go index af5d560e14..9404cea1a3 100644 --- a/pkg/util/jsonpath/jsonpath.go +++ b/pkg/util/jsonpath/jsonpath.go @@ -23,7 +23,7 @@ import ( "reflect" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/third_party/golang/template" + "k8s.io/kubernetes/third_party/golang/template" ) type JSONPath struct { diff --git a/pkg/util/mount/nsenter_mount.go b/pkg/util/mount/nsenter_mount.go index a8a2fff961..cfada0a30f 100644 --- a/pkg/util/mount/nsenter_mount.go +++ b/pkg/util/mount/nsenter_mount.go @@ -23,7 +23,7 @@ import ( "path/filepath" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util/exec" "github.com/golang/glog" ) diff --git a/pkg/util/node/node.go b/pkg/util/node/node.go index 15f7ca6c13..0245e868c1 100644 --- a/pkg/util/node/node.go +++ b/pkg/util/node/node.go @@ -22,7 +22,7 @@ import ( "os/exec" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" "github.com/golang/glog" ) diff --git a/pkg/util/proxy/transport.go b/pkg/util/proxy/transport.go index aa9d3cff68..d0a19be482 100644 --- a/pkg/util/proxy/transport.go +++ b/pkg/util/proxy/transport.go @@ -31,7 +31,7 @@ import ( "golang.org/x/net/html" "golang.org/x/net/html/atom" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util" ) // atomsToAttrs states which attributes of which tags require URL substitution. diff --git a/pkg/util/strategicpatch/patch.go b/pkg/util/strategicpatch/patch.go index 54315e27f9..2bb6494d90 100644 --- a/pkg/util/strategicpatch/patch.go +++ b/pkg/util/strategicpatch/patch.go @@ -22,7 +22,7 @@ import ( "reflect" "sort" - forkedjson "github.com/GoogleCloudPlatform/kubernetes/third_party/forked/json" + forkedjson "k8s.io/kubernetes/third_party/forked/json" ) // An alternate implementation of JSON Merge Patch diff --git a/pkg/util/uuid.go b/pkg/util/uuid.go index e6f43546ef..c8ad861fd8 100644 --- a/pkg/util/uuid.go +++ b/pkg/util/uuid.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/types" "github.com/pborman/uuid" ) diff --git a/pkg/util/workqueue/queue_test.go b/pkg/util/workqueue/queue_test.go index fe59d3ea46..14f26c36bb 100644 --- a/pkg/util/workqueue/queue_test.go +++ b/pkg/util/workqueue/queue_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/workqueue" + "k8s.io/kubernetes/pkg/util/workqueue" ) func TestBasic(t *testing.T) { diff --git a/pkg/version/verflag/verflag.go b/pkg/version/verflag/verflag.go index bab85e7ce7..e4b72a1260 100644 --- a/pkg/version/verflag/verflag.go +++ b/pkg/version/verflag/verflag.go @@ -23,7 +23,7 @@ import ( "os" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version" + "k8s.io/kubernetes/pkg/version" flag "github.com/spf13/pflag" ) diff --git a/pkg/volume/aws_ebs/aws_ebs.go b/pkg/volume/aws_ebs/aws_ebs.go index b2342357a0..f6148e94b5 100644 --- a/pkg/volume/aws_ebs/aws_ebs.go +++ b/pkg/volume/aws_ebs/aws_ebs.go @@ -24,14 +24,14 @@ import ( "strconv" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/aws" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/cloudprovider/aws" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" "github.com/golang/glog" ) diff --git a/pkg/volume/aws_ebs/aws_ebs_test.go b/pkg/volume/aws_ebs/aws_ebs_test.go index ffe09b03d9..9c3e38be52 100644 --- a/pkg/volume/aws_ebs/aws_ebs_test.go +++ b/pkg/volume/aws_ebs/aws_ebs_test.go @@ -20,12 +20,12 @@ import ( "os" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" ) func TestCanSupport(t *testing.T) { diff --git a/pkg/volume/aws_ebs/aws_util.go b/pkg/volume/aws_ebs/aws_util.go index 5d1b0e6cda..d5dd96b7e6 100644 --- a/pkg/volume/aws_ebs/aws_util.go +++ b/pkg/volume/aws_ebs/aws_util.go @@ -22,8 +22,8 @@ import ( "os" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util/mount" "github.com/golang/glog" ) diff --git a/pkg/volume/aws_ebs/aws_util_test.go b/pkg/volume/aws_ebs/aws_util_test.go index 01fdef56a9..45652a2438 100644 --- a/pkg/volume/aws_ebs/aws_util_test.go +++ b/pkg/volume/aws_ebs/aws_util_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util/exec" ) func TestSafeFormatAndMount(t *testing.T) { diff --git a/pkg/volume/empty_dir/empty_dir.go b/pkg/volume/empty_dir/empty_dir.go index 0c4cca2f48..f8a3730ae4 100644 --- a/pkg/volume/empty_dir/empty_dir.go +++ b/pkg/volume/empty_dir/empty_dir.go @@ -21,12 +21,12 @@ import ( "os" "path" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" - volumeutil "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" + volumeutil "k8s.io/kubernetes/pkg/volume/util" "github.com/golang/glog" ) diff --git a/pkg/volume/empty_dir/empty_dir_linux.go b/pkg/volume/empty_dir/empty_dir_linux.go index 57b5e5fd21..95ed9e9754 100644 --- a/pkg/volume/empty_dir/empty_dir_linux.go +++ b/pkg/volume/empty_dir/empty_dir_linux.go @@ -22,7 +22,7 @@ import ( "fmt" "syscall" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/util/mount" "github.com/docker/libcontainer/selinux" "github.com/golang/glog" ) diff --git a/pkg/volume/empty_dir/empty_dir_test.go b/pkg/volume/empty_dir/empty_dir_test.go index 9c3aba5435..ab3d78f16d 100644 --- a/pkg/volume/empty_dir/empty_dir_test.go +++ b/pkg/volume/empty_dir/empty_dir_test.go @@ -22,11 +22,11 @@ import ( "path" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/volume/util" ) // Construct an instance of a plugin, by name. diff --git a/pkg/volume/empty_dir/empty_dir_unsupported.go b/pkg/volume/empty_dir/empty_dir_unsupported.go index 845fdea3c1..c73a8b777d 100644 --- a/pkg/volume/empty_dir/empty_dir_unsupported.go +++ b/pkg/volume/empty_dir/empty_dir_unsupported.go @@ -19,7 +19,7 @@ limitations under the License. package empty_dir import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/util/mount" ) // realMountDetector pretends to implement mediumer. diff --git a/pkg/volume/gce_pd/gce_pd.go b/pkg/volume/gce_pd/gce_pd.go index 8ef2dbeb30..3fea93c84e 100644 --- a/pkg/volume/gce_pd/gce_pd.go +++ b/pkg/volume/gce_pd/gce_pd.go @@ -21,12 +21,12 @@ import ( "path" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" "github.com/golang/glog" ) diff --git a/pkg/volume/gce_pd/gce_pd_test.go b/pkg/volume/gce_pd/gce_pd_test.go index c95b841ec7..ff99b8e756 100644 --- a/pkg/volume/gce_pd/gce_pd_test.go +++ b/pkg/volume/gce_pd/gce_pd_test.go @@ -20,12 +20,12 @@ import ( "os" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" ) func TestCanSupport(t *testing.T) { diff --git a/pkg/volume/gce_pd/gce_util.go b/pkg/volume/gce_pd/gce_util.go index 04bceb7fd8..aad712d47f 100644 --- a/pkg/volume/gce_pd/gce_util.go +++ b/pkg/volume/gce_pd/gce_util.go @@ -24,12 +24,12 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/gce" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/operationmanager" + "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/cloudprovider/gce" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/util/operationmanager" "github.com/golang/glog" ) diff --git a/pkg/volume/gce_pd/gce_util_test.go b/pkg/volume/gce_pd/gce_util_test.go index 7e84e3523d..a7275ac376 100644 --- a/pkg/volume/gce_pd/gce_util_test.go +++ b/pkg/volume/gce_pd/gce_util_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util/exec" ) func TestSafeFormatAndMount(t *testing.T) { diff --git a/pkg/volume/git_repo/git_repo.go b/pkg/volume/git_repo/git_repo.go index de431a5ce9..1c8bd86197 100644 --- a/pkg/volume/git_repo/git_repo.go +++ b/pkg/volume/git_repo/git_repo.go @@ -21,13 +21,13 @@ import ( "io/ioutil" "path" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" - volumeutil "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" + volumeutil "k8s.io/kubernetes/pkg/volume/util" ) // This is the primary entrypoint for volume plugins. diff --git a/pkg/volume/git_repo/git_repo_test.go b/pkg/volume/git_repo/git_repo_test.go index a785c7304f..397bed0425 100644 --- a/pkg/volume/git_repo/git_repo_test.go +++ b/pkg/volume/git_repo/git_repo_test.go @@ -24,12 +24,12 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/empty_dir" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/volume/empty_dir" ) func newTestHost(t *testing.T) volume.VolumeHost { diff --git a/pkg/volume/glusterfs/glusterfs.go b/pkg/volume/glusterfs/glusterfs.go index 70a20c7b58..8151334f16 100644 --- a/pkg/volume/glusterfs/glusterfs.go +++ b/pkg/volume/glusterfs/glusterfs.go @@ -20,12 +20,12 @@ import ( "math/rand" "os" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" "github.com/golang/glog" ) diff --git a/pkg/volume/glusterfs/glusterfs_test.go b/pkg/volume/glusterfs/glusterfs_test.go index 6961e09ab7..e752524523 100644 --- a/pkg/volume/glusterfs/glusterfs_test.go +++ b/pkg/volume/glusterfs/glusterfs_test.go @@ -20,13 +20,13 @@ import ( "os" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" ) func TestCanSupport(t *testing.T) { diff --git a/pkg/volume/host_path/host_path.go b/pkg/volume/host_path/host_path.go index 8693a37848..dd1aa5bbdb 100644 --- a/pkg/volume/host_path/host_path.go +++ b/pkg/volume/host_path/host_path.go @@ -19,11 +19,11 @@ package host_path import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" ) // This is the primary entrypoint for volume plugins. diff --git a/pkg/volume/host_path/host_path_test.go b/pkg/volume/host_path/host_path_test.go index 0d4ffa217a..0a7f569852 100644 --- a/pkg/volume/host_path/host_path_test.go +++ b/pkg/volume/host_path/host_path_test.go @@ -19,11 +19,11 @@ package host_path import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/volume" ) func TestCanSupport(t *testing.T) { diff --git a/pkg/volume/iscsi/disk_manager.go b/pkg/volume/iscsi/disk_manager.go index 17b453f670..17a073fec1 100644 --- a/pkg/volume/iscsi/disk_manager.go +++ b/pkg/volume/iscsi/disk_manager.go @@ -19,7 +19,7 @@ package iscsi import ( "os" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/util/mount" "github.com/golang/glog" ) diff --git a/pkg/volume/iscsi/iscsi.go b/pkg/volume/iscsi/iscsi.go index 05fdccd380..e7ba0697ba 100644 --- a/pkg/volume/iscsi/iscsi.go +++ b/pkg/volume/iscsi/iscsi.go @@ -19,12 +19,12 @@ package iscsi import ( "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" "github.com/golang/glog" ) diff --git a/pkg/volume/iscsi/iscsi_test.go b/pkg/volume/iscsi/iscsi_test.go index ce8b0f5d6c..1b780cdbaa 100644 --- a/pkg/volume/iscsi/iscsi_test.go +++ b/pkg/volume/iscsi/iscsi_test.go @@ -20,12 +20,12 @@ import ( "os" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" ) func TestCanSupport(t *testing.T) { diff --git a/pkg/volume/iscsi/iscsi_util.go b/pkg/volume/iscsi/iscsi_util.go index cfd5c26964..fdc4125122 100644 --- a/pkg/volume/iscsi/iscsi_util.go +++ b/pkg/volume/iscsi/iscsi_util.go @@ -23,8 +23,8 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" "github.com/golang/glog" ) diff --git a/pkg/volume/iscsi/iscsi_util_test.go b/pkg/volume/iscsi/iscsi_util_test.go index b0c132cd4c..d0531a9d7a 100644 --- a/pkg/volume/iscsi/iscsi_util_test.go +++ b/pkg/volume/iscsi/iscsi_util_test.go @@ -19,7 +19,7 @@ package iscsi import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/util/mount" ) func TestGetDevicePrefixRefCount(t *testing.T) { diff --git a/pkg/volume/nfs/nfs.go b/pkg/volume/nfs/nfs.go index 1a39554c25..cc51caed23 100644 --- a/pkg/volume/nfs/nfs.go +++ b/pkg/volume/nfs/nfs.go @@ -20,11 +20,11 @@ import ( "fmt" "os" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" "github.com/golang/glog" ) diff --git a/pkg/volume/nfs/nfs_test.go b/pkg/volume/nfs/nfs_test.go index f13575ca9a..1be1919505 100644 --- a/pkg/volume/nfs/nfs_test.go +++ b/pkg/volume/nfs/nfs_test.go @@ -20,12 +20,12 @@ import ( "os" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" ) func TestCanSupport(t *testing.T) { diff --git a/pkg/volume/persistent_claim/persistent_claim.go b/pkg/volume/persistent_claim/persistent_claim.go index 7a69cdc3a3..116f86674e 100644 --- a/pkg/volume/persistent_claim/persistent_claim.go +++ b/pkg/volume/persistent_claim/persistent_claim.go @@ -18,10 +18,10 @@ package persistent_claim import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" "github.com/golang/glog" ) diff --git a/pkg/volume/persistent_claim/persistent_claim_test.go b/pkg/volume/persistent_claim/persistent_claim_test.go index a325f9e8b1..d50a92ba90 100644 --- a/pkg/volume/persistent_claim/persistent_claim_test.go +++ b/pkg/volume/persistent_claim/persistent_claim_test.go @@ -22,14 +22,14 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/gce_pd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/host_path" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/volume/gce_pd" + "k8s.io/kubernetes/pkg/volume/host_path" ) func newTestHost(t *testing.T, fakeKubeClient client.Interface) volume.VolumeHost { diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go index 28f80bd3e8..c837f641cd 100644 --- a/pkg/volume/plugins.go +++ b/pkg/volume/plugins.go @@ -21,12 +21,12 @@ import ( "strings" "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/util/mount" "github.com/golang/glog" ) diff --git a/pkg/volume/plugins_test.go b/pkg/volume/plugins_test.go index a5930ac7eb..59f54156f7 100644 --- a/pkg/volume/plugins_test.go +++ b/pkg/volume/plugins_test.go @@ -19,7 +19,7 @@ package volume import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) func TestSpecSourceConverters(t *testing.T) { diff --git a/pkg/volume/rbd/disk_manager.go b/pkg/volume/rbd/disk_manager.go index d376957ae7..30cbd2a7b7 100644 --- a/pkg/volume/rbd/disk_manager.go +++ b/pkg/volume/rbd/disk_manager.go @@ -25,7 +25,7 @@ package rbd import ( "os" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/util/mount" "github.com/golang/glog" ) diff --git a/pkg/volume/rbd/rbd.go b/pkg/volume/rbd/rbd.go index e3a3296714..7f3ae1c198 100644 --- a/pkg/volume/rbd/rbd.go +++ b/pkg/volume/rbd/rbd.go @@ -19,12 +19,12 @@ package rbd import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/exec" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/exec" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" "github.com/golang/glog" ) diff --git a/pkg/volume/rbd/rbd_test.go b/pkg/volume/rbd/rbd_test.go index 507972288a..747c41dc56 100644 --- a/pkg/volume/rbd/rbd_test.go +++ b/pkg/volume/rbd/rbd_test.go @@ -20,12 +20,12 @@ import ( "os" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" ) func TestCanSupport(t *testing.T) { diff --git a/pkg/volume/rbd/rbd_util.go b/pkg/volume/rbd/rbd_util.go index 545a4b2abd..bbafe8e947 100644 --- a/pkg/volume/rbd/rbd_util.go +++ b/pkg/volume/rbd/rbd_util.go @@ -31,9 +31,9 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/node" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/util/node" + "k8s.io/kubernetes/pkg/volume" "github.com/golang/glog" ) diff --git a/pkg/volume/secret/secret.go b/pkg/volume/secret/secret.go index 83a4fff64d..28feb8da23 100644 --- a/pkg/volume/secret/secret.go +++ b/pkg/volume/secret/secret.go @@ -22,12 +22,12 @@ import ( "os" "path" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" - volumeutil "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" + volumeutil "k8s.io/kubernetes/pkg/volume/util" "github.com/golang/glog" ) diff --git a/pkg/volume/secret/secret_test.go b/pkg/volume/secret/secret_test.go index a29e4850a3..6ef8a734d4 100644 --- a/pkg/volume/secret/secret_test.go +++ b/pkg/volume/secret/secret_test.go @@ -24,14 +24,14 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/empty_dir" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/volume/empty_dir" + "k8s.io/kubernetes/pkg/volume/util" ) func newTestHost(t *testing.T, client client.Interface) (string, volume.VolumeHost) { diff --git a/pkg/volume/testing.go b/pkg/volume/testing.go index fa2f532ae5..a905cd8c60 100644 --- a/pkg/volume/testing.go +++ b/pkg/volume/testing.go @@ -20,11 +20,11 @@ import ( "os" "path" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/mount" ) // fakeVolumeHost is useful for testing volume plugins. diff --git a/pkg/volume/util.go b/pkg/volume/util.go index 4b59b71012..4dcad03388 100644 --- a/pkg/volume/util.go +++ b/pkg/volume/util.go @@ -20,13 +20,13 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" "github.com/golang/glog" ) diff --git a/pkg/volume/util_test.go b/pkg/volume/util_test.go index 2a4cf9a78f..8fe7810fb3 100644 --- a/pkg/volume/util_test.go +++ b/pkg/volume/util_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" "strings" ) diff --git a/pkg/volumeclaimbinder/persistent_volume_claim_binder.go b/pkg/volumeclaimbinder/persistent_volume_claim_binder.go index 8b4c94bfb2..1f607a4314 100644 --- a/pkg/volumeclaimbinder/persistent_volume_claim_binder.go +++ b/pkg/volumeclaimbinder/persistent_volume_claim_binder.go @@ -21,15 +21,15 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/controller/framework" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" "github.com/golang/glog" ) diff --git a/pkg/volumeclaimbinder/persistent_volume_claim_binder_test.go b/pkg/volumeclaimbinder/persistent_volume_claim_binder_test.go index 1a8548ef34..c2f9e896d4 100644 --- a/pkg/volumeclaimbinder/persistent_volume_claim_binder_test.go +++ b/pkg/volumeclaimbinder/persistent_volume_claim_binder_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume/host_path" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/volume/host_path" ) func TestRunStop(t *testing.T) { diff --git a/pkg/volumeclaimbinder/persistent_volume_index_test.go b/pkg/volumeclaimbinder/persistent_volume_index_test.go index 3a1556784e..025f94de85 100644 --- a/pkg/volumeclaimbinder/persistent_volume_index_test.go +++ b/pkg/volumeclaimbinder/persistent_volume_index_test.go @@ -19,8 +19,8 @@ package volumeclaimbinder import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" ) func TestMatchVolume(t *testing.T) { diff --git a/pkg/volumeclaimbinder/persistent_volume_recycler.go b/pkg/volumeclaimbinder/persistent_volume_recycler.go index a65131aa8b..0a28ae16c1 100644 --- a/pkg/volumeclaimbinder/persistent_volume_recycler.go +++ b/pkg/volumeclaimbinder/persistent_volume_recycler.go @@ -20,18 +20,18 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/controller/framework" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/watch" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/mount" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util/mount" "github.com/golang/glog" ) diff --git a/pkg/volumeclaimbinder/types.go b/pkg/volumeclaimbinder/types.go index b3f99b7510..635cded1d0 100644 --- a/pkg/volumeclaimbinder/types.go +++ b/pkg/volumeclaimbinder/types.go @@ -20,10 +20,10 @@ import ( "fmt" "sort" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volume" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/volume" ) // persistentVolumeOrderedIndex is a cache.Store that keeps persistent volumes indexed by AccessModes and ordered by storage capacity. diff --git a/pkg/watch/iowatcher.go b/pkg/watch/iowatcher.go index df311e2734..dc49f1214a 100644 --- a/pkg/watch/iowatcher.go +++ b/pkg/watch/iowatcher.go @@ -20,8 +20,8 @@ import ( "io" "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/pkg/watch/iowatcher_test.go b/pkg/watch/iowatcher_test.go index d13d314c68..90d0665cb8 100644 --- a/pkg/watch/iowatcher_test.go +++ b/pkg/watch/iowatcher_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" ) type fakeDecoder struct { diff --git a/pkg/watch/json/decoder.go b/pkg/watch/json/decoder.go index 905818e42e..f6c0924dd4 100644 --- a/pkg/watch/json/decoder.go +++ b/pkg/watch/json/decoder.go @@ -21,8 +21,8 @@ import ( "fmt" "io" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) // Decoder implements the watch.Decoder interface for io.ReadClosers that diff --git a/pkg/watch/json/decoder_test.go b/pkg/watch/json/decoder_test.go index 8d93cbe50b..7313616d5c 100644 --- a/pkg/watch/json/decoder_test.go +++ b/pkg/watch/json/decoder_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) func TestDecoder(t *testing.T) { diff --git a/pkg/watch/json/encoder.go b/pkg/watch/json/encoder.go index d64b246028..1110e9293f 100644 --- a/pkg/watch/json/encoder.go +++ b/pkg/watch/json/encoder.go @@ -20,8 +20,8 @@ import ( "encoding/json" "io" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) // Encoder implements the json.Encoder interface for io.Writers that diff --git a/pkg/watch/json/encoder_test.go b/pkg/watch/json/encoder_test.go index 9b6ece6572..c5a0cfd1c5 100644 --- a/pkg/watch/json/encoder_test.go +++ b/pkg/watch/json/encoder_test.go @@ -21,10 +21,10 @@ import ( "io/ioutil" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) func TestEncodeDecodeRoundTrip(t *testing.T) { diff --git a/pkg/watch/json/types.go b/pkg/watch/json/types.go index 559ba2e509..e75b48a3e5 100644 --- a/pkg/watch/json/types.go +++ b/pkg/watch/json/types.go @@ -21,8 +21,8 @@ import ( "fmt" "reflect" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) // WatchEvent objects are streamed from the api server in response to a watch request. diff --git a/pkg/watch/mux.go b/pkg/watch/mux.go index 7abfec3954..5299f7bf97 100644 --- a/pkg/watch/mux.go +++ b/pkg/watch/mux.go @@ -19,7 +19,7 @@ package watch import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" ) // FullChannelBehavior controls how the Broadcaster reacts if a watcher's watch diff --git a/pkg/watch/watch.go b/pkg/watch/watch.go index 018ae46f4c..93c34d936b 100644 --- a/pkg/watch/watch.go +++ b/pkg/watch/watch.go @@ -19,7 +19,7 @@ package watch import ( "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" ) // Interface can be implemented by anything that knows how to watch and report changes. diff --git a/plugin/cmd/kube-scheduler/app/server.go b/plugin/cmd/kube-scheduler/app/server.go index 921651cae5..0b308c9f07 100644 --- a/plugin/cmd/kube-scheduler/app/server.go +++ b/plugin/cmd/kube-scheduler/app/server.go @@ -26,19 +26,19 @@ import ( "os" "strconv" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler" - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithmprovider" - schedulerapi "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/api" - latestschedulerapi "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/factory" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/healthz" + "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/plugin/pkg/scheduler" + _ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" + schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" + latestschedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest" + "k8s.io/kubernetes/plugin/pkg/scheduler/factory" "github.com/golang/glog" "github.com/prometheus/client_golang/prometheus" diff --git a/plugin/cmd/kube-scheduler/scheduler.go b/plugin/cmd/kube-scheduler/scheduler.go index eefbbb0a67..8717102f59 100644 --- a/plugin/cmd/kube-scheduler/scheduler.go +++ b/plugin/cmd/kube-scheduler/scheduler.go @@ -19,10 +19,10 @@ package main import ( "runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/healthz" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag" - "github.com/GoogleCloudPlatform/kubernetes/plugin/cmd/kube-scheduler/app" + "k8s.io/kubernetes/pkg/healthz" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/version/verflag" + "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app" "github.com/spf13/pflag" ) diff --git a/plugin/pkg/admission/admit/admission.go b/plugin/pkg/admission/admit/admission.go index 29f0e8fe43..0984892f25 100644 --- a/plugin/pkg/admission/admit/admission.go +++ b/plugin/pkg/admission/admit/admission.go @@ -19,8 +19,8 @@ package admit import ( "io" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/client" ) func init() { diff --git a/plugin/pkg/admission/deny/admission.go b/plugin/pkg/admission/deny/admission.go index af3c8b0385..0d2b29977f 100644 --- a/plugin/pkg/admission/deny/admission.go +++ b/plugin/pkg/admission/deny/admission.go @@ -20,8 +20,8 @@ import ( "errors" "io" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/client" ) func init() { diff --git a/plugin/pkg/admission/deny/admission_test.go b/plugin/pkg/admission/deny/admission_test.go index 783614cc2e..c337f11508 100644 --- a/plugin/pkg/admission/deny/admission_test.go +++ b/plugin/pkg/admission/deny/admission_test.go @@ -19,7 +19,7 @@ package deny import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/admission" ) func TestAdmission(t *testing.T) { diff --git a/plugin/pkg/admission/exec/denyprivileged/admission.go b/plugin/pkg/admission/exec/denyprivileged/admission.go index a019198dfb..fb956f05ff 100644 --- a/plugin/pkg/admission/exec/denyprivileged/admission.go +++ b/plugin/pkg/admission/exec/denyprivileged/admission.go @@ -20,11 +20,11 @@ import ( "fmt" "io" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/client" ) func init() { diff --git a/plugin/pkg/admission/exec/denyprivileged/admission_test.go b/plugin/pkg/admission/exec/denyprivileged/admission_test.go index 3b50504c51..157e7749a9 100644 --- a/plugin/pkg/admission/exec/denyprivileged/admission_test.go +++ b/plugin/pkg/admission/exec/denyprivileged/admission_test.go @@ -19,11 +19,11 @@ package denyprivileged import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/rest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/rest" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/runtime" ) // TestAdmission verifies a namespace is created on create requests for namespace managed resources diff --git a/plugin/pkg/admission/limitranger/admission.go b/plugin/pkg/admission/limitranger/admission.go index 274b769385..09ff8e0187 100644 --- a/plugin/pkg/admission/limitranger/admission.go +++ b/plugin/pkg/admission/limitranger/admission.go @@ -20,16 +20,16 @@ import ( "fmt" "io" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) func init() { diff --git a/plugin/pkg/admission/limitranger/admission_test.go b/plugin/pkg/admission/limitranger/admission_test.go index 4acae38837..537e6d5a41 100644 --- a/plugin/pkg/admission/limitranger/admission_test.go +++ b/plugin/pkg/admission/limitranger/admission_test.go @@ -20,11 +20,11 @@ import ( "strconv" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/testclient" ) func getResourceList(cpu, memory string) api.ResourceList { diff --git a/plugin/pkg/admission/limitranger/interfaces.go b/plugin/pkg/admission/limitranger/interfaces.go index 43f9cc135f..61cde7866d 100644 --- a/plugin/pkg/admission/limitranger/interfaces.go +++ b/plugin/pkg/admission/limitranger/interfaces.go @@ -17,8 +17,8 @@ limitations under the License. package limitranger import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/runtime" ) // LimitFunc is a pluggable function to enforce limits on the object diff --git a/plugin/pkg/admission/namespace/autoprovision/admission.go b/plugin/pkg/admission/namespace/autoprovision/admission.go index 4ce1e04a3c..ce96a9db7d 100644 --- a/plugin/pkg/admission/namespace/autoprovision/admission.go +++ b/plugin/pkg/admission/namespace/autoprovision/admission.go @@ -19,16 +19,16 @@ package autoprovision import ( "io" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) func init() { diff --git a/plugin/pkg/admission/namespace/autoprovision/admission_test.go b/plugin/pkg/admission/namespace/autoprovision/admission_test.go index 719d57cfbc..14396801f8 100644 --- a/plugin/pkg/admission/namespace/autoprovision/admission_test.go +++ b/plugin/pkg/admission/namespace/autoprovision/admission_test.go @@ -19,11 +19,11 @@ package autoprovision import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/testclient" ) // TestAdmission verifies a namespace is created on create requests for namespace managed resources diff --git a/plugin/pkg/admission/namespace/exists/admission.go b/plugin/pkg/admission/namespace/exists/admission.go index eab0128567..4585f638bd 100644 --- a/plugin/pkg/admission/namespace/exists/admission.go +++ b/plugin/pkg/admission/namespace/exists/admission.go @@ -21,15 +21,15 @@ import ( "io" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) func init() { diff --git a/plugin/pkg/admission/namespace/lifecycle/admission.go b/plugin/pkg/admission/namespace/lifecycle/admission.go index 9c6049a58e..d535f9e6ae 100644 --- a/plugin/pkg/admission/namespace/lifecycle/admission.go +++ b/plugin/pkg/admission/namespace/lifecycle/admission.go @@ -20,17 +20,17 @@ import ( "fmt" "io" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/meta" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" ) func init() { diff --git a/plugin/pkg/admission/namespace/lifecycle/admission_test.go b/plugin/pkg/admission/namespace/lifecycle/admission_test.go index 73b7d71d10..25837c410f 100644 --- a/plugin/pkg/admission/namespace/lifecycle/admission_test.go +++ b/plugin/pkg/admission/namespace/lifecycle/admission_test.go @@ -19,10 +19,10 @@ package lifecycle import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/testclient" ) // TestAdmission diff --git a/plugin/pkg/admission/resourcequota/admission.go b/plugin/pkg/admission/resourcequota/admission.go index da8f893b4f..392c8fd3f3 100644 --- a/plugin/pkg/admission/resourcequota/admission.go +++ b/plugin/pkg/admission/resourcequota/admission.go @@ -22,16 +22,16 @@ import ( "math/rand" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/resourcequota" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/controller/resourcequota" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" ) func init() { diff --git a/plugin/pkg/admission/resourcequota/admission_test.go b/plugin/pkg/admission/resourcequota/admission_test.go index 807208b6b6..622328f333 100644 --- a/plugin/pkg/admission/resourcequota/admission_test.go +++ b/plugin/pkg/admission/resourcequota/admission_test.go @@ -19,11 +19,11 @@ package resourcequota import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/testclient" ) func getResourceRequirements(cpu, memory string) api.ResourceRequirements { diff --git a/plugin/pkg/admission/securitycontext/scdeny/admission.go b/plugin/pkg/admission/securitycontext/scdeny/admission.go index 373c070f19..5006655e27 100644 --- a/plugin/pkg/admission/securitycontext/scdeny/admission.go +++ b/plugin/pkg/admission/securitycontext/scdeny/admission.go @@ -20,10 +20,10 @@ import ( "fmt" "io" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - apierrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + apierrors "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" ) func init() { diff --git a/plugin/pkg/admission/securitycontext/scdeny/admission_test.go b/plugin/pkg/admission/securitycontext/scdeny/admission_test.go index 22425634fd..0a4cd9b7cb 100644 --- a/plugin/pkg/admission/securitycontext/scdeny/admission_test.go +++ b/plugin/pkg/admission/securitycontext/scdeny/admission_test.go @@ -19,8 +19,8 @@ package scdeny import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" ) // ensures the SecurityContext is denied if it defines anything more than Caps or Privileged diff --git a/plugin/pkg/admission/serviceaccount/admission.go b/plugin/pkg/admission/serviceaccount/admission.go index 1d87c65a4c..7d56f52c76 100644 --- a/plugin/pkg/admission/serviceaccount/admission.go +++ b/plugin/pkg/admission/serviceaccount/admission.go @@ -22,17 +22,17 @@ import ( "math/rand" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" ) // DefaultServiceAccountName is the name of the default service account to set on pods which do not specify a service account diff --git a/plugin/pkg/admission/serviceaccount/admission_test.go b/plugin/pkg/admission/serviceaccount/admission_test.go index 0c96dc1467..cdb9666945 100644 --- a/plugin/pkg/admission/serviceaccount/admission_test.go +++ b/plugin/pkg/admission/serviceaccount/admission_test.go @@ -20,11 +20,11 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/admission" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/admission" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/types" ) func TestIgnoresNonCreate(t *testing.T) { diff --git a/plugin/pkg/auth/authenticator/password/allow/allow.go b/plugin/pkg/auth/authenticator/password/allow/allow.go index 28ae1dc440..df4f92580d 100644 --- a/plugin/pkg/auth/authenticator/password/allow/allow.go +++ b/plugin/pkg/auth/authenticator/password/allow/allow.go @@ -17,8 +17,8 @@ limitations under the License. package allow import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/authenticator" + "k8s.io/kubernetes/pkg/auth/user" ) type allowAuthenticator struct{} diff --git a/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile.go b/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile.go index 5b1730361b..8daf1efb36 100644 --- a/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile.go +++ b/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile.go @@ -22,7 +22,7 @@ import ( "io" "os" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/user" ) type PasswordAuthenticator struct { diff --git a/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile_test.go b/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile_test.go index 42837dd67b..7a07e23aac 100644 --- a/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile_test.go +++ b/plugin/pkg/auth/authenticator/password/passwordfile/passwordfile_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/user" ) func TestPasswordFile(t *testing.T) { diff --git a/plugin/pkg/auth/authenticator/request/basicauth/basicauth.go b/plugin/pkg/auth/authenticator/request/basicauth/basicauth.go index 255eed100b..b9ef3b4cf6 100644 --- a/plugin/pkg/auth/authenticator/request/basicauth/basicauth.go +++ b/plugin/pkg/auth/authenticator/request/basicauth/basicauth.go @@ -22,8 +22,8 @@ import ( "net/http" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/authenticator" + "k8s.io/kubernetes/pkg/auth/user" ) // Authenticator authenticates requests using basic auth diff --git a/plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go b/plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go index d3ef3d0038..951ed97429 100644 --- a/plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go +++ b/plugin/pkg/auth/authenticator/request/basicauth/basicauth_test.go @@ -22,8 +22,8 @@ import ( "net/http" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/authenticator" + "k8s.io/kubernetes/pkg/auth/user" ) type testPassword struct { diff --git a/plugin/pkg/auth/authenticator/request/union/union.go b/plugin/pkg/auth/authenticator/request/union/union.go index 728ea6f784..0d7b225ea2 100644 --- a/plugin/pkg/auth/authenticator/request/union/union.go +++ b/plugin/pkg/auth/authenticator/request/union/union.go @@ -19,9 +19,9 @@ package union import ( "net/http" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/auth/authenticator" + "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/util/errors" ) // unionAuthRequestHandler authenticates requests using a chain of authenticator.Requests diff --git a/plugin/pkg/auth/authenticator/request/union/unionauth_test.go b/plugin/pkg/auth/authenticator/request/union/unionauth_test.go index 5f52106bf9..48d9698ee2 100644 --- a/plugin/pkg/auth/authenticator/request/union/unionauth_test.go +++ b/plugin/pkg/auth/authenticator/request/union/unionauth_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/user" ) type mockAuthRequestHandler struct { diff --git a/plugin/pkg/auth/authenticator/request/x509/x509.go b/plugin/pkg/auth/authenticator/request/x509/x509.go index 49ca5832f3..371400fc79 100644 --- a/plugin/pkg/auth/authenticator/request/x509/x509.go +++ b/plugin/pkg/auth/authenticator/request/x509/x509.go @@ -20,8 +20,8 @@ import ( "crypto/x509" "net/http" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" + "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/util/errors" ) // UserConversion defines an interface for extracting user info from a client certificate chain diff --git a/plugin/pkg/auth/authenticator/request/x509/x509_test.go b/plugin/pkg/auth/authenticator/request/x509/x509_test.go index 95823f5b5a..4ead5fe428 100644 --- a/plugin/pkg/auth/authenticator/request/x509/x509_test.go +++ b/plugin/pkg/auth/authenticator/request/x509/x509_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/user" ) const ( diff --git a/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile.go b/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile.go index 153f43f3f1..e502bfc414 100644 --- a/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile.go +++ b/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile.go @@ -22,7 +22,7 @@ import ( "io" "os" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/user" ) type TokenAuthenticator struct { diff --git a/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile_test.go b/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile_test.go index 529174a539..4638577eef 100644 --- a/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile_test.go +++ b/plugin/pkg/auth/authenticator/token/tokenfile/tokenfile_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/auth/user" ) func TestTokenFile(t *testing.T) { diff --git a/plugin/pkg/auth/authenticator/token/tokentest/tokentest.go b/plugin/pkg/auth/authenticator/token/tokentest/tokentest.go index ff367eb94e..bf69e1094a 100644 --- a/plugin/pkg/auth/authenticator/token/tokentest/tokentest.go +++ b/plugin/pkg/auth/authenticator/token/tokentest/tokentest.go @@ -16,7 +16,7 @@ limitations under the License. package tokentest -import "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" +import "k8s.io/kubernetes/pkg/auth/user" type TokenAuthenticator struct { Tokens map[string]*user.DefaultInfo diff --git a/plugin/pkg/scheduler/algorithm/listers.go b/plugin/pkg/scheduler/algorithm/listers.go index 66edac545b..f4b6eec1b0 100644 --- a/plugin/pkg/scheduler/algorithm/listers.go +++ b/plugin/pkg/scheduler/algorithm/listers.go @@ -19,8 +19,8 @@ package algorithm import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/labels" ) // MinionLister interface represents anything that can list minions for a scheduler. diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/plugin/pkg/scheduler/algorithm/predicates/predicates.go index 63bd46f6e5..ca4e2e336a 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go +++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go @@ -19,10 +19,10 @@ package predicates import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "github.com/golang/glog" ) diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go b/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go index 6c3a63b217..696d8527b4 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go +++ b/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go @@ -21,9 +21,9 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) type FakeNodeInfo api.Node diff --git a/plugin/pkg/scheduler/algorithm/priorities/priorities.go b/plugin/pkg/scheduler/algorithm/priorities/priorities.go index 902e3511ba..9a5399509d 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/priorities.go +++ b/plugin/pkg/scheduler/algorithm/priorities/priorities.go @@ -19,11 +19,11 @@ package priorities import ( "math" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" "github.com/golang/glog" ) diff --git a/plugin/pkg/scheduler/algorithm/priorities/priorities_test.go b/plugin/pkg/scheduler/algorithm/priorities/priorities_test.go index 253095a4b0..2d80c1f016 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/priorities_test.go +++ b/plugin/pkg/scheduler/algorithm/priorities/priorities_test.go @@ -22,10 +22,10 @@ import ( "strconv" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/plugin/pkg/scheduler" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) func makeMinion(node string, milliCPU, memory int64) api.Node { diff --git a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go index 0a37739f4c..d1da9ec789 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go +++ b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go @@ -17,9 +17,9 @@ limitations under the License. package priorities import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "github.com/golang/glog" ) diff --git a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go index 369c1fbc6e..5360a1aed5 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go +++ b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go @@ -21,8 +21,8 @@ import ( "sort" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) func TestSelectorSpreadPriority(t *testing.T) { diff --git a/plugin/pkg/scheduler/algorithm/scheduler_interface.go b/plugin/pkg/scheduler/algorithm/scheduler_interface.go index 4e9abeb1d4..d5794eeb92 100644 --- a/plugin/pkg/scheduler/algorithm/scheduler_interface.go +++ b/plugin/pkg/scheduler/algorithm/scheduler_interface.go @@ -17,7 +17,7 @@ limitations under the License. package algorithm import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // Scheduler is an interface implemented by things that know how to schedule pods diff --git a/plugin/pkg/scheduler/algorithm/scheduler_interface_test.go b/plugin/pkg/scheduler/algorithm/scheduler_interface_test.go index 6fcb8d7b72..0e7ef58f65 100644 --- a/plugin/pkg/scheduler/algorithm/scheduler_interface_test.go +++ b/plugin/pkg/scheduler/algorithm/scheduler_interface_test.go @@ -19,7 +19,7 @@ package algorithm import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // Some functions used by multiple scheduler tests. diff --git a/plugin/pkg/scheduler/algorithm/types.go b/plugin/pkg/scheduler/algorithm/types.go index a226ff1d8a..6038968869 100644 --- a/plugin/pkg/scheduler/algorithm/types.go +++ b/plugin/pkg/scheduler/algorithm/types.go @@ -17,7 +17,7 @@ limitations under the License. package algorithm import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) // FitPredicate is a function that indicates if a pod fits into an existing node. diff --git a/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go b/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go index 8d9cc9be9c..30b3300576 100644 --- a/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go +++ b/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go @@ -18,12 +18,12 @@ limitations under the License. package defaults import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm/priorities" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/factory" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/plugin/pkg/scheduler" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities" + "k8s.io/kubernetes/plugin/pkg/scheduler/factory" ) func init() { diff --git a/plugin/pkg/scheduler/algorithmprovider/plugins.go b/plugin/pkg/scheduler/algorithmprovider/plugins.go index 27981ea5ef..f4075928ae 100644 --- a/plugin/pkg/scheduler/algorithmprovider/plugins.go +++ b/plugin/pkg/scheduler/algorithmprovider/plugins.go @@ -18,5 +18,5 @@ limitations under the License. package algorithmprovider import ( - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults" + _ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults" ) diff --git a/plugin/pkg/scheduler/algorithmprovider/plugins_test.go b/plugin/pkg/scheduler/algorithmprovider/plugins_test.go index 957f6add01..b1236e5e69 100644 --- a/plugin/pkg/scheduler/algorithmprovider/plugins_test.go +++ b/plugin/pkg/scheduler/algorithmprovider/plugins_test.go @@ -19,7 +19,7 @@ package algorithmprovider import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/factory" + "k8s.io/kubernetes/plugin/pkg/scheduler/factory" ) var ( diff --git a/plugin/pkg/scheduler/api/latest/latest.go b/plugin/pkg/scheduler/api/latest/latest.go index 7733d821b8..cee44028f2 100644 --- a/plugin/pkg/scheduler/api/latest/latest.go +++ b/plugin/pkg/scheduler/api/latest/latest.go @@ -17,7 +17,7 @@ limitations under the License. package latest import ( - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/api/v1" + "k8s.io/kubernetes/plugin/pkg/scheduler/api/v1" ) // Version is the string that represents the current external default version. diff --git a/plugin/pkg/scheduler/api/register.go b/plugin/pkg/scheduler/api/register.go index 4359d3ba3a..ce58805dd9 100644 --- a/plugin/pkg/scheduler/api/register.go +++ b/plugin/pkg/scheduler/api/register.go @@ -17,7 +17,7 @@ limitations under the License. package api import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/runtime" ) // Scheme is the default instance of runtime.Scheme to which types in the Kubernetes API are already registered. diff --git a/plugin/pkg/scheduler/api/types.go b/plugin/pkg/scheduler/api/types.go index d29c4a69d2..555da43d40 100644 --- a/plugin/pkg/scheduler/api/types.go +++ b/plugin/pkg/scheduler/api/types.go @@ -17,7 +17,7 @@ limitations under the License. package api import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) type Policy struct { diff --git a/plugin/pkg/scheduler/api/v1/register.go b/plugin/pkg/scheduler/api/v1/register.go index 44703758fd..ea019d35c8 100644 --- a/plugin/pkg/scheduler/api/v1/register.go +++ b/plugin/pkg/scheduler/api/v1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/plugin/pkg/scheduler/api" ) // Codec encodes internal objects to the v1 scheme diff --git a/plugin/pkg/scheduler/api/v1/types.go b/plugin/pkg/scheduler/api/v1/types.go index ee3b6a50b9..ede00c3409 100644 --- a/plugin/pkg/scheduler/api/v1/types.go +++ b/plugin/pkg/scheduler/api/v1/types.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - apiv1 "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1" + apiv1 "k8s.io/kubernetes/pkg/api/v1" ) type Policy struct { diff --git a/plugin/pkg/scheduler/api/validation/validation.go b/plugin/pkg/scheduler/api/validation/validation.go index a65f82ccac..a0e0691c69 100644 --- a/plugin/pkg/scheduler/api/validation/validation.go +++ b/plugin/pkg/scheduler/api/validation/validation.go @@ -19,8 +19,8 @@ package validation import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors" - schedulerapi "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/util/errors" + schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" ) // Validate checks for errors in the Config diff --git a/plugin/pkg/scheduler/api/validation/validation_test.go b/plugin/pkg/scheduler/api/validation/validation_test.go index 95547c6c00..680cf7b72f 100644 --- a/plugin/pkg/scheduler/api/validation/validation_test.go +++ b/plugin/pkg/scheduler/api/validation/validation_test.go @@ -19,7 +19,7 @@ package validation import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/api" + "k8s.io/kubernetes/plugin/pkg/scheduler/api" ) func TestValidatePriorityWithNoWeight(t *testing.T) { diff --git a/plugin/pkg/scheduler/factory/factory.go b/plugin/pkg/scheduler/factory/factory.go index b496b3ed8d..f8675c3772 100644 --- a/plugin/pkg/scheduler/factory/factory.go +++ b/plugin/pkg/scheduler/factory/factory.go @@ -23,17 +23,17 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" - schedulerapi "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/api" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/api/validation" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/controller/framework" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/plugin/pkg/scheduler" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" + schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" + "k8s.io/kubernetes/plugin/pkg/scheduler/api/validation" "github.com/golang/glog" ) diff --git a/plugin/pkg/scheduler/factory/factory_test.go b/plugin/pkg/scheduler/factory/factory_test.go index 1b3819a91d..a5795b4e38 100644 --- a/plugin/pkg/scheduler/factory/factory_test.go +++ b/plugin/pkg/scheduler/factory/factory_test.go @@ -23,16 +23,16 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" - schedulerapi "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/api" - latestschedulerapi "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/api/latest" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" + schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" + latestschedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest" ) func TestCreate(t *testing.T) { diff --git a/plugin/pkg/scheduler/factory/plugins.go b/plugin/pkg/scheduler/factory/plugins.go index 16d34d8027..99953f7e50 100644 --- a/plugin/pkg/scheduler/factory/plugins.go +++ b/plugin/pkg/scheduler/factory/plugins.go @@ -22,11 +22,11 @@ import ( "strings" "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm/predicates" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm/priorities" - schedulerapi "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/api" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities" + schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" "github.com/golang/glog" ) diff --git a/plugin/pkg/scheduler/generic_scheduler.go b/plugin/pkg/scheduler/generic_scheduler.go index 6c9858c227..8cf5e61b93 100644 --- a/plugin/pkg/scheduler/generic_scheduler.go +++ b/plugin/pkg/scheduler/generic_scheduler.go @@ -23,10 +23,10 @@ import ( "strings" "sync" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" "github.com/golang/glog" ) diff --git a/plugin/pkg/scheduler/generic_scheduler_test.go b/plugin/pkg/scheduler/generic_scheduler_test.go index b220b14cb7..37b9548345 100644 --- a/plugin/pkg/scheduler/generic_scheduler_test.go +++ b/plugin/pkg/scheduler/generic_scheduler_test.go @@ -23,9 +23,9 @@ import ( "strconv" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) func falsePredicate(pod *api.Pod, existingPods []*api.Pod, node string) (bool, error) { diff --git a/plugin/pkg/scheduler/modeler.go b/plugin/pkg/scheduler/modeler.go index dbc801306c..511a8a839f 100644 --- a/plugin/pkg/scheduler/modeler.go +++ b/plugin/pkg/scheduler/modeler.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "github.com/golang/glog" ) diff --git a/plugin/pkg/scheduler/modeler_test.go b/plugin/pkg/scheduler/modeler_test.go index f7af4d2d44..7dd00efdd1 100644 --- a/plugin/pkg/scheduler/modeler_test.go +++ b/plugin/pkg/scheduler/modeler_test.go @@ -19,9 +19,9 @@ package scheduler import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/labels" ) type nn struct { diff --git a/plugin/pkg/scheduler/scheduler.go b/plugin/pkg/scheduler/scheduler.go index a3b80d7e58..1bcc0e6695 100644 --- a/plugin/pkg/scheduler/scheduler.go +++ b/plugin/pkg/scheduler/scheduler.go @@ -22,11 +22,11 @@ package scheduler import ( "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/metrics" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/plugin/pkg/scheduler/metrics" "github.com/golang/glog" ) diff --git a/plugin/pkg/scheduler/scheduler_test.go b/plugin/pkg/scheduler/scheduler_test.go index c891c33a17..09bff4b9e4 100644 --- a/plugin/pkg/scheduler/scheduler_test.go +++ b/plugin/pkg/scheduler/scheduler_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithm/predicates" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" + "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" ) type fakeBinder struct { diff --git a/test/e2e/addon_update.go b/test/e2e/addon_update.go index 1d1a092a00..2000f4d6fc 100644 --- a/test/e2e/addon_update.go +++ b/test/e2e/addon_update.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" "golang.org/x/crypto/ssh" . "github.com/onsi/ginkgo" diff --git a/test/e2e/cadvisor.go b/test/e2e/cadvisor.go index 1f471c4181..f03050ac8b 100644 --- a/test/e2e/cadvisor.go +++ b/test/e2e/cadvisor.go @@ -20,9 +20,9 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" ) diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go index dc0ae9fbf9..ae926b846f 100644 --- a/test/e2e/cluster_upgrade.go +++ b/test/e2e/cluster_upgrade.go @@ -29,12 +29,12 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/container_probe.go b/test/e2e/container_probe.go index 895e31c08e..e9bd4993d0 100644 --- a/test/e2e/container_probe.go +++ b/test/e2e/container_probe.go @@ -19,10 +19,10 @@ package e2e import ( "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/density.go b/test/e2e/density.go index f21148fa7a..eeb96811b9 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -26,15 +26,15 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/controller/framework" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/dns.go b/test/e2e/dns.go index 1648d0a734..a6f4fae9cb 100644 --- a/test/e2e/dns.go +++ b/test/e2e/dns.go @@ -21,13 +21,13 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/docker_containers.go b/test/e2e/docker_containers.go index aa08670317..104fc40d71 100644 --- a/test/e2e/docker_containers.go +++ b/test/e2e/docker_containers.go @@ -17,9 +17,9 @@ limitations under the License. package e2e import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/util" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/downward_api.go b/test/e2e/downward_api.go index 0fbb430efb..e5ade3f0fa 100644 --- a/test/e2e/downward_api.go +++ b/test/e2e/downward_api.go @@ -19,8 +19,8 @@ package e2e import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" . "github.com/onsi/ginkgo" ) diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 86d00abcb4..4d397d98c7 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/clientcmd" + "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" "github.com/onsi/ginkgo" "github.com/onsi/ginkgo/config" diff --git a/test/e2e/empty_dir.go b/test/e2e/empty_dir.go index 2c3fdaf8f7..87d7e90d4c 100644 --- a/test/e2e/empty_dir.go +++ b/test/e2e/empty_dir.go @@ -20,9 +20,9 @@ import ( "fmt" "path" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/util" . "github.com/onsi/ginkgo" ) diff --git a/test/e2e/es_cluster_logging.go b/test/e2e/es_cluster_logging.go index 720549df1d..8b00e0ac0d 100644 --- a/test/e2e/es_cluster_logging.go +++ b/test/e2e/es_cluster_logging.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/etcd_failure.go b/test/e2e/etcd_failure.go index 6693c5ce40..3095cd6876 100644 --- a/test/e2e/etcd_failure.go +++ b/test/e2e/etcd_failure.go @@ -19,10 +19,10 @@ package e2e import ( "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util/wait" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/events.go b/test/e2e/events.go index 37c98ddd7f..432c982330 100644 --- a/test/e2e/events.go +++ b/test/e2e/events.go @@ -21,11 +21,11 @@ import ( "strconv" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/examples.go b/test/e2e/examples.go index 4840cc6c59..b645f7e9ef 100644 --- a/test/e2e/examples.go +++ b/test/e2e/examples.go @@ -24,10 +24,10 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/expansion.go b/test/e2e/expansion.go index 08ec608ef6..a27bbaf19d 100644 --- a/test/e2e/expansion.go +++ b/test/e2e/expansion.go @@ -17,8 +17,8 @@ limitations under the License. package e2e import ( - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" . "github.com/onsi/ginkgo" ) diff --git a/test/e2e/framework.go b/test/e2e/framework.go index d5a430f2f2..b2167d7f1b 100644 --- a/test/e2e/framework.go +++ b/test/e2e/framework.go @@ -22,10 +22,10 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/host_path.go b/test/e2e/host_path.go index 6037c6ca81..a7c990db65 100644 --- a/test/e2e/host_path.go +++ b/test/e2e/host_path.go @@ -18,10 +18,10 @@ package e2e import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/util" "os" "path" diff --git a/test/e2e/kibana_logging.go b/test/e2e/kibana_logging.go index 37b162447b..efb2e395fc 100644 --- a/test/e2e/kibana_logging.go +++ b/test/e2e/kibana_logging.go @@ -19,9 +19,9 @@ package e2e import ( "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/kube-ui.go b/test/e2e/kube-ui.go index 7b3041f210..cf859a0b3b 100644 --- a/test/e2e/kube-ui.go +++ b/test/e2e/kube-ui.go @@ -20,8 +20,8 @@ import ( "net/http" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util/wait" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index 3a64135db6..ac6c949f4e 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -29,10 +29,10 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/kubelet.go b/test/e2e/kubelet.go index d67e5aa7b9..7757b9f978 100644 --- a/test/e2e/kubelet.go +++ b/test/e2e/kubelet.go @@ -21,11 +21,11 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/kubelet_stats.go b/test/e2e/kubelet_stats.go index d94fdb88c0..dbb95b26b3 100644 --- a/test/e2e/kubelet_stats.go +++ b/test/e2e/kubelet_stats.go @@ -28,14 +28,14 @@ import ( "text/tabwriter" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubelet/metrics" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master/ports" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/kubelet" + "k8s.io/kubernetes/pkg/kubelet/metrics" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/util" cadvisor "github.com/google/cadvisor/info/v1" "github.com/prometheus/client_golang/extraction" diff --git a/test/e2e/load.go b/test/e2e/load.go index f6765ac4c1..3cf9d2ac77 100644 --- a/test/e2e/load.go +++ b/test/e2e/load.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/monitoring.go b/test/e2e/monitoring.go index 98a7af254b..09286a286c 100644 --- a/test/e2e/monitoring.go +++ b/test/e2e/monitoring.go @@ -22,10 +22,10 @@ import ( "net/url" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" influxdb "github.com/influxdb/influxdb/client" . "github.com/onsi/ginkgo" diff --git a/test/e2e/namespace.go b/test/e2e/namespace.go index 903b20a7f8..4ac5886e0b 100644 --- a/test/e2e/namespace.go +++ b/test/e2e/namespace.go @@ -18,11 +18,11 @@ package e2e import ( "fmt" - //"github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + //"k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util/wait" "strings" "sync" "time" diff --git a/test/e2e/networking.go b/test/e2e/networking.go index 5332c7f48c..244426416a 100644 --- a/test/e2e/networking.go +++ b/test/e2e/networking.go @@ -22,10 +22,10 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/pd.go b/test/e2e/pd.go index 0a9890e6b9..dcccaedd30 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -23,14 +23,14 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/aws" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/cloudprovider/aws" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/test/e2e/persistent_volumes.go b/test/e2e/persistent_volumes.go index 1c41743a51..11f176c2d1 100644 --- a/test/e2e/persistent_volumes.go +++ b/test/e2e/persistent_volumes.go @@ -19,10 +19,10 @@ package e2e import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "time" diff --git a/test/e2e/pods.go b/test/e2e/pods.go index 6b9314b427..403030cade 100644 --- a/test/e2e/pods.go +++ b/test/e2e/pods.go @@ -21,15 +21,15 @@ import ( "strconv" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/watch" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/pre_stop.go b/test/e2e/pre_stop.go index 43c009a41e..85294df8d8 100644 --- a/test/e2e/pre_stop.go +++ b/test/e2e/pre_stop.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/util/wait" . "github.com/onsi/ginkgo" ) diff --git a/test/e2e/proxy.go b/test/e2e/proxy.go index 57ab0bf8a4..b1b194fb83 100644 --- a/test/e2e/proxy.go +++ b/test/e2e/proxy.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/rc.go b/test/e2e/rc.go index c1bc6ec041..a7480da5c2 100644 --- a/test/e2e/rc.go +++ b/test/e2e/rc.go @@ -20,13 +20,13 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/types" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/kubectl" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/types" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/reboot.go b/test/e2e/reboot.go index 08a37091db..42929d691e 100644 --- a/test/e2e/reboot.go +++ b/test/e2e/reboot.go @@ -20,10 +20,10 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index 52d2f6811e..5489f6c22c 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -22,15 +22,15 @@ import ( "regexp" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider/aws" + "k8s.io/kubernetes/pkg/cloudprovider/aws" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/test/e2e/restart.go b/test/e2e/restart.go index 18ce473745..7e35045d77 100644 --- a/test/e2e/restart.go +++ b/test/e2e/restart.go @@ -20,11 +20,11 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util/wait" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/scheduler_predicates.go b/test/e2e/scheduler_predicates.go index e6c335bc2a..093b355130 100644 --- a/test/e2e/scheduler_predicates.go +++ b/test/e2e/scheduler_predicates.go @@ -20,12 +20,12 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/secrets.go b/test/e2e/secrets.go index 048962bed2..17f21e3e60 100644 --- a/test/e2e/secrets.go +++ b/test/e2e/secrets.go @@ -19,8 +19,8 @@ package e2e import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/util" . "github.com/onsi/ginkgo" ) diff --git a/test/e2e/service.go b/test/e2e/service.go index d9b84b1ddc..9e81222b06 100644 --- a/test/e2e/service.go +++ b/test/e2e/service.go @@ -25,13 +25,13 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/test/e2e/service_accounts.go b/test/e2e/service_accounts.go index 4c92fa2d3d..26bcfbd999 100644 --- a/test/e2e/service_accounts.go +++ b/test/e2e/service_accounts.go @@ -20,13 +20,13 @@ import ( "fmt" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/serviceaccount" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount" . "github.com/onsi/ginkgo" ) diff --git a/test/e2e/service_latency.go b/test/e2e/service_latency.go index 601f1d00f8..66c2b83b0e 100644 --- a/test/e2e/service_latency.go +++ b/test/e2e/service_latency.go @@ -22,14 +22,14 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/framework" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/controller/framework" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/watch" . "github.com/onsi/ginkgo" ) diff --git a/test/e2e/ssh.go b/test/e2e/ssh.go index b28a8df734..ede864c3e8 100644 --- a/test/e2e/ssh.go +++ b/test/e2e/ssh.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/util.go b/test/e2e/util.go index 3fc5885bbf..0c2ff62273 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -32,21 +32,21 @@ import ( "strings" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - apierrs "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - clientcmdapi "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" + "k8s.io/kubernetes/pkg/api" + apierrs "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/kubectl" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/pkg/watch" "github.com/davecgh/go-spew/spew" "github.com/prometheus/client_golang/extraction" diff --git a/test/e2e/volumes.go b/test/e2e/volumes.go index 5889f24dbb..1f75877a2e 100644 --- a/test/e2e/volumes.go +++ b/test/e2e/volumes.go @@ -33,9 +33,9 @@ package e2e import ( "fmt" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/util" "time" . "github.com/onsi/ginkgo" diff --git a/test/integration/auth_test.go b/test/integration/auth_test.go index b43ce139b2..9662724fb6 100644 --- a/test/integration/auth_test.go +++ b/test/integration/auth_test.go @@ -36,19 +36,19 @@ import ( "strings" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator/bearertoken" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authorizer" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authorizer/abac" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/admit" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/auth/authenticator/token/tokentest" - "github.com/GoogleCloudPlatform/kubernetes/test/integration/framework" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/apiserver" + "k8s.io/kubernetes/pkg/auth/authenticator" + "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" + "k8s.io/kubernetes/pkg/auth/authorizer" + "k8s.io/kubernetes/pkg/auth/authorizer/abac" + "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/plugin/pkg/admission/admit" + "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/tokentest" + "k8s.io/kubernetes/test/integration/framework" ) const ( diff --git a/test/integration/client_test.go b/test/integration/client_test.go index 097be311df..2ed744c0cf 100644 --- a/test/integration/client_test.go +++ b/test/integration/client_test.go @@ -27,14 +27,14 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/version" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" - "github.com/GoogleCloudPlatform/kubernetes/test/integration/framework" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/version" + "k8s.io/kubernetes/pkg/watch" + "k8s.io/kubernetes/test/integration/framework" ) func TestClient(t *testing.T) { diff --git a/test/integration/etcd_tools_test.go b/test/integration/etcd_tools_test.go index f28fda0eb5..da278a5be6 100644 --- a/test/integration/etcd_tools_test.go +++ b/test/integration/etcd_tools_test.go @@ -22,14 +22,14 @@ import ( "strconv" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" - "github.com/GoogleCloudPlatform/kubernetes/test/integration/framework" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/watch" + "k8s.io/kubernetes/test/integration/framework" ) func TestSet(t *testing.T) { diff --git a/test/integration/framework/etcd_utils.go b/test/integration/framework/etcd_utils.go index c3f8bd0c20..1cdb763074 100644 --- a/test/integration/framework/etcd_utils.go +++ b/test/integration/framework/etcd_utils.go @@ -22,11 +22,11 @@ import ( "fmt" "math/rand" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/tools/etcdtest" "github.com/coreos/go-etcd/etcd" "github.com/golang/glog" ) diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 3b9e35a036..48c12acdb6 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -25,21 +25,21 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/replication" - explatest "github.com/GoogleCloudPlatform/kubernetes/pkg/expapi/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master" - "github.com/GoogleCloudPlatform/kubernetes/pkg/storage" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/admit" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/apiserver" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/controller/replication" + explatest "k8s.io/kubernetes/pkg/expapi/latest" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/kubectl" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/storage" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/plugin/pkg/admission/admit" "github.com/golang/glog" ) diff --git a/test/integration/master_benchmark_test.go b/test/integration/master_benchmark_test.go index 0ff3e698c7..26dbdbe215 100644 --- a/test/integration/master_benchmark_test.go +++ b/test/integration/master_benchmark_test.go @@ -25,13 +25,13 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - etcdgeneric "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/generic/etcd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/test/integration/framework" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/test/integration/framework" "github.com/golang/glog" ) diff --git a/test/integration/master_test.go b/test/integration/master_test.go index dd63c6b488..6d1ce296b5 100644 --- a/test/integration/master_test.go +++ b/test/integration/master_test.go @@ -22,7 +22,7 @@ import ( "net/http" "testing" - "github.com/GoogleCloudPlatform/kubernetes/test/integration/framework" + "k8s.io/kubernetes/test/integration/framework" ) func TestExperimentalPrefix(t *testing.T) { diff --git a/test/integration/metrics_test.go b/test/integration/metrics_test.go index d9567e09c2..c4f04e72d5 100644 --- a/test/integration/metrics_test.go +++ b/test/integration/metrics_test.go @@ -25,12 +25,12 @@ import ( "net/http/httptest" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/test/integration/framework" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/test/integration/framework" "github.com/golang/glog" "github.com/golang/protobuf/proto" diff --git a/test/integration/openshift_test.go b/test/integration/openshift_test.go index 42d761857b..c8dae483a4 100644 --- a/test/integration/openshift_test.go +++ b/test/integration/openshift_test.go @@ -19,7 +19,7 @@ package integration import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/master" ) // This test references methods that OpenShift uses to customize the master on startup, that diff --git a/test/integration/persistent_volumes_test.go b/test/integration/persistent_volumes_test.go index 9c61fca92e..0cece2d17c 100644 --- a/test/integration/persistent_volumes_test.go +++ b/test/integration/persistent_volumes_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/volumeclaimbinder" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/volumeclaimbinder" ) func init() { diff --git a/test/integration/scheduler_test.go b/test/integration/scheduler_test.go index 84416707e2..796dc4a7a1 100644 --- a/test/integration/scheduler_test.go +++ b/test/integration/scheduler_test.go @@ -27,22 +27,22 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/cache" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/record" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/admit" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler" - _ "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/algorithmprovider" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler/factory" - "github.com/GoogleCloudPlatform/kubernetes/test/integration/framework" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/apiserver" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" + "k8s.io/kubernetes/plugin/pkg/admission/admit" + "k8s.io/kubernetes/plugin/pkg/scheduler" + _ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" + "k8s.io/kubernetes/plugin/pkg/scheduler/factory" + "k8s.io/kubernetes/test/integration/framework" ) type nodeMutationFunc func(t *testing.T, n *api.Node, nodeStore cache.Store, c *client.Client) diff --git a/test/integration/secret_test.go b/test/integration/secret_test.go index bbd084cdd3..6d44cd071d 100644 --- a/test/integration/secret_test.go +++ b/test/integration/secret_test.go @@ -25,13 +25,13 @@ import ( "net/http/httptest" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/admit" - "github.com/GoogleCloudPlatform/kubernetes/test/integration/framework" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/apiserver" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/plugin/pkg/admission/admit" + "k8s.io/kubernetes/test/integration/framework" ) func deletePodOrErrorf(t *testing.T, c *client.Client, ns, name string) { diff --git a/test/integration/service_account_test.go b/test/integration/service_account_test.go index e6c42bb19c..db715dff14 100644 --- a/test/integration/service_account_test.go +++ b/test/integration/service_account_test.go @@ -31,24 +31,24 @@ import ( "testing" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authenticator/bearertoken" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/authorizer" - "github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/controller/serviceaccount" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait" - serviceaccountadmission "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/serviceaccount" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/auth/authenticator/request/union" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/auth/authenticator" + "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" + "k8s.io/kubernetes/pkg/auth/authorizer" + "k8s.io/kubernetes/pkg/auth/user" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/controller/serviceaccount" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/wait" + serviceaccountadmission "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount" + "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/union" ) const ( diff --git a/test/integration/utils.go b/test/integration/utils.go index 4a7363071c..5a974a23d4 100644 --- a/test/integration/utils.go +++ b/test/integration/utils.go @@ -25,13 +25,13 @@ import ( "net/http/httptest" "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" - "github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/master" - "github.com/GoogleCloudPlatform/kubernetes/pkg/tools/etcdtest" - "github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/admission/admit" + "k8s.io/kubernetes/pkg/api/latest" + "k8s.io/kubernetes/pkg/api/testapi" + "k8s.io/kubernetes/pkg/apiserver" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/tools/etcdtest" + "k8s.io/kubernetes/plugin/pkg/admission/admit" "github.com/coreos/go-etcd/etcd" "github.com/golang/glog" diff --git a/test/soak/cauldron/cauldron.go b/test/soak/cauldron/cauldron.go index 18fd4f8a00..2ee86810ff 100644 --- a/test/soak/cauldron/cauldron.go +++ b/test/soak/cauldron/cauldron.go @@ -29,11 +29,11 @@ import ( "net/http" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/test/soak/serve_hostnames/serve_hostnames.go b/test/soak/serve_hostnames/serve_hostnames.go index 557c9481e6..8dafb52897 100644 --- a/test/soak/serve_hostnames/serve_hostnames.go +++ b/test/soak/serve_hostnames/serve_hostnames.go @@ -29,12 +29,12 @@ import ( "path/filepath" "time" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client" - "github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd" - "github.com/GoogleCloudPlatform/kubernetes/pkg/fields" - "github.com/GoogleCloudPlatform/kubernetes/pkg/labels" - "github.com/GoogleCloudPlatform/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/client" + "k8s.io/kubernetes/pkg/client/clientcmd" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/util" "github.com/golang/glog" ) diff --git a/third_party/golang/expansion/expand_test.go b/third_party/golang/expansion/expand_test.go index c2060e706e..f5a628b17b 100644 --- a/third_party/golang/expansion/expand_test.go +++ b/third_party/golang/expansion/expand_test.go @@ -3,7 +3,7 @@ package expansion import ( "testing" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api" ) func TestMapReference(t *testing.T) {