diff --git a/federation/apis/federation/types.generated.go b/federation/apis/federation/types.generated.go index 81749c927d8..b79c879aa6f 100644 --- a/federation/apis/federation/types.generated.go +++ b/federation/apis/federation/types.generated.go @@ -24,16 +24,15 @@ package federation import ( "errors" "fmt" - "reflect" - "runtime" - time "time" - codec1978 "github.com/ugorji/go/codec" - pkg4_inf "gopkg.in/inf.v0" + pkg4_inf_v0 "gopkg.in/inf.v0" pkg1_api "k8s.io/kubernetes/pkg/api" pkg3_resource "k8s.io/kubernetes/pkg/api/resource" pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg5_types "k8s.io/kubernetes/pkg/types" + "reflect" + "runtime" + time "time" ) const ( @@ -66,11 +65,11 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_api.ConditionStatus - var v1 pkg3_resource.Quantity - var v2 pkg2_unversioned.Time - var v3 pkg5_types.UID - var v4 pkg4_inf.Dec + var v0 pkg4_inf_v0.Dec + var v1 pkg1_api.ConditionStatus + var v2 pkg3_resource.Quantity + var v3 pkg2_unversioned.Time + var v4 pkg5_types.UID var v5 time.Time _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5 } diff --git a/federation/apis/federation/v1alpha1/types.generated.go b/federation/apis/federation/v1alpha1/types.generated.go index 77576859419..b05a853be32 100644 --- a/federation/apis/federation/v1alpha1/types.generated.go +++ b/federation/apis/federation/v1alpha1/types.generated.go @@ -24,16 +24,15 @@ package v1alpha1 import ( "errors" "fmt" - "reflect" - "runtime" - time "time" - codec1978 "github.com/ugorji/go/codec" - pkg4_inf "gopkg.in/inf.v0" + pkg4_inf_v0 "gopkg.in/inf.v0" pkg3_resource "k8s.io/kubernetes/pkg/api/resource" pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg1_v1 "k8s.io/kubernetes/pkg/api/v1" pkg5_types "k8s.io/kubernetes/pkg/types" + "reflect" + "runtime" + time "time" ) const ( @@ -66,11 +65,11 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg3_resource.Quantity - var v1 pkg2_unversioned.Time - var v2 pkg1_v1.ConditionStatus - var v3 pkg5_types.UID - var v4 pkg4_inf.Dec + var v0 pkg4_inf_v0.Dec + var v1 pkg3_resource.Quantity + var v2 pkg2_unversioned.Time + var v3 pkg1_v1.ConditionStatus + var v4 pkg5_types.UID var v5 time.Time _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5 } diff --git a/pkg/api/resource/deep_copy_generated.go b/pkg/api/resource/deep_copy_generated.go index 14e5ff468fc..6a34e2d4342 100644 --- a/pkg/api/resource/deep_copy_generated.go +++ b/pkg/api/resource/deep_copy_generated.go @@ -21,18 +21,18 @@ limitations under the License. package resource import ( - inf "gopkg.in/inf.v0" + inf_v0 "gopkg.in/inf.v0" conversion "k8s.io/kubernetes/pkg/conversion" ) func DeepCopy_resource_Quantity(in Quantity, out *Quantity, c *conversion.Cloner) error { if in.Amount != nil { in, out := in.Amount, &out.Amount - *out = new(inf.Dec) + *out = new(inf_v0.Dec) if newVal, err := c.DeepCopy(*in); err != nil { return err } else { - **out = newVal.(inf.Dec) + **out = newVal.(inf_v0.Dec) } } else { out.Amount = nil diff --git a/pkg/api/types.generated.go b/pkg/api/types.generated.go index 6400b796580..94f775f6f69 100644 --- a/pkg/api/types.generated.go +++ b/pkg/api/types.generated.go @@ -25,6 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" + pkg4_inf_v0 "gopkg.in/inf.v0" pkg3_resource "k8s.io/kubernetes/pkg/api/resource" pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg7_fields "k8s.io/kubernetes/pkg/fields" @@ -34,7 +35,6 @@ import ( pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" - pkg4_inf "gopkg.in/inf.v0" time "time" ) @@ -68,14 +68,14 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg3_resource.Quantity - var v1 pkg2_unversioned.Time - var v2 pkg7_fields.Selector - var v3 pkg6_labels.Selector - var v4 pkg8_runtime.Object - var v5 pkg1_types.UID - var v6 pkg5_intstr.IntOrString - var v7 pkg4_inf.Dec + var v0 pkg4_inf_v0.Dec + var v1 pkg3_resource.Quantity + var v2 pkg2_unversioned.Time + var v3 pkg7_fields.Selector + var v4 pkg6_labels.Selector + var v5 pkg8_runtime.Object + var v6 pkg1_types.UID + var v7 pkg5_intstr.IntOrString var v8 time.Time _, _, _, _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5, v6, v7, v8 } diff --git a/pkg/api/v1/types.generated.go b/pkg/api/v1/types.generated.go index 826a1a320ef..afcf01486f8 100644 --- a/pkg/api/v1/types.generated.go +++ b/pkg/api/v1/types.generated.go @@ -25,6 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" + pkg4_inf_v0 "gopkg.in/inf.v0" pkg3_resource "k8s.io/kubernetes/pkg/api/resource" pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg6_runtime "k8s.io/kubernetes/pkg/runtime" @@ -32,7 +33,6 @@ import ( pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" - pkg4_inf "gopkg.in/inf.v0" time "time" ) @@ -66,12 +66,12 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg3_resource.Quantity - var v1 pkg2_unversioned.Time - var v2 pkg6_runtime.RawExtension - var v3 pkg1_types.UID - var v4 pkg5_intstr.IntOrString - var v5 pkg4_inf.Dec + var v0 pkg4_inf_v0.Dec + var v1 pkg3_resource.Quantity + var v2 pkg2_unversioned.Time + var v3 pkg6_runtime.RawExtension + var v4 pkg1_types.UID + var v5 pkg5_intstr.IntOrString var v6 time.Time _, _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5, v6 } diff --git a/pkg/apis/apps/types.generated.go b/pkg/apis/apps/types.generated.go index 4b7ccefc365..79bdd069792 100644 --- a/pkg/apis/apps/types.generated.go +++ b/pkg/apis/apps/types.generated.go @@ -24,17 +24,16 @@ package apps import ( "errors" "fmt" - "reflect" - "runtime" - time "time" - codec1978 "github.com/ugorji/go/codec" - pkg5_inf "gopkg.in/inf.v0" + pkg5_inf_v0 "gopkg.in/inf.v0" pkg2_api "k8s.io/kubernetes/pkg/api" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg3_types "k8s.io/kubernetes/pkg/types" pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" + "reflect" + "runtime" + time "time" ) const ( @@ -67,12 +66,12 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg2_api.ObjectMeta - var v1 pkg4_resource.Quantity - var v2 pkg1_unversioned.TypeMeta - var v3 pkg3_types.UID - var v4 pkg6_intstr.IntOrString - var v5 pkg5_inf.Dec + var v0 pkg5_inf_v0.Dec + var v1 pkg2_api.ObjectMeta + var v2 pkg4_resource.Quantity + var v3 pkg1_unversioned.TypeMeta + var v4 pkg3_types.UID + var v5 pkg6_intstr.IntOrString var v6 time.Time _, _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5, v6 } diff --git a/pkg/apis/apps/v1alpha1/types.generated.go b/pkg/apis/apps/v1alpha1/types.generated.go index f0db024af1d..d817967761e 100644 --- a/pkg/apis/apps/v1alpha1/types.generated.go +++ b/pkg/apis/apps/v1alpha1/types.generated.go @@ -24,17 +24,16 @@ package v1alpha1 import ( "errors" "fmt" - "reflect" - "runtime" - time "time" - codec1978 "github.com/ugorji/go/codec" - pkg5_inf "gopkg.in/inf.v0" + pkg5_inf_v0 "gopkg.in/inf.v0" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" + "reflect" + "runtime" + time "time" ) const ( @@ -67,12 +66,12 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta - var v3 pkg3_types.UID - var v4 pkg6_intstr.IntOrString - var v5 pkg5_inf.Dec + var v0 pkg5_inf_v0.Dec + var v1 pkg4_resource.Quantity + var v2 pkg1_unversioned.TypeMeta + var v3 pkg2_v1.ObjectMeta + var v4 pkg3_types.UID + var v5 pkg6_intstr.IntOrString var v6 time.Time _, _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5, v6 } diff --git a/pkg/apis/batch/types.generated.go b/pkg/apis/batch/types.generated.go index 5085aa32efb..7300951d2b8 100644 --- a/pkg/apis/batch/types.generated.go +++ b/pkg/apis/batch/types.generated.go @@ -24,17 +24,16 @@ package batch import ( "errors" "fmt" - "reflect" - "runtime" - time "time" - codec1978 "github.com/ugorji/go/codec" - pkg5_inf "gopkg.in/inf.v0" + pkg5_inf_v0 "gopkg.in/inf.v0" pkg2_api "k8s.io/kubernetes/pkg/api" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg3_types "k8s.io/kubernetes/pkg/types" pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" + "reflect" + "runtime" + time "time" ) const ( @@ -67,12 +66,12 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg2_api.ObjectMeta - var v1 pkg4_resource.Quantity - var v2 pkg1_unversioned.TypeMeta - var v3 pkg3_types.UID - var v4 pkg6_intstr.IntOrString - var v5 pkg5_inf.Dec + var v0 pkg5_inf_v0.Dec + var v1 pkg2_api.ObjectMeta + var v2 pkg4_resource.Quantity + var v3 pkg1_unversioned.TypeMeta + var v4 pkg3_types.UID + var v5 pkg6_intstr.IntOrString var v6 time.Time _, _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5, v6 } diff --git a/pkg/apis/batch/v1/types.generated.go b/pkg/apis/batch/v1/types.generated.go index defb7a22d00..0dd40054377 100644 --- a/pkg/apis/batch/v1/types.generated.go +++ b/pkg/apis/batch/v1/types.generated.go @@ -24,17 +24,16 @@ package v1 import ( "errors" "fmt" - "reflect" - "runtime" - time "time" - codec1978 "github.com/ugorji/go/codec" - pkg5_inf "gopkg.in/inf.v0" + pkg5_inf_v0 "gopkg.in/inf.v0" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" + "reflect" + "runtime" + time "time" ) const ( @@ -67,12 +66,12 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta - var v3 pkg3_types.UID - var v4 pkg6_intstr.IntOrString - var v5 pkg5_inf.Dec + var v0 pkg5_inf_v0.Dec + var v1 pkg4_resource.Quantity + var v2 pkg1_unversioned.TypeMeta + var v3 pkg2_v1.ObjectMeta + var v4 pkg3_types.UID + var v5 pkg6_intstr.IntOrString var v6 time.Time _, _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5, v6 } diff --git a/pkg/apis/batch/v2alpha1/types.generated.go b/pkg/apis/batch/v2alpha1/types.generated.go index 2b683088fd3..3a06e203e27 100644 --- a/pkg/apis/batch/v2alpha1/types.generated.go +++ b/pkg/apis/batch/v2alpha1/types.generated.go @@ -24,17 +24,16 @@ package v2alpha1 import ( "errors" "fmt" - "reflect" - "runtime" - time "time" - codec1978 "github.com/ugorji/go/codec" - pkg5_inf "gopkg.in/inf.v0" + pkg5_inf_v0 "gopkg.in/inf.v0" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" + "reflect" + "runtime" + time "time" ) const ( @@ -67,12 +66,12 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta - var v3 pkg3_types.UID - var v4 pkg6_intstr.IntOrString - var v5 pkg5_inf.Dec + var v0 pkg5_inf_v0.Dec + var v1 pkg4_resource.Quantity + var v2 pkg1_unversioned.TypeMeta + var v3 pkg2_v1.ObjectMeta + var v4 pkg3_types.UID + var v5 pkg6_intstr.IntOrString var v6 time.Time _, _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5, v6 } diff --git a/pkg/apis/extensions/types.generated.go b/pkg/apis/extensions/types.generated.go index 2afafd6a3db..1e66f6b49c9 100644 --- a/pkg/apis/extensions/types.generated.go +++ b/pkg/apis/extensions/types.generated.go @@ -25,6 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" + pkg5_inf_v0 "gopkg.in/inf.v0" pkg2_api "k8s.io/kubernetes/pkg/api" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" @@ -32,7 +33,6 @@ import ( pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" - pkg5_inf "gopkg.in/inf.v0" time "time" ) @@ -66,12 +66,12 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg2_api.ObjectMeta - var v1 pkg4_resource.Quantity - var v2 pkg1_unversioned.LabelSelector - var v3 pkg3_types.UID - var v4 pkg6_intstr.IntOrString - var v5 pkg5_inf.Dec + var v0 pkg5_inf_v0.Dec + var v1 pkg2_api.ObjectMeta + var v2 pkg4_resource.Quantity + var v3 pkg1_unversioned.LabelSelector + var v4 pkg3_types.UID + var v5 pkg6_intstr.IntOrString var v6 time.Time _, _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5, v6 } diff --git a/pkg/apis/extensions/v1beta1/types.generated.go b/pkg/apis/extensions/v1beta1/types.generated.go index b5a84b0ad06..ae9f2630f13 100644 --- a/pkg/apis/extensions/v1beta1/types.generated.go +++ b/pkg/apis/extensions/v1beta1/types.generated.go @@ -25,6 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" + pkg5_inf_v0 "gopkg.in/inf.v0" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" @@ -32,7 +33,6 @@ import ( pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" - pkg5_inf "gopkg.in/inf.v0" time "time" ) @@ -66,12 +66,12 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta - var v3 pkg3_types.UID - var v4 pkg6_intstr.IntOrString - var v5 pkg5_inf.Dec + var v0 pkg5_inf_v0.Dec + var v1 pkg4_resource.Quantity + var v2 pkg1_unversioned.TypeMeta + var v3 pkg2_v1.ObjectMeta + var v4 pkg3_types.UID + var v5 pkg6_intstr.IntOrString var v6 time.Time _, _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5, v6 }