scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

move federation_release_1_5 to federation_clientset

Browse Source
This commit is contained in:
Chao Xu
2016-12-14 09:57:24 -08:00
parent b2ab99a4f4
commit c81057be2c
89 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
federation/client/clientset_generated/federation_release_1_5/BUILD → federation/client/clientset_generated/federation_clientset/BUILD
View File

0
federation/client/clientset_generated/federation_release_1_5/clientset.go → federation/client/clientset_generated/federation_clientset/clientset.go
View File

0
federation/client/clientset_generated/federation_release_1_5/doc.go → federation/client/clientset_generated/federation_clientset/doc.go
View File

0
federation/client/clientset_generated/federation_release_1_5/fake/BUILD → federation/client/clientset_generated/federation_clientset/fake/BUILD
View File

0
federation/client/clientset_generated/federation_release_1_5/fake/clientset_generated.go → federation/client/clientset_generated/federation_clientset/fake/clientset_generated.go
View File

0
federation/client/clientset_generated/federation_release_1_5/fake/doc.go → federation/client/clientset_generated/federation_clientset/fake/doc.go
View File

0
federation/client/clientset_generated/federation_release_1_5/import_known_versions.go → federation/client/clientset_generated/federation_clientset/import_known_versions.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/BUILD → federation/client/clientset_generated/federation_clientset/typed/core/v1/BUILD
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/configmap.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/core_client.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/doc.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/doc.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/event.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/BUILD → federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/BUILD
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/doc.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/doc.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_configmap.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_configmap.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_core_client.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_core_client.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_event.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_event.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_namespace_expansion.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace_expansion.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_secret.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_secret.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/fake/fake_service.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_service.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/generated_expansion.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/generated_expansion.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/namespace_expansion.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace_expansion.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/secret.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/core/v1/service.go → federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/BUILD → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/BUILD
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/daemonset.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/deployment.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/deployment_expansion.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment_expansion.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/doc.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/doc.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/extensions_client.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/BUILD → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/BUILD
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/doc.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/doc.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_daemonset.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_deployment.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_deployment_expansion.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_extensions_client.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_extensions_client.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_ingress.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/fake/fake_replicaset.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/generated_expansion.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/generated_expansion.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/ingress.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/extensions/v1beta1/replicaset.go → federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/BUILD → federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/BUILD
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/cluster.go → federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/cluster.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/doc.go → federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/doc.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/BUILD → federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/BUILD
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/doc.go → federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/doc.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_cluster.go → federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_cluster.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/fake/fake_federation_client.go → federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/fake/fake_federation_client.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/federation_client.go → federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/federation_client.go
View File

0
federation/client/clientset_generated/federation_release_1_5/typed/federation/v1beta1/generated_expansion.go → federation/client/clientset_generated/federation_clientset/typed/federation/v1beta1/generated_expansion.go
View File

2
federation/cmd/federation-controller-manager/app/controllermanager.go
View File

