github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

run root-rewrite-v1-..., compile

pull/6/head
Chao Xu 2017-06-22 10:25:57 -07:00
parent 9f5f4ba729
commit f4989a45a5
1049 changed files with 1522 additions and 1418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-controller-manager/app/core.go
View File

@ -33,7 +33,7 @@ import (
"k8s.io/client-go/discovery"
"k8s.io/client-go/dynamic"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/controller"
endpointcontroller "k8s.io/kubernetes/pkg/controller/endpoint"

2
cmd/kubelet/app/server.go
View File

@ -58,7 +58,7 @@ import (
certutil "k8s.io/client-go/util/cert"
"k8s.io/kubernetes/cmd/kubelet/app/options"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1"
"k8s.io/kubernetes/pkg/apis/componentconfig"
componentconfigv1alpha1 "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1"

2
cmd/libs/go2idl/conversion-gen/main.go
View File

@ -55,7 +55,7 @@ func main() {
customArgs := &generators.CustomArgs{
ExtraPeerDirs: []string{
"k8s.io/kubernetes/pkg/api",
"k8s.io/kubernetes/pkg/api/v1",
"k8s.io/api/core/v1",
"k8s.io/apimachinery/pkg/apis/meta/v1",
"k8s.io/apimachinery/pkg/conversion",
"k8s.io/apimachinery/pkg/runtime",

2
federation/apis/core/v1/register.go
View File

@ -20,7 +20,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
// GroupName is the group name use in this package

2
federation/apis/federation/types.go
View File

@ -19,7 +19,7 @@ package federation
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
// ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.

2
federation/apis/federation/v1beta1/generated.pb.go
View File

@ -39,7 +39,7 @@ import proto "github.com/gogo/protobuf/proto"
import fmt "fmt"
import math "math"
import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1"
import k8s_io_kubernetes_pkg_api_v1 "k8s.io/api/core/v1"
import strings "strings"
import reflect "reflect"

2
federation/apis/federation/v1beta1/types.generated.go
View File

@ -27,7 +27,7 @@ import (
codec1978 "github.com/ugorji/go/codec"
pkg2_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkg3_types "k8s.io/apimachinery/pkg/types"
pkg1_v1 "k8s.io/kubernetes/pkg/api/v1"
pkg1_v1 "k8s.io/api/core/v1"
"reflect"
"runtime"
time "time"

2
federation/apis/federation/v1beta1/types.go
View File

@ -18,7 +18,7 @@ package v1beta1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
// ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.

5
federation/apis/federation/v1beta1/zz_generated.conversion.go
View File

@ -21,12 +21,13 @@ limitations under the License.
package v1beta1
import (
unsafe "unsafe"
v1 "k8s.io/api/core/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
federation "k8s.io/kubernetes/federation/apis/federation"
api "k8s.io/kubernetes/pkg/api"
v1 "k8s.io/kubernetes/pkg/api/v1"
unsafe "unsafe"
)
func init() {

5
federation/apis/federation/v1beta1/zz_generated.deepcopy.go
View File

@ -21,11 +21,12 @@ limitations under the License.
package v1beta1
import (
reflect "reflect"
api_v1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
api_v1 "k8s.io/kubernetes/pkg/api/v1"
reflect "reflect"
)
func init() {

5
federation/apis/federation/zz_generated.deepcopy.go
View File

@ -21,12 +21,13 @@ limitations under the License.
package federation
import (
reflect "reflect"
api_v1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
api "k8s.io/kubernetes/pkg/api"
api_v1 "k8s.io/kubernetes/pkg/api/v1"
reflect "reflect"
)
func init() {

2
federation/client/clientset_generated/federation_clientset/fake/register.go
View File

@ -22,7 +22,7 @@ import (
schema "k8s.io/apimachinery/pkg/runtime/schema"
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
federationv1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
corev1 "k8s.io/kubernetes/pkg/api/v1"
corev1 "k8s.io/api/core/v1"
autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1"
extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"

2
federation/client/clientset_generated/federation_clientset/typed/core/v1/configmap.go
View File

@ -22,7 +22,7 @@ import (
watch "k8s.io/apimachinery/pkg/watch"
rest "k8s.io/client-go/rest"
scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme"
v1 "k8s.io/kubernetes/pkg/api/v1"
v1 "k8s.io/api/core/v1"
)
// ConfigMapsGetter has a method to return a ConfigMapInterface.

2
federation/client/clientset_generated/federation_clientset/typed/core/v1/core_client.go
View File

@ -20,7 +20,7 @@ import (
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
rest "k8s.io/client-go/rest"
"k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme"
v1 "k8s.io/kubernetes/pkg/api/v1"
v1 "k8s.io/api/core/v1"
)
type CoreV1Interface interface {

2
federation/client/clientset_generated/federation_clientset/typed/core/v1/event.go
View File

@ -22,7 +22,7 @@ import (
watch "k8s.io/apimachinery/pkg/watch"
rest "k8s.io/client-go/rest"
scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme"
v1 "k8s.io/kubernetes/pkg/api/v1"
v1 "k8s.io/api/core/v1"
)
// EventsGetter has a method to return a EventInterface.

2
federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_configmap.go
View File

@ -23,7 +23,7 @@ import (
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
testing "k8s.io/client-go/testing"
v1 "k8s.io/kubernetes/pkg/api/v1"
v1 "k8s.io/api/core/v1"
)
// FakeConfigMaps implements ConfigMapInterface

2
federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_event.go
View File

@ -23,7 +23,7 @@ import (
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
testing "k8s.io/client-go/testing"
v1 "k8s.io/kubernetes/pkg/api/v1"
v1 "k8s.io/api/core/v1"
)
// FakeEvents implements EventInterface

2
federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace.go
View File

@ -23,7 +23,7 @@ import (
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
testing "k8s.io/client-go/testing"
v1 "k8s.io/kubernetes/pkg/api/v1"
v1 "k8s.io/api/core/v1"
)
// FakeNamespaces implements NamespaceInterface

2
federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_namespace_expansion.go
View File

@ -18,7 +18,7 @@ package fake
import (
core "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
func (c *FakeNamespaces) Finalize(namespace *v1.Namespace) (*v1.Namespace, error) {

2
federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_secret.go
View File

@ -23,7 +23,7 @@ import (
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
testing "k8s.io/client-go/testing"
v1 "k8s.io/kubernetes/pkg/api/v1"
v1 "k8s.io/api/core/v1"
)
// FakeSecrets implements SecretInterface

2
federation/client/clientset_generated/federation_clientset/typed/core/v1/fake/fake_service.go
View File

@ -23,7 +23,7 @@ import (
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
testing "k8s.io/client-go/testing"
v1 "k8s.io/kubernetes/pkg/api/v1"
v1 "k8s.io/api/core/v1"
)
// FakeServices implements ServiceInterface

2
federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace.go
View File

@ -22,7 +22,7 @@ import (
watch "k8s.io/apimachinery/pkg/watch"
rest "k8s.io/client-go/rest"
scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme"
v1 "k8s.io/kubernetes/pkg/api/v1"
v1 "k8s.io/api/core/v1"
)
// NamespacesGetter has a method to return a NamespaceInterface.

2
federation/client/clientset_generated/federation_clientset/typed/core/v1/namespace_expansion.go
View File

@ -16,7 +16,7 @@ limitations under the License.
package v1
import "k8s.io/kubernetes/pkg/api/v1"
import "k8s.io/api/core/v1"
// The NamespaceExpansion interface allows manually adding extra methods to the NamespaceInterface.
type NamespaceExpansion interface {

2
federation/client/clientset_generated/federation_clientset/typed/core/v1/secret.go
View File

@ -22,7 +22,7 @@ import (
watch "k8s.io/apimachinery/pkg/watch"
rest "k8s.io/client-go/rest"
scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme"
v1 "k8s.io/kubernetes/pkg/api/v1"
v1 "k8s.io/api/core/v1"
)
// SecretsGetter has a method to return a SecretInterface.

2
federation/client/clientset_generated/federation_clientset/typed/core/v1/service.go
View File

@ -22,7 +22,7 @@ import (
watch "k8s.io/apimachinery/pkg/watch"
rest "k8s.io/client-go/rest"
scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme"
v1 "k8s.io/kubernetes/pkg/api/v1"
v1 "k8s.io/api/core/v1"
)
// ServicesGetter has a method to return a ServiceInterface.

2
federation/cmd/federation-apiserver/app/server.go
View File

@ -40,7 +40,7 @@ import (
federationv1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
"k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options"
"k8s.io/kubernetes/pkg/api"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

2
federation/pkg/federatedtypes/configmap.go
View File

@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/watch"
federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
"k8s.io/kubernetes/federation/pkg/federation-controller/util"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
)

2
federation/pkg/federatedtypes/daemonset.go
View File

@ -26,7 +26,7 @@ import (
"k8s.io/apimachinery/pkg/watch"
federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
"k8s.io/kubernetes/federation/pkg/federation-controller/util"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
)

2
federation/pkg/federatedtypes/secret.go
View File

@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/watch"
federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
"k8s.io/kubernetes/federation/pkg/federation-controller/util"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
)

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

@ -28,7 +28,7 @@ import (
federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
"k8s.io/kubernetes/federation/pkg/federation-controller/util"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
)

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

@ -33,7 +33,7 @@ import (
controllerutil "k8s.io/kubernetes/federation/pkg/federation-controller/util"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
func newCluster(clusterName string, serverUrl string) *federationv1beta1.Cluster {

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

@ -45,7 +45,7 @@ import (
"k8s.io/kubernetes/federation/pkg/federation-controller/util/podanalyzer"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/replicapreferences"
"k8s.io/kubernetes/pkg/api"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/controller"

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

@ -29,7 +29,7 @@ import (
fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
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"
apiv1 "k8s.io/api/core/v1"
extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"

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

@ -39,7 +39,7 @@ import (
"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/controller"

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

@ -34,7 +34,7 @@ import (
"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
finalizersutil "k8s.io/kubernetes/federation/pkg/federation-controller/util/finalizers"
. "k8s.io/kubernetes/federation/pkg/federation-controller/util/test"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"

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

@ -36,7 +36,7 @@ import (
"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink"
"k8s.io/kubernetes/pkg/api"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller/namespace/deletion"

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

@ -32,7 +32,7 @@ import (
"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"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"

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

@ -45,7 +45,7 @@ import (
"k8s.io/kubernetes/federation/pkg/federation-controller/util/podanalyzer"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/replicapreferences"
"k8s.io/kubernetes/pkg/api"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/controller"

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

@ -28,7 +28,7 @@ import (
fedv1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
fedclientfake "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"
apiv1 "k8s.io/api/core/v1"
extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
kubeclientfake "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"

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

@ -37,7 +37,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/rrstype"
"k8s.io/kubernetes/federation/pkg/federation-controller/service/ingress"
"k8s.io/kubernetes/federation/pkg/federation-controller/util"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1"
)

2
federation/pkg/federation-controller/service/dns/dns_test.go
View File

@ -29,7 +29,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns" // Only for unit testing purposes.
"k8s.io/kubernetes/federation/pkg/federation-controller/service/ingress"
. "k8s.io/kubernetes/federation/pkg/federation-controller/util/test"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
// NewClusterWithRegionZone builds a new cluster object with given region and zone attributes.

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

@ -22,7 +22,7 @@ import (
"strings"
fedapi "k8s.io/kubernetes/federation/apis/federation"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
// Compile time check for interface adherence

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

@ -47,7 +47,7 @@ import (
"k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper"
"k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1"
"k8s.io/kubernetes/pkg/controller"

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

@ -37,7 +37,7 @@ import (
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/test"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"
corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1"

2
federation/pkg/federation-controller/sync/controller_test.go
View File

@ -26,7 +26,7 @@ import (
"k8s.io/kubernetes/federation/pkg/federatedtypes"
"k8s.io/kubernetes/federation/pkg/federation-controller/util"
fedtest "k8s.io/kubernetes/federation/pkg/federation-controller/util/test"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
"github.com/stretchr/testify/require"
)

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

@ -19,7 +19,7 @@ package util
import (
"reflect"
api_v1 "k8s.io/kubernetes/pkg/api/v1"
api_v1 "k8s.io/api/core/v1"
)
// Checks if cluster-independent, user provided data in two given ConfigMaps are equal. If in

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

@ -27,7 +27,7 @@ import (
clientv1 "k8s.io/client-go/pkg/api/v1"
"k8s.io/client-go/tools/record"
fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
kubev1 "k8s.io/kubernetes/pkg/api/v1"
kubev1 "k8s.io/api/core/v1"
)
// Implements k8s.io/client-go/tools/record.EventSink.

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

@ -25,7 +25,7 @@ import (
core "k8s.io/client-go/testing"
fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake"
. "k8s.io/kubernetes/federation/pkg/federation-controller/util/test"
kubev1 "k8s.io/kubernetes/pkg/api/v1"
kubev1 "k8s.io/api/core/v1"
"github.com/stretchr/testify/assert"
)

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

@ -29,7 +29,7 @@ import (
"k8s.io/client-go/tools/cache"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1"
federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"github.com/golang/glog"

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

@ -27,7 +27,7 @@ import (
"k8s.io/client-go/tools/cache"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1"
fakefederationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"

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

@ -24,7 +24,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgruntime "k8s.io/apimachinery/pkg/runtime"
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake"

2
federation/pkg/federation-controller/util/finalizers/finalizers_test.go
View File

@ -24,7 +24,7 @@ import (
meta "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
func newObj(finalizers []string) runtime.Object {

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

@ -21,7 +21,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgruntime "k8s.io/apimachinery/pkg/runtime"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
"github.com/stretchr/testify/assert"
)

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

@ -20,7 +20,7 @@ import (
"testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api_v1 "k8s.io/kubernetes/pkg/api/v1"
api_v1 "k8s.io/api/core/v1"
"github.com/stretchr/testify/assert"
)

2
federation/pkg/federation-controller/util/podanalyzer/pod_helper.go
View File

@ -23,7 +23,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/kubernetes/federation/pkg/federation-controller/util"
api_v1 "k8s.io/kubernetes/pkg/api/v1"
api_v1 "k8s.io/api/core/v1"
)
type PodAnalysisResult struct {

2
federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go
View File

@ -22,7 +22,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/federation/pkg/federation-controller/util"
api_v1 "k8s.io/kubernetes/pkg/api/v1"
api_v1 "k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"github.com/stretchr/testify/assert"

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

@ -19,7 +19,7 @@ package util
import (
"reflect"
api_v1 "k8s.io/kubernetes/pkg/api/v1"
api_v1 "k8s.io/api/core/v1"
)
// Checks if cluster-independent, user provided data in two given Secrets are equal. If in

2
federation/pkg/federation-controller/util/test/test_helper.go
View File

@ -34,7 +34,7 @@ import (
"k8s.io/kubernetes/federation/pkg/federation-controller/util"
finalizersutil "k8s.io/kubernetes/federation/pkg/federation-controller/util/finalizers"
"k8s.io/kubernetes/pkg/api"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
"github.com/golang/glog"
"github.com/stretchr/testify/assert"

2
federation/pkg/kubefed/init/init.go
View File

@ -45,7 +45,7 @@ import (
"k8s.io/kubernetes/federation/pkg/dnsprovider/providers/coredns"
"k8s.io/kubernetes/federation/pkg/kubefed/util"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/apis/rbac"
client "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

2
federation/pkg/kubefed/init/init_test.go
View File

@ -50,7 +50,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/helper"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"k8s.io/kubernetes/pkg/apis/rbac"
rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"

4
federation/pkg/kubefed/join.go
View File

@ -30,7 +30,7 @@ import (
"k8s.io/kubernetes/federation/apis/federation"
"k8s.io/kubernetes/federation/pkg/kubefed/util"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/apis/rbac"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@ -183,7 +183,7 @@ func (j *joinFederation) Run(f cmdutil.Factory, cmdOut io.Writer, config util.Ad
joiningClusterName := j.commonOptions.Name
secretName := j.options.secretName
if secretName == "" {
secretName = v1.SimpleNameGenerator.GenerateName(j.commonOptions.Name + "-")
secretName = k8s_api_v1.SimpleNameGenerator.GenerateName(j.commonOptions.Name + "-")
}
joiningClusterFactory := j.joningClusterFactory(config)

2
federation/pkg/kubefed/join_test.go
View File

@ -37,7 +37,7 @@ import (
"k8s.io/kubernetes/federation/pkg/kubefed/util"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
"k8s.io/kubernetes/pkg/kubectl"

2
federation/pkg/kubefed/unjoin_test.go
View File

@ -34,7 +34,7 @@ import (
"k8s.io/kubernetes/federation/pkg/kubefed/util"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
)

2
federation/plugin/pkg/admission/schedulingpolicy/merge_test.go
View File

@ -21,7 +21,7 @@ import (
"reflect"
"testing"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

2
pkg/api/defaulting_test.go
View File

@ -30,7 +30,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/kubernetes/pkg/api"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
apiv1 "k8s.io/api/core/v1"
batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
)

2
pkg/api/install/install_test.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
internal "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
func TestResourceVersioner(t *testing.T) {

2
pkg/api/serialization_proto_test.go
View File

@ -34,7 +34,7 @@ import (
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/kubernetes/pkg/api"
kapitesting "k8s.io/kubernetes/pkg/api/testing"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
_ "k8s.io/kubernetes/pkg/apis/extensions"
_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
)

7
pkg/api/serialization_test.go
View File

@ -29,6 +29,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/ugorji/go/codec"
"k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/meta"
apitesting "k8s.io/apimachinery/pkg/api/testing"
@ -43,7 +44,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
kapitesting "k8s.io/kubernetes/pkg/api/testing"
"k8s.io/kubernetes/pkg/api/v1"
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
)
@ -81,11 +82,11 @@ func Convert_v1beta1_ReplicaSet_to_api_ReplicationController(in *v1beta1.Replica
}
intermediate2 := &v1.ReplicationController{}
if err := v1.Convert_extensions_ReplicaSet_to_v1_ReplicationController(intermediate1, intermediate2, s); err != nil {
if err := k8s_api_v1.Convert_extensions_ReplicaSet_to_v1_ReplicationController(intermediate1, intermediate2, s); err != nil {
return err
}
return v1.Convert_v1_ReplicationController_To_api_ReplicationController(intermediate2, out, s)
return k8s_api_v1.Convert_v1_ReplicationController_To_api_ReplicationController(intermediate2, out, s)
}
func TestSetControllerConversion(t *testing.T) {

2
pkg/api/testing/fuzzer.go
View File

@ -35,7 +35,7 @@ import (
kubeadmfuzzer "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/fuzzer"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/apis/admissionregistration"
"k8s.io/kubernetes/pkg/apis/apps"
"k8s.io/kubernetes/pkg/apis/autoscaling"

2
pkg/api/testing/pod_specs.go
View File

@ -18,7 +18,7 @@ package testing
import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
// DeepEqualSafePodSpec returns a PodSpec which is ready to be used with apiequality.Semantic.DeepEqual

2
pkg/api/unstructured_test.go
View File

@ -26,7 +26,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
kapitesting "k8s.io/kubernetes/pkg/api/testing"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/conversion/unstructured"
"k8s.io/apimachinery/pkg/runtime"

2
pkg/api/v1/backward_compatibility_test.go
View File

@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testing/compat"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/api/validation"
_ "k8s.io/kubernetes/pkg/api/install"

3
pkg/api/v1/conversion.go
View File

@ -17,11 +17,12 @@ limitations under the License.
package v1
import (
"k8s.io/api/core/v1"
"encoding/json"
"fmt"
"reflect"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/conversion"
"k8s.io/apimachinery/pkg/runtime"

2
pkg/api/v1/conversion_test.go
View File

@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
func TestPodLogOptions(t *testing.T) {

2
pkg/api/v1/defaults_test.go
View File

@ -27,7 +27,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {

2
pkg/api/v1/endpoints/util.go
View File

@ -24,7 +24,7 @@ import (
"sort"
"k8s.io/apimachinery/pkg/types"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
hashutil "k8s.io/kubernetes/pkg/util/hash"
)

2
pkg/api/v1/endpoints/util_test.go
View File

@ -22,7 +22,7 @@ import (
"github.com/davecgh/go-spew/spew"
"k8s.io/apimachinery/pkg/types"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
func podRef(uid string) *v1.ObjectReference {

2
pkg/api/v1/helper/helpers.go
View File

@ -26,7 +26,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/helper"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
// IsOpaqueIntResourceName returns true if the resource name has the opaque

2
pkg/api/v1/helper/helpers_test.go
View File

@ -23,7 +23,7 @@ import (
apiequality "k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
func TestAddToNodeAddresses(t *testing.T) {

2
pkg/api/v1/helper/qos/qos.go
View File

@ -19,7 +19,7 @@ package qos
import (
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
// QOSList is a set of (resource name, QoS class) pairs.

2
pkg/api/v1/helper/qos/qos_test.go
View File

@ -23,7 +23,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/helper/qos"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
func TestGetPodQOS(t *testing.T) {

2
pkg/api/v1/node/util.go
View File

@ -19,7 +19,7 @@ limitations under the License.
package node
import (
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
// GetNodeCondition extracts the provided condition from the given status and returns that.

2
pkg/api/v1/pod/util.go
View File

@ -23,7 +23,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
// FindPort locates the container port for the given pod and portName. If the

2
pkg/api/v1/pod/util_test.go
View File

@ -27,7 +27,7 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
func TestFindPort(t *testing.T) {

2
pkg/api/v1/ref/ref.go
View File

@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
var (

2
pkg/api/v1/resource/helpers.go
View File

@ -22,7 +22,7 @@ import (
"strconv"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
// PodRequestsAndLimits returns a dictionary of all defined resources summed up for all

2
pkg/api/v1/resource/helpers_test.go
View File

@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
func TestResourceHelpers(t *testing.T) {

2
pkg/api/v1/service/util.go
View File

@ -21,7 +21,7 @@ import (
"strconv"
"strings"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
netsets "k8s.io/kubernetes/pkg/util/net/sets"
"github.com/golang/glog"

2
pkg/api/v1/service/util_test.go
View File

@ -23,7 +23,7 @@ import (
"strings"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
netsets "k8s.io/kubernetes/pkg/util/net/sets"
"github.com/davecgh/go-spew/spew"

2
pkg/api/v1/validation/validation.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kubernetes/pkg/api/helper"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
const isNegativeErrorMsg string = `must be greater than or equal to 0`

5
pkg/api/v1/zz_generated.conversion.go
View File

@ -21,13 +21,14 @@ limitations under the License.
package v1
import (
"k8s.io/api/core/v1"
unsafe "unsafe"
"k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
types "k8s.io/apimachinery/pkg/types"
api "k8s.io/kubernetes/pkg/api"
unsafe "unsafe"
)
func init() {

10
pkg/api/v1/zz_generated.defaults.go
View File

@ -21,7 +21,7 @@ limitations under the License.
package v1
import (
"k8s.io/api/core/v1"
"k8s.io/api/core/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
)
@ -41,7 +41,9 @@ func RegisterDefaults(scheme *runtime.Scheme) error {
scheme.AddTypeDefaultingFunc(&v1.NodeList{}, func(obj interface{}) { SetObjectDefaults_NodeList(obj.(*v1.NodeList)) })
scheme.AddTypeDefaultingFunc(&v1.PersistentVolume{}, func(obj interface{}) { SetObjectDefaults_PersistentVolume(obj.(*v1.PersistentVolume)) })
scheme.AddTypeDefaultingFunc(&v1.PersistentVolumeClaim{}, func(obj interface{}) { SetObjectDefaults_PersistentVolumeClaim(obj.(*v1.PersistentVolumeClaim)) })
scheme.AddTypeDefaultingFunc(&v1.PersistentVolumeClaimList{}, func(obj interface{}) { SetObjectDefaults_PersistentVolumeClaimList(obj.(*v1.PersistentVolumeClaimList)) })
scheme.AddTypeDefaultingFunc(&v1.PersistentVolumeClaimList{}, func(obj interface{}) {
SetObjectDefaults_PersistentVolumeClaimList(obj.(*v1.PersistentVolumeClaimList))
})
scheme.AddTypeDefaultingFunc(&v1.PersistentVolumeList{}, func(obj interface{}) { SetObjectDefaults_PersistentVolumeList(obj.(*v1.PersistentVolumeList)) })
scheme.AddTypeDefaultingFunc(&v1.Pod{}, func(obj interface{}) { SetObjectDefaults_Pod(obj.(*v1.Pod)) })
scheme.AddTypeDefaultingFunc(&v1.PodAttachOptions{}, func(obj interface{}) { SetObjectDefaults_PodAttachOptions(obj.(*v1.PodAttachOptions)) })
@ -50,7 +52,9 @@ func RegisterDefaults(scheme *runtime.Scheme) error {
scheme.AddTypeDefaultingFunc(&v1.PodTemplate{}, func(obj interface{}) { SetObjectDefaults_PodTemplate(obj.(*v1.PodTemplate)) })
scheme.AddTypeDefaultingFunc(&v1.PodTemplateList{}, func(obj interface{}) { SetObjectDefaults_PodTemplateList(obj.(*v1.PodTemplateList)) })
scheme.AddTypeDefaultingFunc(&v1.ReplicationController{}, func(obj interface{}) { SetObjectDefaults_ReplicationController(obj.(*v1.ReplicationController)) })
scheme.AddTypeDefaultingFunc(&v1.ReplicationControllerList{}, func(obj interface{}) { SetObjectDefaults_ReplicationControllerList(obj.(*v1.ReplicationControllerList)) })
scheme.AddTypeDefaultingFunc(&v1.ReplicationControllerList{}, func(obj interface{}) {
SetObjectDefaults_ReplicationControllerList(obj.(*v1.ReplicationControllerList))
})
scheme.AddTypeDefaultingFunc(&v1.ResourceQuota{}, func(obj interface{}) { SetObjectDefaults_ResourceQuota(obj.(*v1.ResourceQuota)) })
scheme.AddTypeDefaultingFunc(&v1.ResourceQuotaList{}, func(obj interface{}) { SetObjectDefaults_ResourceQuotaList(obj.(*v1.ResourceQuotaList)) })
scheme.AddTypeDefaultingFunc(&v1.Secret{}, func(obj interface{}) { SetObjectDefaults_Secret(obj.(*v1.Secret)) })

2
pkg/api/validation/schema_test.go
View File

@ -30,7 +30,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
kapitesting "k8s.io/kubernetes/pkg/api/testing"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
"github.com/ghodss/yaml"

5
pkg/api/validation/validation.go
View File

@ -31,6 +31,7 @@ import (
"math"
"k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/resource"
apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation"
@ -46,7 +47,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/helper"
apiservice "k8s.io/kubernetes/pkg/api/service"
"k8s.io/kubernetes/pkg/api/v1"
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1"
v1helper "k8s.io/kubernetes/pkg/api/v1/helper"
"k8s.io/kubernetes/pkg/capabilities"
"k8s.io/kubernetes/pkg/features"
@ -2382,7 +2383,7 @@ func ValidateAvoidPodsInNodeAnnotations(annotations map[string]string, fldPath *
return allErrs
}
var avoids api.AvoidPods
if err := v1.Convert_v1_AvoidPods_To_api_AvoidPods(&v1Avoids, &avoids, nil); err != nil {
if err := k8s_api_v1.Convert_v1_AvoidPods_To_api_AvoidPods(&v1Avoids, &avoids, nil); err != nil {
allErrs = append(allErrs, field.Invalid(fldPath.Child("AvoidPods"), api.PreferAvoidPodsAnnotationKey, err.Error()))
return allErrs
}

2
pkg/api/validation/validation_test.go
View File

@ -30,7 +30,7 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/helper"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/capabilities"
"k8s.io/kubernetes/pkg/security/apparmor"
)

3
pkg/api/zz_generated.deepcopy.go
View File

@ -21,13 +21,14 @@ limitations under the License.
package api
import (
reflect "reflect"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
fields "k8s.io/apimachinery/pkg/fields"
labels "k8s.io/apimachinery/pkg/labels"
runtime "k8s.io/apimachinery/pkg/runtime"
types "k8s.io/apimachinery/pkg/types"
reflect "reflect"
)
func init() {

2
pkg/apimachinery/tests/api_meta_help_test.go
View File

@ -27,7 +27,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
"github.com/google/gofuzz"
)

2
pkg/apimachinery/tests/runtime_serializer_protobuf_protobuf_test.go
View File

@ -32,7 +32,7 @@ import (
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/kubernetes/pkg/api"
_ "k8s.io/kubernetes/pkg/api/install"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/api/core/v1"
)
type testObject struct {

3
pkg/apis/abac/v1beta1/zz_generated.deepcopy.go
View File

@ -21,9 +21,10 @@ limitations under the License.
package v1beta1
import (
reflect "reflect"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
reflect "reflect"
)
func init() {

3
pkg/apis/admission/v1alpha1/zz_generated.conversion.go
View File

@ -21,12 +21,13 @@ limitations under the License.
package v1alpha1
import (
unsafe "unsafe"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
pkg_admission "k8s.io/apiserver/pkg/admission"
admission "k8s.io/kubernetes/pkg/apis/admission"
unsafe "unsafe"
)
func init() {

Some files were not shown because too many files have changed in this diff Show More