From f9f5736b01519574380a9ec1c65d00bc8751fd1b Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Wed, 3 Feb 2016 13:04:58 -0800 Subject: [PATCH] grep sed --- cmd/integration/integration.go | 2 +- cmd/kube-apiserver/app/server.go | 2 +- cmd/kube-controller-manager/app/controllermanager.go | 2 +- cmd/kubelet/app/server.go | 2 +- cmd/kubemark/hollow-node.go | 2 +- cmd/libs/go2idl/client-gen/main.go | 4 ++-- .../{test_release_1_1 => test_release_1_2}/clientset.go | 2 +- contrib/mesos/pkg/controllermanager/controllermanager.go | 2 +- contrib/mesos/pkg/executor/apis.go | 2 +- contrib/mesos/pkg/executor/executor.go | 2 +- contrib/mesos/pkg/executor/registry.go | 2 +- contrib/mesos/pkg/executor/service/service.go | 2 +- contrib/mesos/pkg/node/node.go | 2 +- contrib/mesos/pkg/node/registrator.go | 2 +- contrib/mesos/pkg/node/statusupdater.go | 2 +- .../mesos/pkg/scheduler/components/controller/controller.go | 2 +- contrib/mesos/pkg/scheduler/components/framework/framework.go | 2 +- .../pkg/scheduler/components/podreconciler/podreconciler.go | 2 +- contrib/mesos/pkg/scheduler/components/scheduler.go | 2 +- contrib/mesos/pkg/scheduler/integration/integration_test.go | 2 +- contrib/mesos/pkg/scheduler/service/service.go | 2 +- contrib/mesos/pkg/service/endpoints_controller.go | 2 +- pkg/admission/chain.go | 2 +- pkg/admission/plugins.go | 2 +- .../{release_1_1 => release_1_2}/clientset.go | 2 +- .../{release_1_1 => release_1_2}/clientset_adaption.go | 2 +- pkg/client/testing/fake/clientset.go | 2 +- pkg/client/unversioned/testclient/simple/simple_testclient.go | 2 +- pkg/controller/controller_utils.go | 2 +- pkg/controller/controller_utils_test.go | 2 +- pkg/controller/daemon/controller.go | 2 +- pkg/controller/daemon/controller_test.go | 2 +- pkg/controller/deployment/deployment_controller.go | 2 +- pkg/controller/endpoint/endpoints_controller.go | 2 +- pkg/controller/endpoint/endpoints_controller_test.go | 2 +- pkg/controller/gc/gc_controller.go | 2 +- pkg/controller/job/controller.go | 2 +- pkg/controller/job/controller_test.go | 2 +- pkg/controller/namespace/namespace_controller.go | 2 +- pkg/controller/namespace/namespace_controller_test.go | 2 +- pkg/controller/node/nodecontroller.go | 2 +- .../persistentvolume_claim_binder_controller.go | 2 +- .../persistentvolume_provisioner_controller.go | 2 +- .../persistentvolume_provisioner_controller_test.go | 2 +- .../persistentvolume/persistentvolume_recycler_controller.go | 2 +- pkg/controller/podautoscaler/metrics/metrics_client.go | 2 +- pkg/controller/replicaset/replica_set.go | 2 +- pkg/controller/replicaset/replica_set_test.go | 2 +- pkg/controller/replication/replication_controller.go | 2 +- pkg/controller/replication/replication_controller_test.go | 2 +- pkg/controller/resourcequota/resource_quota_controller.go | 2 +- pkg/controller/route/routecontroller.go | 2 +- pkg/controller/service/servicecontroller.go | 2 +- pkg/controller/serviceaccount/serviceaccounts_controller.go | 2 +- pkg/controller/serviceaccount/tokengetter.go | 2 +- pkg/controller/serviceaccount/tokens_controller.go | 2 +- pkg/kubectl/cmd/util/factory.go | 2 +- pkg/kubectl/describe.go | 2 +- pkg/kubectl/history.go | 2 +- pkg/kubelet/config/apiserver.go | 2 +- pkg/kubelet/kubelet.go | 2 +- pkg/kubelet/network/cni/cni_test.go | 2 +- pkg/kubelet/network/plugins.go | 2 +- pkg/kubelet/network/testing.go | 2 +- pkg/kubelet/networks.go | 2 +- pkg/kubelet/pod/mirror_client.go | 2 +- pkg/kubelet/status/manager.go | 2 +- pkg/kubelet/status/manager_test.go | 2 +- pkg/kubelet/volumes.go | 2 +- pkg/kubemark/hollow_kubelet.go | 2 +- pkg/serviceaccount/jwt_test.go | 2 +- pkg/util/deployment/deployment.go | 2 +- pkg/volume/downwardapi/downwardapi_test.go | 2 +- pkg/volume/persistent_claim/persistent_claim_test.go | 2 +- pkg/volume/plugins.go | 2 +- pkg/volume/secret/secret_test.go | 2 +- pkg/volume/testing.go | 2 +- pkg/volume/util.go | 2 +- plugin/pkg/admission/admit/admission.go | 2 +- plugin/pkg/admission/alwayspullimages/admission.go | 2 +- plugin/pkg/admission/deny/admission.go | 2 +- plugin/pkg/admission/exec/admission.go | 2 +- plugin/pkg/admission/initialresources/admission.go | 2 +- plugin/pkg/admission/limitranger/admission.go | 2 +- plugin/pkg/admission/namespace/autoprovision/admission.go | 2 +- plugin/pkg/admission/namespace/exists/admission.go | 2 +- plugin/pkg/admission/namespace/lifecycle/admission.go | 2 +- plugin/pkg/admission/persistentvolume/label/admission.go | 2 +- plugin/pkg/admission/resourcequota/admission.go | 2 +- plugin/pkg/admission/securitycontext/scdeny/admission.go | 2 +- plugin/pkg/admission/serviceaccount/admission.go | 2 +- test/e2e/deployment.go | 2 +- test/e2e/util.go | 2 +- test/integration/framework/master_utils.go | 2 +- test/integration/persistent_volumes_test.go | 2 +- test/integration/service_account_test.go | 2 +- 96 files changed, 97 insertions(+), 97 deletions(-) rename cmd/libs/go2idl/client-gen/testoutput/clientset_generated/{test_release_1_1 => test_release_1_2}/clientset.go (99%) rename pkg/client/clientset_generated/{release_1_1 => release_1_2}/clientset.go (99%) rename pkg/client/clientset_generated/{release_1_1 => release_1_2}/clientset_adaption.go (98%) diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index de32c5d4e98..a5e8be2c247 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -38,7 +38,7 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller" diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index 4238f7f0f22..7f8adca08a6 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -42,7 +42,7 @@ import ( "k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/apiserver/authenticator" "k8s.io/kubernetes/pkg/capabilities" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/cloudprovider" serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount" diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index b7208cdc6e7..6edd29eedba 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/leaderelection" "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 9fbdf52bc61..d5e15d17a55 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -38,7 +38,7 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/client/chaosclient" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/record" unversioned_legacy "k8s.io/kubernetes/pkg/client/typed/generated/legacy/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" diff --git a/cmd/kubemark/hollow-node.go b/cmd/kubemark/hollow-node.go index e5bd5f122c1..7951a2503f6 100644 --- a/cmd/kubemark/hollow-node.go +++ b/cmd/kubemark/hollow-node.go @@ -23,7 +23,7 @@ import ( docker "github.com/fsouza/go-dockerclient" "k8s.io/kubernetes/pkg/api" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" diff --git a/cmd/libs/go2idl/client-gen/main.go b/cmd/libs/go2idl/client-gen/main.go index d7417f6e3e0..dc0a397cac7 100644 --- a/cmd/libs/go2idl/client-gen/main.go +++ b/cmd/libs/go2idl/client-gen/main.go @@ -32,7 +32,7 @@ import ( var ( test = flag.BoolP("test", "t", false, "set this flag to generate the client code for the testdata") inputVersions = flag.StringSlice("input", []string{"api/", "extensions/"}, "group/versions that client-gen will generate clients for. At most one version per group is allowed. Specified in the format \"group1/version1,group2/version2...\". Default to \"api/,extensions\"") - clientsetName = flag.StringP("clientset-name", "n", "release_1_1", "the name of the generated clientset package.") + clientsetName = flag.StringP("clientset-name", "n", "release_1_2", "the name of the generated clientset package.") clientsetPath = flag.String("clientset-path", "k8s.io/kubernetes/pkg/client/clientset_generated/", "the generated clientset will be output to /. Default to \"k8s.io/kubernetes/pkg/client/clientset_generated/\"") clientsetOnly = flag.Bool("clientset-only", false, "when set, client-gen only generates the clientset shell, without generating the individual typed clients") ) @@ -88,7 +88,7 @@ func main() { arguments.OutputPackagePath = "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput" arguments.CustomArgs = generators.ClientGenArgs{ []unversioned.GroupVersion{{"testgroup", ""}}, - "test_release_1_1", + "test_release_1_2", "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/", false, false, diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_release_1_1/clientset.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_release_1_2/clientset.go similarity index 99% rename from cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_release_1_1/clientset.go rename to cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_release_1_2/clientset.go index 2297ae855e6..657964c9383 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_release_1_1/clientset.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_release_1_2/clientset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package test_release_1_1 +package test_release_1_2 import ( "github.com/golang/glog" diff --git a/contrib/mesos/pkg/controllermanager/controllermanager.go b/contrib/mesos/pkg/controllermanager/controllermanager.go index 9f4d8486fc5..9423274c2e8 100644 --- a/contrib/mesos/pkg/controllermanager/controllermanager.go +++ b/contrib/mesos/pkg/controllermanager/controllermanager.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" "k8s.io/kubernetes/contrib/mesos/pkg/node" "k8s.io/kubernetes/pkg/api/unversioned" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" diff --git a/contrib/mesos/pkg/executor/apis.go b/contrib/mesos/pkg/executor/apis.go index ab4add7edd4..ae98fd6f7f5 100644 --- a/contrib/mesos/pkg/executor/apis.go +++ b/contrib/mesos/pkg/executor/apis.go @@ -19,7 +19,7 @@ package executor import ( "k8s.io/kubernetes/contrib/mesos/pkg/node" "k8s.io/kubernetes/pkg/api" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" ) type kubeAPI interface { diff --git a/contrib/mesos/pkg/executor/executor.go b/contrib/mesos/pkg/executor/executor.go index 7af5108133b..217d6da3b96 100644 --- a/contrib/mesos/pkg/executor/executor.go +++ b/contrib/mesos/pkg/executor/executor.go @@ -26,7 +26,7 @@ import ( "sync/atomic" "time" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "github.com/fsouza/go-dockerclient" "github.com/gogo/protobuf/proto" diff --git a/contrib/mesos/pkg/executor/registry.go b/contrib/mesos/pkg/executor/registry.go index c79c20427a3..c9d870ab221 100644 --- a/contrib/mesos/pkg/executor/registry.go +++ b/contrib/mesos/pkg/executor/registry.go @@ -21,7 +21,7 @@ import ( "errors" "sync" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/contrib/mesos/pkg/executor/messages" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" diff --git a/contrib/mesos/pkg/executor/service/service.go b/contrib/mesos/pkg/executor/service/service.go index 1172a38a70d..3e2b220c27a 100644 --- a/contrib/mesos/pkg/executor/service/service.go +++ b/contrib/mesos/pkg/executor/service/service.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet" diff --git a/contrib/mesos/pkg/node/node.go b/contrib/mesos/pkg/node/node.go index e838a8d4792..b72eb385e88 100644 --- a/contrib/mesos/pkg/node/node.go +++ b/contrib/mesos/pkg/node/node.go @@ -23,7 +23,7 @@ import ( "strings" "time" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" log "github.com/golang/glog" mesos "github.com/mesos/mesos-go/mesosproto" diff --git a/contrib/mesos/pkg/node/registrator.go b/contrib/mesos/pkg/node/registrator.go index be80ad39975..e6dc2a5e073 100644 --- a/contrib/mesos/pkg/node/registrator.go +++ b/contrib/mesos/pkg/node/registrator.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" log "github.com/golang/glog" "k8s.io/kubernetes/contrib/mesos/pkg/queue" diff --git a/contrib/mesos/pkg/node/statusupdater.go b/contrib/mesos/pkg/node/statusupdater.go index f90de945cb6..670b0c197b7 100644 --- a/contrib/mesos/pkg/node/statusupdater.go +++ b/contrib/mesos/pkg/node/statusupdater.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" log "github.com/golang/glog" "k8s.io/kubernetes/cmd/kubelet/app/options" diff --git a/contrib/mesos/pkg/scheduler/components/controller/controller.go b/contrib/mesos/pkg/scheduler/components/controller/controller.go index a995fce3117..495dcbe79b1 100644 --- a/contrib/mesos/pkg/scheduler/components/controller/controller.go +++ b/contrib/mesos/pkg/scheduler/components/controller/controller.go @@ -19,7 +19,7 @@ package controller import ( "time" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" log "github.com/golang/glog" "k8s.io/kubernetes/contrib/mesos/pkg/runtime" diff --git a/contrib/mesos/pkg/scheduler/components/framework/framework.go b/contrib/mesos/pkg/scheduler/components/framework/framework.go index b8966e66659..6e2a99be078 100644 --- a/contrib/mesos/pkg/scheduler/components/framework/framework.go +++ b/contrib/mesos/pkg/scheduler/components/framework/framework.go @@ -45,7 +45,7 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/kubelet/container" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/util/sets" diff --git a/contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go b/contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go index 0a5c29fb745..c259d2faafa 100644 --- a/contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go +++ b/contrib/mesos/pkg/scheduler/components/podreconciler/podreconciler.go @@ -19,7 +19,7 @@ package podreconciler import ( "time" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" log "github.com/golang/glog" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler" diff --git a/contrib/mesos/pkg/scheduler/components/scheduler.go b/contrib/mesos/pkg/scheduler/components/scheduler.go index bafe3d21d69..57c18f2cf09 100644 --- a/contrib/mesos/pkg/scheduler/components/scheduler.go +++ b/contrib/mesos/pkg/scheduler/components/scheduler.go @@ -20,7 +20,7 @@ import ( "net/http" "sync" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" mesos "github.com/mesos/mesos-go/mesosproto" "k8s.io/kubernetes/contrib/mesos/pkg/backoff" diff --git a/contrib/mesos/pkg/scheduler/integration/integration_test.go b/contrib/mesos/pkg/scheduler/integration/integration_test.go index bc5c965ffe6..cc787379041 100644 --- a/contrib/mesos/pkg/scheduler/integration/integration_test.go +++ b/contrib/mesos/pkg/scheduler/integration/integration_test.go @@ -48,7 +48,7 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" diff --git a/contrib/mesos/pkg/scheduler/service/service.go b/contrib/mesos/pkg/scheduler/service/service.go index 6ba88f7d656..0fb8b0c29d1 100644 --- a/contrib/mesos/pkg/scheduler/service/service.go +++ b/contrib/mesos/pkg/scheduler/service/service.go @@ -33,7 +33,7 @@ import ( "sync" "time" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" etcd "github.com/coreos/etcd/client" "github.com/gogo/protobuf/proto" diff --git a/contrib/mesos/pkg/service/endpoints_controller.go b/contrib/mesos/pkg/service/endpoints_controller.go index c6be0321bd6..89550269060 100644 --- a/contrib/mesos/pkg/service/endpoints_controller.go +++ b/contrib/mesos/pkg/service/endpoints_controller.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/endpoints" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" kservice "k8s.io/kubernetes/pkg/controller/endpoint" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/admission/chain.go b/pkg/admission/chain.go index 90262b01647..b6aa1f0eb59 100644 --- a/pkg/admission/chain.go +++ b/pkg/admission/chain.go @@ -16,7 +16,7 @@ limitations under the License. package admission -import clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" +import clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" // chainAdmissionHandler is an instance of admission.Interface that performs admission control using a chain of admission handlers type chainAdmissionHandler []Interface diff --git a/pkg/admission/plugins.go b/pkg/admission/plugins.go index 9c4fba36184..032cb4696de 100644 --- a/pkg/admission/plugins.go +++ b/pkg/admission/plugins.go @@ -23,7 +23,7 @@ import ( "sync" "github.com/golang/glog" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" ) // Factory is a function that returns an Interface for admission decisions. diff --git a/pkg/client/clientset_generated/release_1_1/clientset.go b/pkg/client/clientset_generated/release_1_2/clientset.go similarity index 99% rename from pkg/client/clientset_generated/release_1_1/clientset.go rename to pkg/client/clientset_generated/release_1_2/clientset.go index ec9bae28be3..63ae29d764f 100644 --- a/pkg/client/clientset_generated/release_1_1/clientset.go +++ b/pkg/client/clientset_generated/release_1_2/clientset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package release_1_1 +package release_1_2 import ( "github.com/golang/glog" diff --git a/pkg/client/clientset_generated/release_1_1/clientset_adaption.go b/pkg/client/clientset_generated/release_1_2/clientset_adaption.go similarity index 98% rename from pkg/client/clientset_generated/release_1_1/clientset_adaption.go rename to pkg/client/clientset_generated/release_1_2/clientset_adaption.go index 118863c4219..533228fb2cc 100644 --- a/pkg/client/clientset_generated/release_1_1/clientset_adaption.go +++ b/pkg/client/clientset_generated/release_1_2/clientset_adaption.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package release_1_1 +package release_1_2 import ( extensions_unversioned "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned" diff --git a/pkg/client/testing/fake/clientset.go b/pkg/client/testing/fake/clientset.go index db509c25178..dd31b667b7e 100644 --- a/pkg/client/testing/fake/clientset.go +++ b/pkg/client/testing/fake/clientset.go @@ -18,7 +18,7 @@ package fake import ( "k8s.io/kubernetes/pkg/api" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/client/unversioned/testclient/simple/simple_testclient.go b/pkg/client/unversioned/testclient/simple/simple_testclient.go index 110b4d37e28..d53138151da 100644 --- a/pkg/client/unversioned/testclient/simple/simple_testclient.go +++ b/pkg/client/unversioned/testclient/simple/simple_testclient.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index 53aca3ac826..5f01336638b 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index a9d75ec63be..194154505e3 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/daemon/controller.go b/pkg/controller/daemon/controller.go index 3b4772c53e7..f23ee6c2e8a 100644 --- a/pkg/controller/daemon/controller.go +++ b/pkg/controller/daemon/controller.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/record" unversioned_extensions "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned" unversioned_legacy "k8s.io/kubernetes/pkg/client/typed/generated/legacy/unversioned" diff --git a/pkg/controller/daemon/controller_test.go b/pkg/controller/daemon/controller_test.go index e67fd7e76fa..36fa91b6dff 100644 --- a/pkg/controller/daemon/controller_test.go +++ b/pkg/controller/daemon/controller_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index 7b2a776a4e2..555ffc2a74d 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/record" unversioned_legacy "k8s.io/kubernetes/pkg/client/typed/generated/legacy/unversioned" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/endpoint/endpoints_controller.go b/pkg/controller/endpoint/endpoints_controller.go index 0fe8f1e14a0..b9a35bbe229 100644 --- a/pkg/controller/endpoint/endpoints_controller.go +++ b/pkg/controller/endpoint/endpoints_controller.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" podutil "k8s.io/kubernetes/pkg/api/pod" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index b23998a1827..4a69dc843b9 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" _ "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/gc/gc_controller.go b/pkg/controller/gc/gc_controller.go index 8a7a77adfda..c2c76f39b62 100644 --- a/pkg/controller/gc/gc_controller.go +++ b/pkg/controller/gc/gc_controller.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/controller/job/controller.go b/pkg/controller/job/controller.go index 9ed5037cb77..654e3521ebe 100644 --- a/pkg/controller/job/controller.go +++ b/pkg/controller/job/controller.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/record" unversioned_legacy "k8s.io/kubernetes/pkg/client/typed/generated/legacy/unversioned" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/job/controller_test.go b/pkg/controller/job/controller_test.go index 477797a711a..c626c8a8fb1 100644 --- a/pkg/controller/job/controller_test.go +++ b/pkg/controller/job/controller_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/client/testing/fake" client "k8s.io/kubernetes/pkg/client/unversioned" diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index bd59507358a..c953cb8ac5d 100644 --- a/pkg/controller/namespace/namespace_controller.go +++ b/pkg/controller/namespace/namespace_controller.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" extensions_unversioned "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/namespace/namespace_controller_test.go b/pkg/controller/namespace/namespace_controller_test.go index 369275caa99..2b0e2883d0b 100644 --- a/pkg/controller/namespace/namespace_controller_test.go +++ b/pkg/controller/namespace/namespace_controller_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/unversioned" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/client/testing/fake" "k8s.io/kubernetes/pkg/util/sets" diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index 44a297945e7..1a7c57d4921 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/record" unversioned_legacy "k8s.io/kubernetes/pkg/client/typed/generated/legacy/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" diff --git a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go index baf4eae6a5f..b5ba15b67fb 100644 --- a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go b/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go index 32a30de2a53..7af4bee9d54 100644 --- a/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/conversion" diff --git a/pkg/controller/persistentvolume/persistentvolume_provisioner_controller_test.go b/pkg/controller/persistentvolume/persistentvolume_provisioner_controller_test.go index 6362f1c3a17..a5895403cd5 100644 --- a/pkg/controller/persistentvolume/persistentvolume_provisioner_controller_test.go +++ b/pkg/controller/persistentvolume/persistentvolume_provisioner_controller_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" fake_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go b/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go index fe1020bde46..2fdc6626f6e 100644 --- a/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go @@ -23,7 +23,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/podautoscaler/metrics/metrics_client.go b/pkg/controller/podautoscaler/metrics/metrics_client.go index a579fae02a5..663f1393127 100644 --- a/pkg/controller/podautoscaler/metrics/metrics_client.go +++ b/pkg/controller/podautoscaler/metrics/metrics_client.go @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/labels" heapster "k8s.io/heapster/api/v1/types" diff --git a/pkg/controller/replicaset/replica_set.go b/pkg/controller/replicaset/replica_set.go index ddd0ae6518a..ffa48cfc8de 100644 --- a/pkg/controller/replicaset/replica_set.go +++ b/pkg/controller/replicaset/replica_set.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/record" unversioned_legacy "k8s.io/kubernetes/pkg/client/typed/generated/legacy/unversioned" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/replicaset/replica_set_test.go b/pkg/controller/replicaset/replica_set_test.go index ce838caa6d3..34c7c0902da 100644 --- a/pkg/controller/replicaset/replica_set_test.go +++ b/pkg/controller/replicaset/replica_set_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/client/testing/fake" client "k8s.io/kubernetes/pkg/client/unversioned" diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index 93b62394b73..69bf7638b5b 100644 --- a/pkg/controller/replication/replication_controller.go +++ b/pkg/controller/replication/replication_controller.go @@ -27,7 +27,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/record" unversioned_legacy "k8s.io/kubernetes/pkg/client/typed/generated/legacy/unversioned" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/replication/replication_controller_test.go b/pkg/controller/replication/replication_controller_test.go index b0763129049..698888102d1 100644 --- a/pkg/controller/replication/replication_controller_test.go +++ b/pkg/controller/replication/replication_controller_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/client/testing/fake" client "k8s.io/kubernetes/pkg/client/unversioned" diff --git a/pkg/controller/resourcequota/resource_quota_controller.go b/pkg/controller/resourcequota/resource_quota_controller.go index 0e16dc0d532..1e0f83f031a 100644 --- a/pkg/controller/resourcequota/resource_quota_controller.go +++ b/pkg/controller/resourcequota/resource_quota_controller.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/route/routecontroller.go b/pkg/controller/route/routecontroller.go index 3811a7dab23..47312d0e47a 100644 --- a/pkg/controller/route/routecontroller.go +++ b/pkg/controller/route/routecontroller.go @@ -23,7 +23,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/controller/service/servicecontroller.go b/pkg/controller/service/servicecontroller.go index 0e64547d9c3..e1f8b5bd6c7 100644 --- a/pkg/controller/service/servicecontroller.go +++ b/pkg/controller/service/servicecontroller.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/record" unversioned_legacy "k8s.io/kubernetes/pkg/client/typed/generated/legacy/unversioned" "k8s.io/kubernetes/pkg/cloudprovider" diff --git a/pkg/controller/serviceaccount/serviceaccounts_controller.go b/pkg/controller/serviceaccount/serviceaccounts_controller.go index 32da0d86a6f..5b4ac12757b 100644 --- a/pkg/controller/serviceaccount/serviceaccounts_controller.go +++ b/pkg/controller/serviceaccount/serviceaccounts_controller.go @@ -25,7 +25,7 @@ import ( apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/controller/serviceaccount/tokengetter.go b/pkg/controller/serviceaccount/tokengetter.go index a4748de977f..3db556b22ce 100644 --- a/pkg/controller/serviceaccount/tokengetter.go +++ b/pkg/controller/serviceaccount/tokengetter.go @@ -18,7 +18,7 @@ package serviceaccount import ( "k8s.io/kubernetes/pkg/api" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/secret" secretetcd "k8s.io/kubernetes/pkg/registry/secret/etcd" diff --git a/pkg/controller/serviceaccount/tokens_controller.go b/pkg/controller/serviceaccount/tokens_controller.go index 82bccd4aa73..b6518e8512d 100644 --- a/pkg/controller/serviceaccount/tokens_controller.go +++ b/pkg/controller/serviceaccount/tokens_controller.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index eea080f5378..aec126b8aba 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -39,7 +39,7 @@ import ( "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" "k8s.io/kubernetes/pkg/kubectl" diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index 7984b1dccac..32a17e0f29e 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fieldpath" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/kubectl/history.go b/pkg/kubectl/history.go index f864e535c2f..606f7716eb6 100644 --- a/pkg/kubectl/history.go +++ b/pkg/kubectl/history.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/runtime" deploymentutil "k8s.io/kubernetes/pkg/util/deployment" "k8s.io/kubernetes/pkg/util/errors" diff --git a/pkg/kubelet/config/apiserver.go b/pkg/kubelet/config/apiserver.go index 6722b64c59d..15acbcf232a 100644 --- a/pkg/kubelet/config/apiserver.go +++ b/pkg/kubelet/config/apiserver.go @@ -20,7 +20,7 @@ package config import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 6c11f12a3f0..c08d4b70780 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -40,7 +40,7 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/cloudprovider" diff --git a/pkg/kubelet/network/cni/cni_test.go b/pkg/kubelet/network/cni/cni_test.go index 38e78573216..7f5545f3e44 100644 --- a/pkg/kubelet/network/cni/cni_test.go +++ b/pkg/kubelet/network/cni/cni_test.go @@ -28,7 +28,7 @@ import ( "testing" "text/template" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" docker "github.com/fsouza/go-dockerclient" cadvisorapi "github.com/google/cadvisor/info/v1" diff --git a/pkg/kubelet/network/plugins.go b/pkg/kubelet/network/plugins.go index 80678924532..e3cf5364696 100644 --- a/pkg/kubelet/network/plugins.go +++ b/pkg/kubelet/network/plugins.go @@ -21,7 +21,7 @@ import ( "net" "strings" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" diff --git a/pkg/kubelet/network/testing.go b/pkg/kubelet/network/testing.go index a6612345023..21854f3c1fd 100644 --- a/pkg/kubelet/network/testing.go +++ b/pkg/kubelet/network/testing.go @@ -21,7 +21,7 @@ package network import ( "k8s.io/kubernetes/pkg/api" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) diff --git a/pkg/kubelet/networks.go b/pkg/kubelet/networks.go index af58a3dc7de..06e075e0959 100644 --- a/pkg/kubelet/networks.go +++ b/pkg/kubelet/networks.go @@ -18,7 +18,7 @@ package kubelet import ( "k8s.io/kubernetes/pkg/api" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) diff --git a/pkg/kubelet/pod/mirror_client.go b/pkg/kubelet/pod/mirror_client.go index 4027e0e4e4b..aa88742788e 100644 --- a/pkg/kubelet/pod/mirror_client.go +++ b/pkg/kubelet/pod/mirror_client.go @@ -20,7 +20,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" ) diff --git a/pkg/kubelet/status/manager.go b/pkg/kubelet/status/manager.go index edc85a38c9b..a2182f5fd73 100644 --- a/pkg/kubelet/status/manager.go +++ b/pkg/kubelet/status/manager.go @@ -21,7 +21,7 @@ import ( "sync" "time" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" diff --git a/pkg/kubelet/status/manager_test.go b/pkg/kubelet/status/manager_test.go index df3eb880fdb..19c810fc9b3 100644 --- a/pkg/kubelet/status/manager_test.go +++ b/pkg/kubelet/status/manager_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/client/testing/fake" diff --git a/pkg/kubelet/volumes.go b/pkg/kubelet/volumes.go index c19854fbef7..09a0d942f12 100644 --- a/pkg/kubelet/volumes.go +++ b/pkg/kubelet/volumes.go @@ -23,7 +23,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/cloudprovider" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/types" diff --git a/pkg/kubemark/hollow_kubelet.go b/pkg/kubemark/hollow_kubelet.go index 23c97301d00..e841096a9cc 100644 --- a/pkg/kubemark/hollow_kubelet.go +++ b/pkg/kubemark/hollow_kubelet.go @@ -21,7 +21,7 @@ import ( kubeletapp "k8s.io/kubernetes/cmd/kubelet/app" "k8s.io/kubernetes/pkg/api" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/serviceaccount/jwt_test.go b/pkg/serviceaccount/jwt_test.go index 1a5bbee5615..ffc05ba2977 100644 --- a/pkg/serviceaccount/jwt_test.go +++ b/pkg/serviceaccount/jwt_test.go @@ -26,7 +26,7 @@ import ( "github.com/dgrijalva/jwt-go" "k8s.io/kubernetes/pkg/api" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/testing/fake" serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount" "k8s.io/kubernetes/pkg/serviceaccount" diff --git a/pkg/util/deployment/deployment.go b/pkg/util/deployment/deployment.go index cc7b874772f..714a3486d2c 100644 --- a/pkg/util/deployment/deployment.go +++ b/pkg/util/deployment/deployment.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/labels" labelsutil "k8s.io/kubernetes/pkg/util/labels" podutil "k8s.io/kubernetes/pkg/util/pod" diff --git a/pkg/volume/downwardapi/downwardapi_test.go b/pkg/volume/downwardapi/downwardapi_test.go index 2f3253b0efe..5f9f1669a97 100644 --- a/pkg/volume/downwardapi/downwardapi_test.go +++ b/pkg/volume/downwardapi/downwardapi_test.go @@ -24,7 +24,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/testing/fake" "k8s.io/kubernetes/pkg/types" utiltesting "k8s.io/kubernetes/pkg/util/testing" diff --git a/pkg/volume/persistent_claim/persistent_claim_test.go b/pkg/volume/persistent_claim/persistent_claim_test.go index 8854ad0f690..7ad6eac38e7 100644 --- a/pkg/volume/persistent_claim/persistent_claim_test.go +++ b/pkg/volume/persistent_claim/persistent_claim_test.go @@ -23,7 +23,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/testing/fake" "k8s.io/kubernetes/pkg/types" utilstrings "k8s.io/kubernetes/pkg/util/strings" diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go index 94fb8d5d72c..2d0c54ae3c0 100644 --- a/pkg/volume/plugins.go +++ b/pkg/volume/plugins.go @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/types" utilerrors "k8s.io/kubernetes/pkg/util/errors" diff --git a/pkg/volume/secret/secret_test.go b/pkg/volume/secret/secret_test.go index 81449b55055..e028fe90460 100644 --- a/pkg/volume/secret/secret_test.go +++ b/pkg/volume/secret/secret_test.go @@ -25,7 +25,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/testing/fake" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/mount" diff --git a/pkg/volume/testing.go b/pkg/volume/testing.go index 79c072a53cd..361ff6cfb01 100644 --- a/pkg/volume/testing.go +++ b/pkg/volume/testing.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/volume/util.go b/pkg/volume/util.go index 3078e24830d..42fdc1ed572 100644 --- a/pkg/volume/util.go +++ b/pkg/volume/util.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" diff --git a/plugin/pkg/admission/admit/admission.go b/plugin/pkg/admission/admit/admission.go index 3f74f1d4b2c..5329aad627b 100644 --- a/plugin/pkg/admission/admit/admission.go +++ b/plugin/pkg/admission/admit/admission.go @@ -19,7 +19,7 @@ package admit import ( "io" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/admission" ) diff --git a/plugin/pkg/admission/alwayspullimages/admission.go b/plugin/pkg/admission/alwayspullimages/admission.go index 9111162e6bd..9a096c9301c 100644 --- a/plugin/pkg/admission/alwayspullimages/admission.go +++ b/plugin/pkg/admission/alwayspullimages/admission.go @@ -27,7 +27,7 @@ package alwayspullimages import ( "io" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" diff --git a/plugin/pkg/admission/deny/admission.go b/plugin/pkg/admission/deny/admission.go index e91f7065b5d..686cf8a3a03 100644 --- a/plugin/pkg/admission/deny/admission.go +++ b/plugin/pkg/admission/deny/admission.go @@ -20,7 +20,7 @@ import ( "errors" "io" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/admission" ) diff --git a/plugin/pkg/admission/exec/admission.go b/plugin/pkg/admission/exec/admission.go index d9f514dbffa..100672bb71e 100644 --- a/plugin/pkg/admission/exec/admission.go +++ b/plugin/pkg/admission/exec/admission.go @@ -20,7 +20,7 @@ import ( "fmt" "io" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" diff --git a/plugin/pkg/admission/initialresources/admission.go b/plugin/pkg/admission/initialresources/admission.go index cfd43ba3cc9..8e4e1c4c897 100644 --- a/plugin/pkg/admission/initialresources/admission.go +++ b/plugin/pkg/admission/initialresources/admission.go @@ -23,7 +23,7 @@ import ( "strings" "time" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "github.com/golang/glog" "k8s.io/kubernetes/pkg/admission" diff --git a/plugin/pkg/admission/limitranger/admission.go b/plugin/pkg/admission/limitranger/admission.go index ebaa4c1c21c..fb46cf5d7a9 100644 --- a/plugin/pkg/admission/limitranger/admission.go +++ b/plugin/pkg/admission/limitranger/admission.go @@ -22,7 +22,7 @@ import ( "sort" "strings" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" diff --git a/plugin/pkg/admission/namespace/autoprovision/admission.go b/plugin/pkg/admission/namespace/autoprovision/admission.go index 779b4baae4f..25cf79d2511 100644 --- a/plugin/pkg/admission/namespace/autoprovision/admission.go +++ b/plugin/pkg/admission/namespace/autoprovision/admission.go @@ -19,7 +19,7 @@ package autoprovision import ( "io" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" diff --git a/plugin/pkg/admission/namespace/exists/admission.go b/plugin/pkg/admission/namespace/exists/admission.go index 183461e8edb..e502f6052a2 100644 --- a/plugin/pkg/admission/namespace/exists/admission.go +++ b/plugin/pkg/admission/namespace/exists/admission.go @@ -20,7 +20,7 @@ import ( "io" "time" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" diff --git a/plugin/pkg/admission/namespace/lifecycle/admission.go b/plugin/pkg/admission/namespace/lifecycle/admission.go index add7c5aead1..0be144e962d 100644 --- a/plugin/pkg/admission/namespace/lifecycle/admission.go +++ b/plugin/pkg/admission/namespace/lifecycle/admission.go @@ -21,7 +21,7 @@ import ( "io" "time" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" diff --git a/plugin/pkg/admission/persistentvolume/label/admission.go b/plugin/pkg/admission/persistentvolume/label/admission.go index 9561bbfc25c..1860bb0b76d 100644 --- a/plugin/pkg/admission/persistentvolume/label/admission.go +++ b/plugin/pkg/admission/persistentvolume/label/admission.go @@ -21,7 +21,7 @@ import ( "io" "sync" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" diff --git a/plugin/pkg/admission/resourcequota/admission.go b/plugin/pkg/admission/resourcequota/admission.go index 2062bb7766a..766dd867c5c 100644 --- a/plugin/pkg/admission/resourcequota/admission.go +++ b/plugin/pkg/admission/resourcequota/admission.go @@ -22,7 +22,7 @@ import ( "math/rand" "time" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" diff --git a/plugin/pkg/admission/securitycontext/scdeny/admission.go b/plugin/pkg/admission/securitycontext/scdeny/admission.go index d60348b6742..9eced5bc602 100644 --- a/plugin/pkg/admission/securitycontext/scdeny/admission.go +++ b/plugin/pkg/admission/securitycontext/scdeny/admission.go @@ -20,7 +20,7 @@ import ( "fmt" "io" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" diff --git a/plugin/pkg/admission/serviceaccount/admission.go b/plugin/pkg/admission/serviceaccount/admission.go index 47a3e11b886..12fc869ec30 100644 --- a/plugin/pkg/admission/serviceaccount/admission.go +++ b/plugin/pkg/admission/serviceaccount/admission.go @@ -23,7 +23,7 @@ import ( "strconv" "time" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" diff --git a/test/e2e/deployment.go b/test/e2e/deployment.go index 1dc155875ff..e5fdc313353 100644 --- a/test/e2e/deployment.go +++ b/test/e2e/deployment.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/labels" deploymentutil "k8s.io/kubernetes/pkg/util/deployment" "k8s.io/kubernetes/pkg/util/intstr" diff --git a/test/e2e/util.go b/test/e2e/util.go index 65c8de9db47..b1014c45c51 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -40,7 +40,7 @@ import ( "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/cache" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 2bbbdc0b532..7128d9e08a1 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apiserver" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller" diff --git a/test/integration/persistent_volumes_test.go b/test/integration/persistent_volumes_test.go index 3fa8889a5cb..4fecb572d7c 100644 --- a/test/integration/persistent_volumes_test.go +++ b/test/integration/persistent_volumes_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" fake_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/persistentvolume" diff --git a/test/integration/service_account_test.go b/test/integration/service_account_test.go index 7f93ef21fc1..a00f8af2b66 100644 --- a/test/integration/service_account_test.go +++ b/test/integration/service_account_test.go @@ -38,7 +38,7 @@ import ( "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/auth/user" - clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_1" + clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" client "k8s.io/kubernetes/pkg/client/unversioned" serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount" "k8s.io/kubernetes/pkg/master"