@@ -26,7 +26,7 @@ import (
"net/http/pprof" "net/http/pprof"
"strconv" "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/cmd/federation-controller-manager/app/options"
"k8s.io/kubernetes/federation/pkg/dnsprovider" "k8s.io/kubernetes/federation/pkg/dnsprovider"
clustercontroller "k8s.io/kubernetes/federation/pkg/federation-controller/cluster" clustercontroller "k8s.io/kubernetes/federation/pkg/federation-controller/cluster"

2
federation/pkg/federation-controller/cluster/clustercontroller.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
federationv1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" federationv1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
clustercache "k8s.io/kubernetes/federation/client/cache" 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/api/v1"
"k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller"

2
federation/pkg/federation-controller/cluster/clustercontroller_test.go
View File

@@ -24,7 +24,7 @@ import (
"testing" "testing"
federationv1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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" controllerutil "k8s.io/kubernetes/federation/pkg/federation-controller/util"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"

2
federation/pkg/federation-controller/configmap/configmap_controller.go
View File

@@ -20,7 +20,7 @@ import (
"time" "time"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"

2
federation/pkg/federation-controller/configmap/configmap_controller_test.go
View File

@@ -22,7 +22,7 @@ import (
"time" "time"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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"
. "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test"
apiv1 "k8s.io/kubernetes/pkg/api/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1"

2
federation/pkg/federation-controller/daemonset/daemonset_controller.go
View File

@@ -22,7 +22,7 @@ import (
"time" "time"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink"

2
federation/pkg/federation-controller/daemonset/daemonset_controller_test.go
View File

@@ -23,7 +23,7 @@ import (
"time" "time"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
. "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test"

2
federation/pkg/federation-controller/deployment/deploymentcontroller.go
View File

@@ -27,7 +27,7 @@ import (
fed "k8s.io/kubernetes/federation/apis/federation" fed "k8s.io/kubernetes/federation/apis/federation"
fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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" 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/deletionhelper"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink"

2
federation/pkg/federation-controller/deployment/deploymentcontroller_test.go
View File

@@ -23,7 +23,7 @@ import (
"time" "time"
fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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/federation/pkg/federation-controller/util/test"
"k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta"
apiv1 "k8s.io/kubernetes/pkg/api/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1"

2
federation/pkg/federation-controller/ingress/ingress_controller.go
View File

@@ -22,7 +22,7 @@ import (
"time" "time"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink"

2
federation/pkg/federation-controller/ingress/ingress_controller_test.go
View File

@@ -23,7 +23,7 @@ import (
"time" "time"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
. "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test"

2
federation/pkg/federation-controller/namespace/namespace_controller.go
View File

@@ -21,7 +21,7 @@ import (
"time" "time"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink"

2
federation/pkg/federation-controller/namespace/namespace_controller_test.go
View File

@@ -22,7 +22,7 @@ import (
"time" "time"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
. "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test"

2
federation/pkg/federation-controller/replicaset/replicasetcontroller.go
View File

@@ -27,7 +27,7 @@ import (
fed "k8s.io/kubernetes/federation/apis/federation" fed "k8s.io/kubernetes/federation/apis/federation"
fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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" 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/deletionhelper"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink"

2
federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go
View File

@@ -23,7 +23,7 @@ import (
"time" "time"
fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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/federation/pkg/federation-controller/util/test"
"k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta"
apiv1 "k8s.io/kubernetes/pkg/api/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1"

2
federation/pkg/federation-controller/secret/secret_controller.go
View File

@@ -21,7 +21,7 @@ import (
"time" "time"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink"

2
federation/pkg/federation-controller/secret/secret_controller_test.go
View File

@@ -23,7 +23,7 @@ import (
"time" "time"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
. "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test"

2
federation/pkg/federation-controller/service/endpoint_helper.go
View File

@@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"time" "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" v1 "k8s.io/kubernetes/pkg/api/v1"
cache "k8s.io/kubernetes/pkg/client/cache" cache "k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller"

2
federation/pkg/federation-controller/service/service_helper.go
View File

@@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"time" "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/errors"
v1 "k8s.io/kubernetes/pkg/api/v1" v1 "k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"

2
federation/pkg/federation-controller/service/servicecontroller.go
View File

@@ -26,7 +26,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
federationcache "k8s.io/kubernetes/federation/client/cache" 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/federation/pkg/dnsprovider"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/errors"

2
federation/pkg/federation-controller/util/cluster_util.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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" "k8s.io/kubernetes/pkg/api"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

2
federation/pkg/federation-controller/util/eventsink/eventsink.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package eventsink package eventsink
import ( 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 "k8s.io/kubernetes/pkg/api"
api_v1 "k8s.io/kubernetes/pkg/api/v1" api_v1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/record"

2
federation/pkg/federation-controller/util/eventsink/eventsink_test.go
View File

@@ -19,7 +19,7 @@ package eventsink
import ( import (
"testing" "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" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test"
apiv1 "k8s.io/kubernetes/pkg/api/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/client/testing/core"

2
federation/pkg/federation-controller/util/federated_informer.go
View File

@@ -23,7 +23,7 @@ import (
"time" "time"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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" apiv1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/cache"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"

2
federation/pkg/federation-controller/util/federated_informer_test.go
View File

@@ -21,7 +21,7 @@ import (
"time" "time"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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" apiv1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/cache"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"

2
test/e2e/federated-ingress.go
View File

@@ -25,7 +25,7 @@ import (
"strings" "strings"
"time" "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/errors"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"

2
test/e2e/federated-namespace.go
View File

@@ -22,7 +22,7 @@ import (
"strings" "strings"
"time" "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/errors"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
api_v1 "k8s.io/kubernetes/pkg/api/v1" api_v1 "k8s.io/kubernetes/pkg/api/v1"

2
test/e2e/federated-secret.go
View File

@@ -23,7 +23,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "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/federation/pkg/federation-controller/util"
"k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"

4
test/e2e/federation-apiserver.go
View File

@@ -22,7 +22,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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" "k8s.io/kubernetes/pkg/api/v1"
metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/wait"
@@ -123,7 +123,7 @@ func newService(name, namespace string) *v1.Service {
} }
// Verify that the cluster is marked ready. // 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) { return wait.PollImmediate(time.Second, 5*time.Minute, func() (bool, error) {
c, err := clientset.Federation().Clusters().Get(clusterName, metav1.GetOptions{}) c, err := clientset.Federation().Clusters().Get(clusterName, metav1.GetOptions{})
if err != nil { if err != nil {

6
test/e2e/federation-authn.go
View File

@@ -19,7 +19,7 @@ package e2e
import ( import (
"fmt" "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/api/errors"
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" 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{} overrides := &clientcmd.ConfigOverrides{}
if user != nil { if user != nil {
overrides = &clientcmd.ConfigOverrides{ overrides = &clientcmd.ConfigOverrides{
@@ -105,7 +105,7 @@ func invalidAuthFederationClientSet(user *framework.KubeUser) (*federation_relea
config.Username = "" config.Username = ""
} }
c, err := federation_release_1_5.NewForConfig(config) c, err := federation_clientset.NewForConfig(config)
if err != nil { if err != nil {
return nil, fmt.Errorf("error creating federation clientset: %v", err) return nil, fmt.Errorf("error creating federation clientset: %v", err)
} }

2
test/e2e/federation-daemonset.go
View File

@@ -23,7 +23,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "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/federation/pkg/federation-controller/util"
"k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"

2
test/e2e/federation-deployment.go
View File

@@ -22,7 +22,7 @@ import (
"strings" "strings"
"time" "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" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"

4
test/e2e/federation-event.go
View File

@@ -20,7 +20,7 @@ import (
"fmt" "fmt"
. "github.com/onsi/ginkgo" . "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/pkg/api/v1"
"k8s.io/kubernetes/test/e2e/framework" "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 { if clientset == nil || len(namespace) == 0 {
Fail(fmt.Sprintf("Internal error: invalid parameters passed to createEventOrFail: clientset: %v, namespace: %v", clientset, namespace)) Fail(fmt.Sprintf("Internal error: invalid parameters passed to createEventOrFail: clientset: %v, namespace: %v", clientset, namespace))
} }

2
test/e2e/federation-replicaset.go
View File

@@ -22,7 +22,7 @@ import (
"strings" "strings"
"time" "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" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"

2
test/e2e/federation-util.go
View File

@@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/intstr"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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"
"k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"

4
test/e2e/framework/framework.go
View File

@@ -29,7 +29,7 @@ import (
staging "k8s.io/client-go/kubernetes" staging "k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/util/sets" "k8s.io/client-go/pkg/util/sets"
clientreporestclient "k8s.io/client-go/rest" 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" "k8s.io/kubernetes/pkg/api"
apierrs "k8s.io/kubernetes/pkg/api/errors" apierrs "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
@@ -94,7 +94,7 @@ type Framework struct {
federated bool federated bool
// Federation specific params. These are set only if federated = true. // 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 FederationNamespace *v1.Namespace
} }

8
test/e2e/framework/util.go
View File

@@ -49,7 +49,7 @@ import (
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
gomegatypes "github.com/onsi/gomega/types" 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" "k8s.io/kubernetes/pkg/api"
apierrs "k8s.io/kubernetes/pkg/api/errors" apierrs "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/v1" "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. // WaitForFederationApiserverReady waits for the federation apiserver to be ready.
// It tests the readiness by sending a GET request and expecting a non error response. // 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) { return wait.PollImmediate(time.Second, 1*time.Minute, func() (bool, error) {
_, err := c.Federation().Clusters().List(v1.ListOptions{}) _, err := c.Federation().Clusters().List(v1.ListOptions{})
if err != nil { if err != nil {
@@ -1820,13 +1820,13 @@ func LoadFederatedConfig(overrides *clientcmd.ConfigOverrides) (*restclient.Conf
return cfg, nil 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{}) config, err := LoadFederatedConfig(&clientcmd.ConfigOverrides{})
if err != nil { if err != nil {
return nil, err return nil, err
} }
c, err := federation_release_1_5.NewForConfig(config) c, err := federation_clientset.NewForConfig(config)
if err != nil { if err != nil {
return nil, fmt.Errorf("error creating federation clientset: %v", err.Error()) return nil, fmt.Errorf("error creating federation clientset: %v", err.Error())
} }