diff --git a/federation/client/clientset_generated/federation_release_1_5/BUILD b/federation/client/clientset_generated/federation_clientset/BUILD similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/BUILD rename to federation/client/clientset_generated/federation_clientset/BUILD diff --git a/federation/client/clientset_generated/federation_release_1_5/clientset.go b/federation/client/clientset_generated/federation_clientset/clientset.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/clientset.go rename to federation/client/clientset_generated/federation_clientset/clientset.go diff --git a/federation/client/clientset_generated/federation_release_1_5/doc.go b/federation/client/clientset_generated/federation_clientset/doc.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/doc.go rename to federation/client/clientset_generated/federation_clientset/doc.go diff --git a/federation/client/clientset_generated/federation_release_1_5/fake/BUILD b/federation/client/clientset_generated/federation_clientset/fake/BUILD similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/fake/BUILD rename to federation/client/clientset_generated/federation_clientset/fake/BUILD diff --git a/federation/client/clientset_generated/federation_release_1_5/fake/clientset_generated.go b/federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/fake/clientset_generated.go rename to federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go diff --git a/federation/client/clientset_generated/federation_release_1_5/fake/doc.go b/federation/client/clientset_generated/federation_clientset/fake/doc.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/fake/doc.go rename to federation/client/clientset_generated/federation_clientset/fake/doc.go diff --git a/federation/client/clientset_generated/federation_release_1_5/import_known_versions.go b/federation/client/clientset_generated/federation_clientset/import_known_versions.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/import_known_versions.go rename to federation/client/clientset_generated/federation_clientset/import_known_versions.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/BUILD rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/configmap.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/configmap.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/core_client.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/core_client.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/doc.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/doc.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/doc.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/doc.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/event.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/event.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/BUILD rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/doc.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/doc.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/doc.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/doc.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_configmap.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_configmap.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_configmap.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_configmap.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_core_client.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_core_client.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_event.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_event.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_event.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_event.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace_expansion.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace_expansion.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace_expansion.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace_expansion.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_secret.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_secret.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_secret.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_secret.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_service.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_service.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_service.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_service.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/generated_expansion.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/generated_expansion.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/generated_expansion.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/generated_expansion.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace_expansion.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace_expansion.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace_expansion.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace_expansion.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/secret.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/secret.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/core/v1/service.go b/federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/core/v1/service.go rename to federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/BUILD rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/daemonset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/daemonset.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/deployment.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/deployment.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/deployment_expansion.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment_expansion.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/deployment_expansion.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment_expansion.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/doc.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/doc.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/doc.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/doc.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/extensions_client.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/extensions_client.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/BUILD rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/doc.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/doc.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/doc.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/doc.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_daemonset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_daemonset.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_deployment.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_deployment.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_deployment_expansion.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_deployment_expansion.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/generated_expansion.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/generated_expansion.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/generated_expansion.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/generated_expansion.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/ingress.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/ingress.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/replicaset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/replicaset.go rename to federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/BUILD b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/BUILD rename to federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/cluster.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/cluster.go rename to federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/doc.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/doc.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/doc.go rename to federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/doc.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/BUILD b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/BUILD rename to federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/doc.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/doc.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/doc.go rename to federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/doc.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_cluster.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_cluster.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_cluster.go rename to federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_cluster.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_federation_client.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_federation_client.go rename to federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/federation_client.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/federation_client.go rename to federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go diff --git a/federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/generated_expansion.go b/federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/generated_expansion.go similarity index 100% rename from federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/generated_expansion.go rename to federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/generated_expansion.go diff --git a/federation/cmd/federation-controller-manager/app/controllermanager.go b/federation/cmd/federation-controller-manager/app/controllermanager.go index 02431bbb6e..9bdab7f8dd 100644 --- a/federation/cmd/federation-controller-manager/app/controllermanager.go +++ b/federation/cmd/federation-controller-manager/app/controllermanager.go @@ -26,7 +26,7 @@ import ( "net/http/pprof" "strconv" - federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options" "k8s.io/kubernetes/federation/pkg/dnsprovider" clustercontroller "k8s.io/kubernetes/federation/pkg/federation-controller/cluster" diff --git a/federation/pkg/federation-controller/cluster/clustercontroller.go b/federation/pkg/federation-controller/cluster/clustercontroller.go index 4e3ff2e33c..88d5ce0956 100644 --- a/federation/pkg/federation-controller/cluster/clustercontroller.go +++ b/federation/pkg/federation-controller/cluster/clustercontroller.go @@ -23,7 +23,7 @@ import ( "github.com/golang/glog" federationv1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" clustercache "k8s.io/kubernetes/federation/client/cache" - federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/controller" diff --git a/federation/pkg/federation-controller/cluster/clustercontroller_test.go b/federation/pkg/federation-controller/cluster/clustercontroller_test.go index de1217ec2b..eec7eead7a 100644 --- a/federation/pkg/federation-controller/cluster/clustercontroller_test.go +++ b/federation/pkg/federation-controller/cluster/clustercontroller_test.go @@ -24,7 +24,7 @@ import ( "testing" federationv1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" - federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" controllerutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" diff --git a/federation/pkg/federation-controller/configmap/configmap_controller.go b/federation/pkg/federation-controller/configmap/configmap_controller.go index 3e338ac610..4e69670ee3 100644 --- a/federation/pkg/federation-controller/configmap/configmap_controller.go +++ b/federation/pkg/federation-controller/configmap/configmap_controller.go @@ -20,7 +20,7 @@ import ( "time" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" - federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" "k8s.io/kubernetes/pkg/api" diff --git a/federation/pkg/federation-controller/configmap/configmap_controller_test.go b/federation/pkg/federation-controller/configmap/configmap_controller_test.go index 90ba342e26..460b3cc07c 100644 --- a/federation/pkg/federation-controller/configmap/configmap_controller_test.go +++ b/federation/pkg/federation-controller/configmap/configmap_controller_test.go @@ -22,7 +22,7 @@ import ( "time" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" - fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/fake" + fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" "k8s.io/kubernetes/federation/pkg/federation-controller/util" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" apiv1 "k8s.io/kubernetes/pkg/api/v1" diff --git a/federation/pkg/federation-controller/daemonset/daemonset_controller.go b/federation/pkg/federation-controller/daemonset/daemonset_controller.go index 5a546bdac3..4d60c42593 100644 --- a/federation/pkg/federation-controller/daemonset/daemonset_controller.go +++ b/federation/pkg/federation-controller/daemonset/daemonset_controller.go @@ -22,7 +22,7 @@ import ( "time" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" - federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" diff --git a/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go b/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go index 0c256d6968..6280f0f4e1 100644 --- a/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go +++ b/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go @@ -23,7 +23,7 @@ import ( "time" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" - fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/fake" + fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" diff --git a/federation/pkg/federation-controller/deployment/deploymentcontroller.go b/federation/pkg/federation-controller/deployment/deploymentcontroller.go index eae860c430..cc82026300 100644 --- a/federation/pkg/federation-controller/deployment/deploymentcontroller.go +++ b/federation/pkg/federation-controller/deployment/deploymentcontroller.go @@ -27,7 +27,7 @@ import ( fed "k8s.io/kubernetes/federation/apis/federation" fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" - fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" diff --git a/federation/pkg/federation-controller/deployment/deploymentcontroller_test.go b/federation/pkg/federation-controller/deployment/deploymentcontroller_test.go index effdacf824..7482a889f7 100644 --- a/federation/pkg/federation-controller/deployment/deploymentcontroller_test.go +++ b/federation/pkg/federation-controller/deployment/deploymentcontroller_test.go @@ -23,7 +23,7 @@ import ( "time" fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" - fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/fake" + fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" "k8s.io/kubernetes/pkg/api/meta" apiv1 "k8s.io/kubernetes/pkg/api/v1" diff --git a/federation/pkg/federation-controller/ingress/ingress_controller.go b/federation/pkg/federation-controller/ingress/ingress_controller.go index b43cd0d7e7..436c824835 100644 --- a/federation/pkg/federation-controller/ingress/ingress_controller.go +++ b/federation/pkg/federation-controller/ingress/ingress_controller.go @@ -22,7 +22,7 @@ import ( "time" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" - federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" diff --git a/federation/pkg/federation-controller/ingress/ingress_controller_test.go b/federation/pkg/federation-controller/ingress/ingress_controller_test.go index 3142b2a064..53d44f8fbe 100644 --- a/federation/pkg/federation-controller/ingress/ingress_controller_test.go +++ b/federation/pkg/federation-controller/ingress/ingress_controller_test.go @@ -23,7 +23,7 @@ import ( "time" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" - fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/fake" + fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" diff --git a/federation/pkg/federation-controller/namespace/namespace_controller.go b/federation/pkg/federation-controller/namespace/namespace_controller.go index d18543fe52..2c9da0c2c3 100644 --- a/federation/pkg/federation-controller/namespace/namespace_controller.go +++ b/federation/pkg/federation-controller/namespace/namespace_controller.go @@ -21,7 +21,7 @@ import ( "time" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" - federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" diff --git a/federation/pkg/federation-controller/namespace/namespace_controller_test.go b/federation/pkg/federation-controller/namespace/namespace_controller_test.go index 05aa5a4089..8fc78e6095 100644 --- a/federation/pkg/federation-controller/namespace/namespace_controller_test.go +++ b/federation/pkg/federation-controller/namespace/namespace_controller_test.go @@ -22,7 +22,7 @@ import ( "time" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" - fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/fake" + fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" diff --git a/federation/pkg/federation-controller/replicaset/replicasetcontroller.go b/federation/pkg/federation-controller/replicaset/replicasetcontroller.go index 2d69bf984f..259eaa23bb 100644 --- a/federation/pkg/federation-controller/replicaset/replicasetcontroller.go +++ b/federation/pkg/federation-controller/replicaset/replicasetcontroller.go @@ -27,7 +27,7 @@ import ( fed "k8s.io/kubernetes/federation/apis/federation" fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" - fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" diff --git a/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go b/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go index 751c9b7695..a2b9b436c6 100644 --- a/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go +++ b/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go @@ -23,7 +23,7 @@ import ( "time" fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" - fedclientfake "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/fake" + fedclientfake "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" "k8s.io/kubernetes/pkg/api/meta" apiv1 "k8s.io/kubernetes/pkg/api/v1" diff --git a/federation/pkg/federation-controller/secret/secret_controller.go b/federation/pkg/federation-controller/secret/secret_controller.go index 077594e899..0ebd5554fd 100644 --- a/federation/pkg/federation-controller/secret/secret_controller.go +++ b/federation/pkg/federation-controller/secret/secret_controller.go @@ -21,7 +21,7 @@ import ( "time" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" - federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" diff --git a/federation/pkg/federation-controller/secret/secret_controller_test.go b/federation/pkg/federation-controller/secret/secret_controller_test.go index 54c043b58f..f5ceea4c21 100644 --- a/federation/pkg/federation-controller/secret/secret_controller_test.go +++ b/federation/pkg/federation-controller/secret/secret_controller_test.go @@ -23,7 +23,7 @@ import ( "time" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" - fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/fake" + fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" diff --git a/federation/pkg/federation-controller/service/endpoint_helper.go b/federation/pkg/federation-controller/service/endpoint_helper.go index 31c78010b6..8483a60138 100644 --- a/federation/pkg/federation-controller/service/endpoint_helper.go +++ b/federation/pkg/federation-controller/service/endpoint_helper.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" v1 "k8s.io/kubernetes/pkg/api/v1" cache "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/controller" diff --git a/federation/pkg/federation-controller/service/service_helper.go b/federation/pkg/federation-controller/service/service_helper.go index 983e947861..e18dda44b3 100644 --- a/federation/pkg/federation-controller/service/service_helper.go +++ b/federation/pkg/federation-controller/service/service_helper.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/pkg/api/errors" v1 "k8s.io/kubernetes/pkg/api/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" diff --git a/federation/pkg/federation-controller/service/servicecontroller.go b/federation/pkg/federation-controller/service/servicecontroller.go index b5cc3cc5c2..152601c7e8 100644 --- a/federation/pkg/federation-controller/service/servicecontroller.go +++ b/federation/pkg/federation-controller/service/servicecontroller.go @@ -26,7 +26,7 @@ import ( "github.com/golang/glog" v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" federationcache "k8s.io/kubernetes/federation/client/cache" - fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/dnsprovider" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" diff --git a/federation/pkg/federation-controller/util/cluster_util.go b/federation/pkg/federation-controller/util/cluster_util.go index 11b64c6869..b94f81a266 100644 --- a/federation/pkg/federation-controller/util/cluster_util.go +++ b/federation/pkg/federation-controller/util/cluster_util.go @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" - fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/pkg/api" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" diff --git a/federation/pkg/federation-controller/util/eventsink/eventsink.go b/federation/pkg/federation-controller/util/eventsink/eventsink.go index 5d1ae3e9f2..ab430fdfd9 100644 --- a/federation/pkg/federation-controller/util/eventsink/eventsink.go +++ b/federation/pkg/federation-controller/util/eventsink/eventsink.go @@ -17,7 +17,7 @@ limitations under the License. package eventsink import ( - fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" api "k8s.io/kubernetes/pkg/api" api_v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" diff --git a/federation/pkg/federation-controller/util/eventsink/eventsink_test.go b/federation/pkg/federation-controller/util/eventsink/eventsink_test.go index 0c45f59ac1..639a2bb5ac 100644 --- a/federation/pkg/federation-controller/util/eventsink/eventsink_test.go +++ b/federation/pkg/federation-controller/util/eventsink/eventsink_test.go @@ -19,7 +19,7 @@ package eventsink import ( "testing" - fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/fake" + fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/federation/pkg/federation-controller/util/federated_informer.go b/federation/pkg/federation-controller/util/federated_informer.go index b230a58b59..768154a188 100644 --- a/federation/pkg/federation-controller/util/federated_informer.go +++ b/federation/pkg/federation-controller/util/federated_informer.go @@ -23,7 +23,7 @@ import ( "time" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" - federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" diff --git a/federation/pkg/federation-controller/util/federated_informer_test.go b/federation/pkg/federation-controller/util/federated_informer_test.go index a6a8d47ba0..4c83b3b894 100644 --- a/federation/pkg/federation-controller/util/federated_informer_test.go +++ b/federation/pkg/federation-controller/util/federated_informer_test.go @@ -21,7 +21,7 @@ import ( "time" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" - fakefederationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/fake" + fakefederationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" diff --git a/test/e2e/federated-ingress.go b/test/e2e/federated-ingress.go index e890cd09eb..fb5caca70b 100644 --- a/test/e2e/federated-ingress.go +++ b/test/e2e/federated-ingress.go @@ -25,7 +25,7 @@ import ( "strings" "time" - fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" diff --git a/test/e2e/federated-namespace.go b/test/e2e/federated-namespace.go index 40acee5c0f..6eb4b728ce 100644 --- a/test/e2e/federated-namespace.go +++ b/test/e2e/federated-namespace.go @@ -22,7 +22,7 @@ import ( "strings" "time" - clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5/typed/core/v1" + clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" api_v1 "k8s.io/kubernetes/pkg/api/v1" diff --git a/test/e2e/federated-secret.go b/test/e2e/federated-secret.go index 9b31633e6c..c27f231d43 100644 --- a/test/e2e/federated-secret.go +++ b/test/e2e/federated-secret.go @@ -23,7 +23,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" diff --git a/test/e2e/federation-apiserver.go b/test/e2e/federation-apiserver.go index 1285154a3a..f93f2eddee 100644 --- a/test/e2e/federation-apiserver.go +++ b/test/e2e/federation-apiserver.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" - "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/pkg/api/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/wait" @@ -123,7 +123,7 @@ func newService(name, namespace string) *v1.Service { } // Verify that the cluster is marked ready. -func isReady(clusterName string, clientset *federation_release_1_5.Clientset) error { +func isReady(clusterName string, clientset *federation_clientset.Clientset) error { return wait.PollImmediate(time.Second, 5*time.Minute, func() (bool, error) { c, err := clientset.Federation().Clusters().Get(clusterName, metav1.GetOptions{}) if err != nil { diff --git a/test/e2e/federation-authn.go b/test/e2e/federation-authn.go index 6eed3afe97..9ee73c02ee 100644 --- a/test/e2e/federation-authn.go +++ b/test/e2e/federation-authn.go @@ -19,7 +19,7 @@ package e2e import ( "fmt" - "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" @@ -82,7 +82,7 @@ var _ = framework.KubeDescribe("[Feature:Federation]", func() { }) }) -func invalidAuthFederationClientSet(user *framework.KubeUser) (*federation_release_1_5.Clientset, error) { +func invalidAuthFederationClientSet(user *framework.KubeUser) (*federation_clientset.Clientset, error) { overrides := &clientcmd.ConfigOverrides{} if user != nil { overrides = &clientcmd.ConfigOverrides{ @@ -105,7 +105,7 @@ func invalidAuthFederationClientSet(user *framework.KubeUser) (*federation_relea config.Username = "" } - c, err := federation_release_1_5.NewForConfig(config) + c, err := federation_clientset.NewForConfig(config) if err != nil { return nil, fmt.Errorf("error creating federation clientset: %v", err) } diff --git a/test/e2e/federation-daemonset.go b/test/e2e/federation-daemonset.go index 43612adb86..989bb9e1ae 100644 --- a/test/e2e/federation-daemonset.go +++ b/test/e2e/federation-daemonset.go @@ -23,7 +23,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" diff --git a/test/e2e/federation-deployment.go b/test/e2e/federation-deployment.go index f4bfb0de2f..a27d2b0064 100644 --- a/test/e2e/federation-deployment.go +++ b/test/e2e/federation-deployment.go @@ -22,7 +22,7 @@ import ( "strings" "time" - fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" diff --git a/test/e2e/federation-event.go b/test/e2e/federation-event.go index fb09a30910..d4c12efb83 100644 --- a/test/e2e/federation-event.go +++ b/test/e2e/federation-event.go @@ -20,7 +20,7 @@ import ( "fmt" . "github.com/onsi/ginkgo" - "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/test/e2e/framework" @@ -64,7 +64,7 @@ var _ = framework.KubeDescribe("Federation events [Feature:Federation]", func() }) }) -func createEventOrFail(clientset *federation_release_1_5.Clientset, namespace string) *v1.Event { +func createEventOrFail(clientset *federation_clientset.Clientset, namespace string) *v1.Event { if clientset == nil || len(namespace) == 0 { Fail(fmt.Sprintf("Internal error: invalid parameters passed to createEventOrFail: clientset: %v, namespace: %v", clientset, namespace)) } diff --git a/test/e2e/federation-replicaset.go b/test/e2e/federation-replicaset.go index ef637d67a6..8b0da2308a 100644 --- a/test/e2e/federation-replicaset.go +++ b/test/e2e/federation-replicaset.go @@ -22,7 +22,7 @@ import ( "strings" "time" - fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" diff --git a/test/e2e/federation-util.go b/test/e2e/federation-util.go index 45cae8be09..005aae38e4 100644 --- a/test/e2e/federation-util.go +++ b/test/e2e/federation-util.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/util/intstr" federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" - fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 6dab8b67f9..caabf03d14 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -29,7 +29,7 @@ import ( staging "k8s.io/client-go/kubernetes" "k8s.io/client-go/pkg/util/sets" clientreporestclient "k8s.io/client-go/rest" - "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" @@ -94,7 +94,7 @@ type Framework struct { federated bool // Federation specific params. These are set only if federated = true. - FederationClientset_1_5 *federation_release_1_5.Clientset + FederationClientset_1_5 *federation_clientset.Clientset FederationNamespace *v1.Namespace } diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 7575202466..18b4012186 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -49,7 +49,7 @@ import ( . "github.com/onsi/gomega" gomegatypes "github.com/onsi/gomega/types" - "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" + "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/v1" @@ -813,7 +813,7 @@ func WaitForDefaultServiceAccountInNamespace(c clientset.Interface, namespace st // WaitForFederationApiserverReady waits for the federation apiserver to be ready. // It tests the readiness by sending a GET request and expecting a non error response. -func WaitForFederationApiserverReady(c *federation_release_1_5.Clientset) error { +func WaitForFederationApiserverReady(c *federation_clientset.Clientset) error { return wait.PollImmediate(time.Second, 1*time.Minute, func() (bool, error) { _, err := c.Federation().Clusters().List(v1.ListOptions{}) if err != nil { @@ -1820,13 +1820,13 @@ func LoadFederatedConfig(overrides *clientcmd.ConfigOverrides) (*restclient.Conf return cfg, nil } -func LoadFederationClientset_1_5() (*federation_release_1_5.Clientset, error) { +func LoadFederationClientset_1_5() (*federation_clientset.Clientset, error) { config, err := LoadFederatedConfig(&clientcmd.ConfigOverrides{}) if err != nil { return nil, err } - c, err := federation_release_1_5.NewForConfig(config) + c, err := federation_clientset.NewForConfig(config) if err != nil { return nil, fmt.Errorf("error creating federation clientset: %v", err.Error()) }