From 5e4308f91df58da2d0f55a561fa7e0a545679982 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Tue, 17 May 2016 00:36:56 -0400 Subject: [PATCH] Update use of Quantity in other classes --- cmd/kubelet/app/server.go | 4 +- .../mesos/pkg/scheduler/resources/resource.go | 10 +-- federation/apis/federation/types.generated.go | 16 ++--- .../federation/v1alpha1/types.generated.go | 16 ++--- pkg/api/helpers.go | 11 +--- pkg/api/helpers_test.go | 6 +- pkg/api/resource_helpers.go | 10 +-- pkg/api/resource_helpers_test.go | 6 +- pkg/api/types.generated.go | 64 +++++++++---------- pkg/api/v1/conversion.go | 6 +- pkg/api/v1/types.generated.go | 64 +++++++++---------- pkg/apis/apps/types.generated.go | 18 +++--- pkg/apis/apps/v1alpha1/types.generated.go | 18 +++--- pkg/apis/batch/types.generated.go | 18 +++--- pkg/apis/batch/v1/types.generated.go | 18 +++--- pkg/apis/batch/v2alpha1/types.generated.go | 18 +++--- pkg/apis/extensions/types.generated.go | 34 +++++----- .../extensions/v1beta1/types.generated.go | 34 +++++----- pkg/controller/petset/fakes.go | 5 +- pkg/controller/podautoscaler/horizontal.go | 2 +- .../podautoscaler/metrics/metrics_client.go | 3 +- pkg/kubectl/describe.go | 10 +-- pkg/kubectl/describe_test.go | 2 +- pkg/kubectl/run.go | 4 +- pkg/kubectl/run_test.go | 4 +- pkg/kubelet/dockertools/manager.go | 2 +- pkg/kubelet/eviction/helpers.go | 2 +- pkg/kubelet/kubelet.go | 2 +- pkg/kubelet/kubelet_test.go | 8 +-- pkg/quota/resources.go | 2 +- pkg/util/bandwidth/utils.go | 8 ++- pkg/volume/testing/testing.go | 2 +- pkg/volume/util/fs_darwin.go | 2 +- pkg/volume/util/fs_linux.go | 2 +- test/e2e/limit_range.go | 2 +- test/e2e/petset.go | 5 +- .../spec/schema/types/isolator_resources.go | 8 +-- 37 files changed, 204 insertions(+), 242 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index bf2cc623d9..a3a1076a48 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -927,10 +927,10 @@ func parseResourceList(m utilconfig.ConfigurationMap) (api.ResourceList, error) if err != nil { return nil, err } - if q.Amount.Sign() == -1 { + if q.Sign() == -1 { return nil, fmt.Errorf("resource quantity for %q cannot be negative: %v", k, v) } - rl[api.ResourceName(k)] = *q + rl[api.ResourceName(k)] = q default: return nil, fmt.Errorf("cannot reserve %q resource", k) } diff --git a/contrib/mesos/pkg/scheduler/resources/resource.go b/contrib/mesos/pkg/scheduler/resources/resource.go index 792ab0cf41..660b4a69f7 100644 --- a/contrib/mesos/pkg/scheduler/resources/resource.go +++ b/contrib/mesos/pkg/scheduler/resources/resource.go @@ -85,14 +85,8 @@ func podResources(pod *api.Pod, resourceName api.ResourceName, def, min resource } // add up the request and limit sum for all containers - err = requestSum.Add(request) - if err != nil { - return - } - err = limitSum.Add(limit) - if err != nil { - return - } + requestSum.Add(request) + limitSum.Add(limit) // optionally write request and limit back if write { diff --git a/federation/apis/federation/types.generated.go b/federation/apis/federation/types.generated.go index afde3d9b85..2f75772c90 100644 --- a/federation/apis/federation/types.generated.go +++ b/federation/apis/federation/types.generated.go @@ -25,11 +25,10 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - 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" + pkg4_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" time "time" @@ -65,13 +64,12 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - 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 + var v0 pkg1_api.ConditionStatus + var v1 pkg3_resource.Quantity + var v2 pkg2_unversioned.Time + var v3 pkg4_types.UID + var v4 time.Time + _, _, _, _, _ = v0, v1, v2, v3, v4 } } diff --git a/federation/apis/federation/v1alpha1/types.generated.go b/federation/apis/federation/v1alpha1/types.generated.go index 3bb77246a7..70837248d6 100644 --- a/federation/apis/federation/v1alpha1/types.generated.go +++ b/federation/apis/federation/v1alpha1/types.generated.go @@ -25,11 +25,10 @@ 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" pkg1_v1 "k8s.io/kubernetes/pkg/api/v1" - pkg5_types "k8s.io/kubernetes/pkg/types" + pkg4_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" time "time" @@ -65,13 +64,12 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - 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 + var v0 pkg3_resource.Quantity + var v1 pkg2_unversioned.Time + var v2 pkg1_v1.ConditionStatus + var v3 pkg4_types.UID + var v4 time.Time + _, _, _, _, _ = v0, v1, v2, v3, v4 } } diff --git a/pkg/api/helpers.go b/pkg/api/helpers.go index 070e39630d..7af5ed8af5 100644 --- a/pkg/api/helpers.go +++ b/pkg/api/helpers.go @@ -58,16 +58,7 @@ var Semantic = conversion.EqualitiesOrDie( // TODO: if we decide it's important, it should be safe to start comparing the format. // // Uninitialized quantities are equivalent to 0 quantities. - if a.Amount == nil && b.MilliValue() == 0 { - return true - } - if b.Amount == nil && a.MilliValue() == 0 { - return true - } - if a.Amount == nil || b.Amount == nil { - return false - } - return a.Amount.Cmp(b.Amount) == 0 + return a.Cmp(b) == 0 }, func(a, b unversioned.Time) bool { return a.UTC() == b.UTC() diff --git a/pkg/api/helpers_test.go b/pkg/api/helpers_test.go index 142cf7307e..28c696b43c 100644 --- a/pkg/api/helpers_test.go +++ b/pkg/api/helpers_test.go @@ -23,8 +23,6 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/labels" - - inf "gopkg.in/inf.v0" ) func TestConversionError(t *testing.T) { @@ -56,8 +54,8 @@ func TestSemantic(t *testing.T) { {resource.Quantity{}, resource.MustParse("0"), true}, {resource.Quantity{}, resource.MustParse("1m"), false}, { - resource.Quantity{Amount: inf.NewDec(5, 0), Format: resource.BinarySI}, - resource.Quantity{Amount: inf.NewDec(5, 0), Format: resource.DecimalSI}, + resource.NewQuantity(5, resource.BinarySI), + resource.NewQuantity(5, resource.DecimalSI), true, }, {resource.MustParse("2m"), resource.MustParse("1m"), false}, diff --git a/pkg/api/resource_helpers.go b/pkg/api/resource_helpers.go index 74bc1720c9..2a664d8dc8 100644 --- a/pkg/api/resource_helpers.go +++ b/pkg/api/resource_helpers.go @@ -151,15 +151,17 @@ func PodRequestsAndLimits(pod *Pod) (reqs map[ResourceName]resource.Quantity, li for name, quantity := range container.Resources.Requests { if value, ok := reqs[name]; !ok { reqs[name] = *quantity.Copy() - } else if err = value.Add(quantity); err != nil { - return nil, nil, err + } else { + value.Add(quantity) + reqs[name] = value } } for name, quantity := range container.Resources.Limits { if value, ok := limits[name]; !ok { limits[name] = *quantity.Copy() - } else if err = value.Add(quantity); err != nil { - return nil, nil, err + } else { + value.Add(quantity) + limits[name] = value } } } diff --git a/pkg/api/resource_helpers_test.go b/pkg/api/resource_helpers_test.go index 12c0ce7db6..d13929fa94 100644 --- a/pkg/api/resource_helpers_test.go +++ b/pkg/api/resource_helpers_test.go @@ -32,10 +32,10 @@ func TestResourceHelpers(t *testing.T) { "kube.io/storage": memoryLimit, }, } - if res := resourceSpec.Limits.Cpu(); *res != cpuLimit { + if res := resourceSpec.Limits.Cpu(); res.Cmp(cpuLimit) != 0 { t.Errorf("expected cpulimit %v, got %v", cpuLimit, res) } - if res := resourceSpec.Limits.Memory(); *res != memoryLimit { + if res := resourceSpec.Limits.Memory(); res.Cmp(memoryLimit) != 0 { t.Errorf("expected memorylimit %v, got %v", memoryLimit, res) } resourceSpec = ResourceRequirements{ @@ -47,7 +47,7 @@ func TestResourceHelpers(t *testing.T) { if res := resourceSpec.Limits.Cpu(); res.Value() != 0 { t.Errorf("expected cpulimit %v, got %v", 0, res) } - if res := resourceSpec.Limits.Memory(); *res != memoryLimit { + if res := resourceSpec.Limits.Memory(); res.Cmp(memoryLimit) != 0 { t.Errorf("expected memorylimit %v, got %v", memoryLimit, res) } } diff --git a/pkg/api/types.generated.go b/pkg/api/types.generated.go index 5632f87f09..0e46d2c4fe 100644 --- a/pkg/api/types.generated.go +++ b/pkg/api/types.generated.go @@ -25,14 +25,13 @@ 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" - pkg6_labels "k8s.io/kubernetes/pkg/labels" - pkg8_runtime "k8s.io/kubernetes/pkg/runtime" + pkg6_fields "k8s.io/kubernetes/pkg/fields" + pkg5_labels "k8s.io/kubernetes/pkg/labels" + pkg7_runtime "k8s.io/kubernetes/pkg/runtime" pkg1_types "k8s.io/kubernetes/pkg/types" - pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" + pkg4_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" time "time" @@ -68,16 +67,15 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - 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 + var v0 pkg3_resource.Quantity + var v1 pkg2_unversioned.Time + var v2 pkg6_fields.Selector + var v3 pkg5_labels.Selector + var v4 pkg7_runtime.Object + var v5 pkg1_types.UID + var v6 pkg4_intstr.IntOrString + var v7 time.Time + _, _, _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5, v6, v7 } } @@ -16227,7 +16225,7 @@ func (x *HTTPGetAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "port": if r.TryDecodeAsNil() { - x.Port = pkg5_intstr.IntOrString{} + x.Port = pkg4_intstr.IntOrString{} } else { yyv5 := &x.Port yym6 := z.DecBinary() @@ -16306,7 +16304,7 @@ func (x *HTTPGetAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.Port = pkg5_intstr.IntOrString{} + x.Port = pkg4_intstr.IntOrString{} } else { yyv13 := &x.Port yym14 := z.DecBinary() @@ -16542,7 +16540,7 @@ func (x *TCPSocketAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { switch yys3 { case "port": if r.TryDecodeAsNil() { - x.Port = pkg5_intstr.IntOrString{} + x.Port = pkg4_intstr.IntOrString{} } else { yyv4 := &x.Port yym5 := z.DecBinary() @@ -16581,7 +16579,7 @@ func (x *TCPSocketAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.Port = pkg5_intstr.IntOrString{} + x.Port = pkg4_intstr.IntOrString{} } else { yyv7 := &x.Port yym8 := z.DecBinary() @@ -31535,7 +31533,7 @@ func (x *ServicePort) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "targetPort": if r.TryDecodeAsNil() { - x.TargetPort = pkg5_intstr.IntOrString{} + x.TargetPort = pkg4_intstr.IntOrString{} } else { yyv7 := &x.TargetPort yym8 := z.DecBinary() @@ -31628,7 +31626,7 @@ func (x *ServicePort) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.TargetPort = pkg5_intstr.IntOrString{} + x.TargetPort = pkg4_intstr.IntOrString{} } else { yyv14 := &x.TargetPort yym15 := z.DecBinary() @@ -45477,7 +45475,7 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym9 if false { } else { - h.encSliceruntime_Object(([]pkg8_runtime.Object)(x.Items), e) + h.encSliceruntime_Object(([]pkg7_runtime.Object)(x.Items), e) } } } else { @@ -45491,7 +45489,7 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym10 if false { } else { - h.encSliceruntime_Object(([]pkg8_runtime.Object)(x.Items), e) + h.encSliceruntime_Object(([]pkg7_runtime.Object)(x.Items), e) } } } @@ -45628,7 +45626,7 @@ func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { _ = yym7 if false { } else { - h.decSliceruntime_Object((*[]pkg8_runtime.Object)(yyv6), d) + h.decSliceruntime_Object((*[]pkg7_runtime.Object)(yyv6), d) } } case "kind": @@ -45699,7 +45697,7 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { _ = yym14 if false { } else { - h.decSliceruntime_Object((*[]pkg8_runtime.Object)(yyv13), d) + h.decSliceruntime_Object((*[]pkg7_runtime.Object)(yyv13), d) } } yyj10++ @@ -56094,7 +56092,7 @@ func (x codecSelfer1234) decResourceList(v *ResourceList, d *codec1978.Decoder) yyl1 := r.ReadMapStart() yybh1 := z.DecBasicHandle() if yyv1 == nil { - yyrl1, _ := z.DecInferLen(yyl1, yybh1.MaxInitLen, 40) + yyrl1, _ := z.DecInferLen(yyl1, yybh1.MaxInitLen, 80) yyv1 = make(map[ResourceName]pkg3_resource.Quantity, yyrl1) *v = yyv1 } @@ -56643,7 +56641,7 @@ func (x codecSelfer1234) decSliceEvent(v *[]Event, d *codec1978.Decoder) { } } -func (x codecSelfer1234) encSliceruntime_Object(v []pkg8_runtime.Object, e *codec1978.Encoder) { +func (x codecSelfer1234) encSliceruntime_Object(v []pkg7_runtime.Object, e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -56665,7 +56663,7 @@ func (x codecSelfer1234) encSliceruntime_Object(v []pkg8_runtime.Object, e *code z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x codecSelfer1234) decSliceruntime_Object(v *[]pkg8_runtime.Object, d *codec1978.Decoder) { +func (x codecSelfer1234) decSliceruntime_Object(v *[]pkg7_runtime.Object, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -56676,7 +56674,7 @@ func (x codecSelfer1234) decSliceruntime_Object(v *[]pkg8_runtime.Object, d *cod _ = yyc1 if yyl1 == 0 { if yyv1 == nil { - yyv1 = []pkg8_runtime.Object{} + yyv1 = []pkg7_runtime.Object{} yyc1 = true } else if len(yyv1) != 0 { yyv1 = yyv1[:0] @@ -56696,10 +56694,10 @@ func (x codecSelfer1234) decSliceruntime_Object(v *[]pkg8_runtime.Object, d *cod if yyrl1 <= cap(yyv1) { yyv1 = yyv1[:yyrl1] } else { - yyv1 = make([]pkg8_runtime.Object, yyrl1) + yyv1 = make([]pkg7_runtime.Object, yyrl1) } } else { - yyv1 = make([]pkg8_runtime.Object, yyrl1) + yyv1 = make([]pkg7_runtime.Object, yyrl1) } yyc1 = true yyrr1 = len(yyv1) @@ -56752,7 +56750,7 @@ func (x codecSelfer1234) decSliceruntime_Object(v *[]pkg8_runtime.Object, d *cod for ; !r.CheckBreak(); yyj1++ { if yyj1 >= len(yyv1) { - yyv1 = append(yyv1, nil) // var yyz1 pkg8_runtime.Object + yyv1 = append(yyv1, nil) // var yyz1 pkg7_runtime.Object yyc1 = true } yyh1.ElemContainerState(yyj1) @@ -56779,7 +56777,7 @@ func (x codecSelfer1234) decSliceruntime_Object(v *[]pkg8_runtime.Object, d *cod yyv1 = yyv1[:yyj1] yyc1 = true } else if yyj1 == 0 && yyv1 == nil { - yyv1 = []pkg8_runtime.Object{} + yyv1 = []pkg7_runtime.Object{} yyc1 = true } } diff --git a/pkg/api/v1/conversion.go b/pkg/api/v1/conversion.go index 7dc8f1e84d..77a53dade9 100644 --- a/pkg/api/v1/conversion.go +++ b/pkg/api/v1/conversion.go @@ -20,8 +20,6 @@ import ( "encoding/json" "fmt" - inf "gopkg.in/inf.v0" - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" @@ -670,8 +668,8 @@ func Convert_v1_ResourceList_To_api_ResourceList(in *ResourceList, out *api.Reso // TODO(#18538): We round up resource values to milli scale to maintain API compatibility. // In the future, we should instead reject values that need rounding. - const milliScale = 3 - value.Amount.Round(value.Amount, milliScale, inf.RoundUp) + const milliScale = -3 + value.RoundUp(milliScale) converted[api.ResourceName(key)] = *value } diff --git a/pkg/api/v1/types.generated.go b/pkg/api/v1/types.generated.go index f5e7f1531d..7b9d953f7c 100644 --- a/pkg/api/v1/types.generated.go +++ b/pkg/api/v1/types.generated.go @@ -25,12 +25,11 @@ 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" + pkg5_runtime "k8s.io/kubernetes/pkg/runtime" pkg1_types "k8s.io/kubernetes/pkg/types" - pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" + pkg4_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" time "time" @@ -66,14 +65,13 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - 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 + var v0 pkg3_resource.Quantity + var v1 pkg2_unversioned.Time + var v2 pkg5_runtime.RawExtension + var v3 pkg1_types.UID + var v4 pkg4_intstr.IntOrString + var v5 time.Time + _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5 } } @@ -15844,7 +15842,7 @@ func (x *HTTPGetAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "port": if r.TryDecodeAsNil() { - x.Port = pkg5_intstr.IntOrString{} + x.Port = pkg4_intstr.IntOrString{} } else { yyv5 := &x.Port yym6 := z.DecBinary() @@ -15923,7 +15921,7 @@ func (x *HTTPGetAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.Port = pkg5_intstr.IntOrString{} + x.Port = pkg4_intstr.IntOrString{} } else { yyv13 := &x.Port yym14 := z.DecBinary() @@ -16152,7 +16150,7 @@ func (x *TCPSocketAction) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { switch yys3 { case "port": if r.TryDecodeAsNil() { - x.Port = pkg5_intstr.IntOrString{} + x.Port = pkg4_intstr.IntOrString{} } else { yyv4 := &x.Port yym5 := z.DecBinary() @@ -16191,7 +16189,7 @@ func (x *TCPSocketAction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.Port = pkg5_intstr.IntOrString{} + x.Port = pkg4_intstr.IntOrString{} } else { yyv7 := &x.Port yym8 := z.DecBinary() @@ -31024,7 +31022,7 @@ func (x *ServicePort) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "targetPort": if r.TryDecodeAsNil() { - x.TargetPort = pkg5_intstr.IntOrString{} + x.TargetPort = pkg4_intstr.IntOrString{} } else { yyv7 := &x.TargetPort yym8 := z.DecBinary() @@ -31117,7 +31115,7 @@ func (x *ServicePort) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.TargetPort = pkg5_intstr.IntOrString{} + x.TargetPort = pkg4_intstr.IntOrString{} } else { yyv14 := &x.TargetPort yym15 := z.DecBinary() @@ -45289,7 +45287,7 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym9 if false { } else { - h.encSliceruntime_RawExtension(([]pkg6_runtime.RawExtension)(x.Items), e) + h.encSliceruntime_RawExtension(([]pkg5_runtime.RawExtension)(x.Items), e) } } } else { @@ -45303,7 +45301,7 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym10 if false { } else { - h.encSliceruntime_RawExtension(([]pkg6_runtime.RawExtension)(x.Items), e) + h.encSliceruntime_RawExtension(([]pkg5_runtime.RawExtension)(x.Items), e) } } } @@ -45440,7 +45438,7 @@ func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { _ = yym7 if false { } else { - h.decSliceruntime_RawExtension((*[]pkg6_runtime.RawExtension)(yyv6), d) + h.decSliceruntime_RawExtension((*[]pkg5_runtime.RawExtension)(yyv6), d) } } case "kind": @@ -45511,7 +45509,7 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { _ = yym14 if false { } else { - h.decSliceruntime_RawExtension((*[]pkg6_runtime.RawExtension)(yyv13), d) + h.decSliceruntime_RawExtension((*[]pkg5_runtime.RawExtension)(yyv13), d) } } yyj10++ @@ -56147,7 +56145,7 @@ func (x codecSelfer1234) decResourceList(v *ResourceList, d *codec1978.Decoder) yyl1 := r.ReadMapStart() yybh1 := z.DecBasicHandle() if yyv1 == nil { - yyrl1, _ := z.DecInferLen(yyl1, yybh1.MaxInitLen, 40) + yyrl1, _ := z.DecInferLen(yyl1, yybh1.MaxInitLen, 80) yyv1 = make(map[ResourceName]pkg3_resource.Quantity, yyrl1) *v = yyv1 } @@ -56696,7 +56694,7 @@ func (x codecSelfer1234) decSliceEvent(v *[]Event, d *codec1978.Decoder) { } } -func (x codecSelfer1234) encSliceruntime_RawExtension(v []pkg6_runtime.RawExtension, e *codec1978.Encoder) { +func (x codecSelfer1234) encSliceruntime_RawExtension(v []pkg5_runtime.RawExtension, e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -56717,7 +56715,7 @@ func (x codecSelfer1234) encSliceruntime_RawExtension(v []pkg6_runtime.RawExtens z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x codecSelfer1234) decSliceruntime_RawExtension(v *[]pkg6_runtime.RawExtension, d *codec1978.Decoder) { +func (x codecSelfer1234) decSliceruntime_RawExtension(v *[]pkg5_runtime.RawExtension, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -56728,7 +56726,7 @@ func (x codecSelfer1234) decSliceruntime_RawExtension(v *[]pkg6_runtime.RawExten _ = yyc1 if yyl1 == 0 { if yyv1 == nil { - yyv1 = []pkg6_runtime.RawExtension{} + yyv1 = []pkg5_runtime.RawExtension{} yyc1 = true } else if len(yyv1) != 0 { yyv1 = yyv1[:0] @@ -56748,10 +56746,10 @@ func (x codecSelfer1234) decSliceruntime_RawExtension(v *[]pkg6_runtime.RawExten if yyrl1 <= cap(yyv1) { yyv1 = yyv1[:yyrl1] } else { - yyv1 = make([]pkg6_runtime.RawExtension, yyrl1) + yyv1 = make([]pkg5_runtime.RawExtension, yyrl1) } } else { - yyv1 = make([]pkg6_runtime.RawExtension, yyrl1) + yyv1 = make([]pkg5_runtime.RawExtension, yyrl1) } yyc1 = true yyrr1 = len(yyv1) @@ -56766,7 +56764,7 @@ func (x codecSelfer1234) decSliceruntime_RawExtension(v *[]pkg6_runtime.RawExten for ; yyj1 < yyrr1; yyj1++ { yyh1.ElemContainerState(yyj1) if r.TryDecodeAsNil() { - yyv1[yyj1] = pkg6_runtime.RawExtension{} + yyv1[yyj1] = pkg5_runtime.RawExtension{} } else { yyv2 := &yyv1[yyj1] yym3 := z.DecBinary() @@ -56783,10 +56781,10 @@ func (x codecSelfer1234) decSliceruntime_RawExtension(v *[]pkg6_runtime.RawExten } if yyrt1 { for ; yyj1 < yyl1; yyj1++ { - yyv1 = append(yyv1, pkg6_runtime.RawExtension{}) + yyv1 = append(yyv1, pkg5_runtime.RawExtension{}) yyh1.ElemContainerState(yyj1) if r.TryDecodeAsNil() { - yyv1[yyj1] = pkg6_runtime.RawExtension{} + yyv1[yyj1] = pkg5_runtime.RawExtension{} } else { yyv4 := &yyv1[yyj1] yym5 := z.DecBinary() @@ -56808,13 +56806,13 @@ func (x codecSelfer1234) decSliceruntime_RawExtension(v *[]pkg6_runtime.RawExten for ; !r.CheckBreak(); yyj1++ { if yyj1 >= len(yyv1) { - yyv1 = append(yyv1, pkg6_runtime.RawExtension{}) // var yyz1 pkg6_runtime.RawExtension + yyv1 = append(yyv1, pkg5_runtime.RawExtension{}) // var yyz1 pkg5_runtime.RawExtension yyc1 = true } yyh1.ElemContainerState(yyj1) if yyj1 < len(yyv1) { if r.TryDecodeAsNil() { - yyv1[yyj1] = pkg6_runtime.RawExtension{} + yyv1[yyj1] = pkg5_runtime.RawExtension{} } else { yyv6 := &yyv1[yyj1] yym7 := z.DecBinary() @@ -56837,7 +56835,7 @@ func (x codecSelfer1234) decSliceruntime_RawExtension(v *[]pkg6_runtime.RawExten yyv1 = yyv1[:yyj1] yyc1 = true } else if yyj1 == 0 && yyv1 == nil { - yyv1 = []pkg6_runtime.RawExtension{} + yyv1 = []pkg5_runtime.RawExtension{} yyc1 = true } } diff --git a/pkg/apis/apps/types.generated.go b/pkg/apis/apps/types.generated.go index 5041872478..9903f8e135 100644 --- a/pkg/apis/apps/types.generated.go +++ b/pkg/apis/apps/types.generated.go @@ -25,12 +25,11 @@ 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" pkg3_types "k8s.io/kubernetes/pkg/types" - pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" + pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" time "time" @@ -66,14 +65,13 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - 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 + var v0 pkg2_api.ObjectMeta + var v1 pkg4_resource.Quantity + var v2 pkg1_unversioned.TypeMeta + var v3 pkg3_types.UID + var v4 pkg5_intstr.IntOrString + var v5 time.Time + _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5 } } diff --git a/pkg/apis/apps/v1alpha1/types.generated.go b/pkg/apis/apps/v1alpha1/types.generated.go index 38edac9e59..a548f53133 100644 --- a/pkg/apis/apps/v1alpha1/types.generated.go +++ b/pkg/apis/apps/v1alpha1/types.generated.go @@ -25,12 +25,11 @@ 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" pkg3_types "k8s.io/kubernetes/pkg/types" - pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" + pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" time "time" @@ -66,14 +65,13 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - 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 + var v0 pkg4_resource.Quantity + var v1 pkg1_unversioned.TypeMeta + var v2 pkg2_v1.ObjectMeta + var v3 pkg3_types.UID + var v4 pkg5_intstr.IntOrString + var v5 time.Time + _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5 } } diff --git a/pkg/apis/batch/types.generated.go b/pkg/apis/batch/types.generated.go index 01589cda73..68605cc67a 100644 --- a/pkg/apis/batch/types.generated.go +++ b/pkg/apis/batch/types.generated.go @@ -25,12 +25,11 @@ 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" pkg3_types "k8s.io/kubernetes/pkg/types" - pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" + pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" time "time" @@ -66,14 +65,13 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - 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 + var v0 pkg2_api.ObjectMeta + var v1 pkg4_resource.Quantity + var v2 pkg1_unversioned.TypeMeta + var v3 pkg3_types.UID + var v4 pkg5_intstr.IntOrString + var v5 time.Time + _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5 } } diff --git a/pkg/apis/batch/v1/types.generated.go b/pkg/apis/batch/v1/types.generated.go index b305bb42bb..58d5f6f54c 100644 --- a/pkg/apis/batch/v1/types.generated.go +++ b/pkg/apis/batch/v1/types.generated.go @@ -25,12 +25,11 @@ 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" pkg3_types "k8s.io/kubernetes/pkg/types" - pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" + pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" time "time" @@ -66,14 +65,13 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - 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 + var v0 pkg4_resource.Quantity + var v1 pkg1_unversioned.TypeMeta + var v2 pkg2_v1.ObjectMeta + var v3 pkg3_types.UID + var v4 pkg5_intstr.IntOrString + var v5 time.Time + _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5 } } diff --git a/pkg/apis/batch/v2alpha1/types.generated.go b/pkg/apis/batch/v2alpha1/types.generated.go index f1369d6893..239ae8c2c0 100644 --- a/pkg/apis/batch/v2alpha1/types.generated.go +++ b/pkg/apis/batch/v2alpha1/types.generated.go @@ -25,12 +25,11 @@ 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" pkg3_types "k8s.io/kubernetes/pkg/types" - pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" + pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" time "time" @@ -66,14 +65,13 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - 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 + var v0 pkg4_resource.Quantity + var v1 pkg1_unversioned.TypeMeta + var v2 pkg2_v1.ObjectMeta + var v3 pkg3_types.UID + var v4 pkg5_intstr.IntOrString + var v5 time.Time + _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5 } } diff --git a/pkg/apis/extensions/types.generated.go b/pkg/apis/extensions/types.generated.go index f5b42e377f..ee8155f765 100644 --- a/pkg/apis/extensions/types.generated.go +++ b/pkg/apis/extensions/types.generated.go @@ -25,12 +25,11 @@ 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" pkg3_types "k8s.io/kubernetes/pkg/types" - pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" + pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" time "time" @@ -66,14 +65,13 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - 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 + var v0 pkg2_api.ObjectMeta + var v1 pkg4_resource.Quantity + var v2 pkg1_unversioned.LabelSelector + var v3 pkg3_types.UID + var v4 pkg5_intstr.IntOrString + var v5 time.Time + _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5 } } @@ -4916,7 +4914,7 @@ func (x *RollingUpdateDeployment) codecDecodeSelfFromMap(l int, d *codec1978.Dec switch yys3 { case "maxUnavailable": if r.TryDecodeAsNil() { - x.MaxUnavailable = pkg6_intstr.IntOrString{} + x.MaxUnavailable = pkg5_intstr.IntOrString{} } else { yyv4 := &x.MaxUnavailable yym5 := z.DecBinary() @@ -4931,7 +4929,7 @@ func (x *RollingUpdateDeployment) codecDecodeSelfFromMap(l int, d *codec1978.Dec } case "maxSurge": if r.TryDecodeAsNil() { - x.MaxSurge = pkg6_intstr.IntOrString{} + x.MaxSurge = pkg5_intstr.IntOrString{} } else { yyv6 := &x.MaxSurge yym7 := z.DecBinary() @@ -4970,7 +4968,7 @@ func (x *RollingUpdateDeployment) codecDecodeSelfFromArray(l int, d *codec1978.D } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.MaxUnavailable = pkg6_intstr.IntOrString{} + x.MaxUnavailable = pkg5_intstr.IntOrString{} } else { yyv9 := &x.MaxUnavailable yym10 := z.DecBinary() @@ -4995,7 +4993,7 @@ func (x *RollingUpdateDeployment) codecDecodeSelfFromArray(l int, d *codec1978.D } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.MaxSurge = pkg6_intstr.IntOrString{} + x.MaxSurge = pkg5_intstr.IntOrString{} } else { yyv11 := &x.MaxSurge yym12 := z.DecBinary() @@ -9593,7 +9591,7 @@ func (x *IngressBackend) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "servicePort": if r.TryDecodeAsNil() { - x.ServicePort = pkg6_intstr.IntOrString{} + x.ServicePort = pkg5_intstr.IntOrString{} } else { yyv5 := &x.ServicePort yym6 := z.DecBinary() @@ -9648,7 +9646,7 @@ func (x *IngressBackend) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ServicePort = pkg6_intstr.IntOrString{} + x.ServicePort = pkg5_intstr.IntOrString{} } else { yyv9 := &x.ServicePort yym10 := z.DecBinary() @@ -13849,7 +13847,7 @@ func (x codecSelfer1234) decSliceCustomMetricTarget(v *[]CustomMetricTarget, d * yyrg1 := len(yyv1) > 0 yyv21 := yyv1 - yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 40) + yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 80) if yyrt1 { if yyrl1 <= cap(yyv1) { yyv1 = yyv1[:yyrl1] @@ -13968,7 +13966,7 @@ func (x codecSelfer1234) decSliceCustomMetricCurrentStatus(v *[]CustomMetricCurr yyrg1 := len(yyv1) > 0 yyv21 := yyv1 - yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 40) + yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 80) if yyrt1 { if yyrl1 <= cap(yyv1) { yyv1 = yyv1[:yyrl1] diff --git a/pkg/apis/extensions/v1beta1/types.generated.go b/pkg/apis/extensions/v1beta1/types.generated.go index 84e3d95850..e647fa7ae9 100644 --- a/pkg/apis/extensions/v1beta1/types.generated.go +++ b/pkg/apis/extensions/v1beta1/types.generated.go @@ -25,12 +25,11 @@ 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" pkg3_types "k8s.io/kubernetes/pkg/types" - pkg6_intstr "k8s.io/kubernetes/pkg/util/intstr" + pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" "runtime" time "time" @@ -66,14 +65,13 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - 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 + var v0 pkg4_resource.Quantity + var v1 pkg1_unversioned.TypeMeta + var v2 pkg2_v1.ObjectMeta + var v3 pkg3_types.UID + var v4 pkg5_intstr.IntOrString + var v5 time.Time + _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5 } } @@ -6923,7 +6921,7 @@ func (x *RollingUpdateDeployment) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } else { if x.MaxUnavailable == nil { - x.MaxUnavailable = new(pkg6_intstr.IntOrString) + x.MaxUnavailable = new(pkg5_intstr.IntOrString) } yym5 := z.DecBinary() _ = yym5 @@ -6942,7 +6940,7 @@ func (x *RollingUpdateDeployment) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } else { if x.MaxSurge == nil { - x.MaxSurge = new(pkg6_intstr.IntOrString) + x.MaxSurge = new(pkg5_intstr.IntOrString) } yym7 := z.DecBinary() _ = yym7 @@ -6985,7 +6983,7 @@ func (x *RollingUpdateDeployment) codecDecodeSelfFromArray(l int, d *codec1978.D } } else { if x.MaxUnavailable == nil { - x.MaxUnavailable = new(pkg6_intstr.IntOrString) + x.MaxUnavailable = new(pkg5_intstr.IntOrString) } yym10 := z.DecBinary() _ = yym10 @@ -7014,7 +7012,7 @@ func (x *RollingUpdateDeployment) codecDecodeSelfFromArray(l int, d *codec1978.D } } else { if x.MaxSurge == nil { - x.MaxSurge = new(pkg6_intstr.IntOrString) + x.MaxSurge = new(pkg5_intstr.IntOrString) } yym12 := z.DecBinary() _ = yym12 @@ -13794,7 +13792,7 @@ func (x *IngressBackend) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "servicePort": if r.TryDecodeAsNil() { - x.ServicePort = pkg6_intstr.IntOrString{} + x.ServicePort = pkg5_intstr.IntOrString{} } else { yyv5 := &x.ServicePort yym6 := z.DecBinary() @@ -13849,7 +13847,7 @@ func (x *IngressBackend) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ServicePort = pkg6_intstr.IntOrString{} + x.ServicePort = pkg5_intstr.IntOrString{} } else { yyv9 := &x.ServicePort yym10 := z.DecBinary() @@ -19393,7 +19391,7 @@ func (x codecSelfer1234) decSliceCustomMetricTarget(v *[]CustomMetricTarget, d * yyrg1 := len(yyv1) > 0 yyv21 := yyv1 - yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 40) + yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 80) if yyrt1 { if yyrl1 <= cap(yyv1) { yyv1 = yyv1[:yyrl1] @@ -19512,7 +19510,7 @@ func (x codecSelfer1234) decSliceCustomMetricCurrentStatus(v *[]CustomMetricCurr yyrg1 := len(yyv1) > 0 yyv21 := yyv1 - yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 40) + yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 80) if yyrt1 { if yyrl1 <= cap(yyv1) { yyv1 = yyv1[:yyrl1] diff --git a/pkg/controller/petset/fakes.go b/pkg/controller/petset/fakes.go index 04e3e99050..6c1c8e713f 100644 --- a/pkg/controller/petset/fakes.go +++ b/pkg/controller/petset/fakes.go @@ -44,10 +44,7 @@ func newPVC(name string) api.PersistentVolumeClaim { Spec: api.PersistentVolumeClaimSpec{ Resources: api.ResourceRequirements{ Requests: api.ResourceList{ - api.ResourceStorage: resource.Quantity{ - Amount: dec(1, 0), - Format: resource.BinarySI, - }, + api.ResourceStorage: *resource.NewQuantity(1, resource.BinarySI), }, }, }, diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go index a8e092cafe..2ca083ff20 100644 --- a/pkg/controller/podautoscaler/horizontal.go +++ b/pkg/controller/podautoscaler/horizontal.go @@ -237,7 +237,7 @@ func (a *HorizontalController) computeReplicasForCustomMetrics(hpa *autoscaling. } statusList.Items = append(statusList.Items, extensions.CustomMetricCurrentStatus{ Name: customMetricTarget.Name, - CurrentValue: *quantity, + CurrentValue: quantity, }) } byteStatusList, err := json.Marshal(statusList) diff --git a/pkg/controller/podautoscaler/metrics/metrics_client.go b/pkg/controller/podautoscaler/metrics/metrics_client.go index 1d70f5f205..e115f285f8 100644 --- a/pkg/controller/podautoscaler/metrics/metrics_client.go +++ b/pkg/controller/podautoscaler/metrics/metrics_client.go @@ -129,8 +129,7 @@ func (h *HeapsterMetricsClient) GetCpuConsumptionAndRequestInMillis(namespace st podNames = append(podNames, pod.Name) for _, container := range pod.Spec.Containers { - containerRequest := container.Resources.Requests[api.ResourceCPU] - if containerRequest.Amount != nil { + if containerRequest, ok := container.Resources.Requests[api.ResourceCPU]; ok { requestSum += containerRequest.MilliValue() } else { missing = true diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index d8a7f39be6..ae13fa5662 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -1841,15 +1841,17 @@ func getPodsTotalRequestsAndLimits(podList *api.PodList) (reqs map[api.ResourceN for podReqName, podReqValue := range podReqs { if value, ok := reqs[podReqName]; !ok { reqs[podReqName] = *podReqValue.Copy() - } else if err = value.Add(podReqValue); err != nil { - return nil, nil, err + } else { + value.Add(podReqValue) + reqs[podReqName] = value } } for podLimitName, podLimitValue := range podLimits { if value, ok := limits[podLimitName]; !ok { limits[podLimitName] = *podLimitValue.Copy() - } else if err = value.Add(podLimitValue); err != nil { - return nil, nil, err + } else { + value.Add(podLimitValue) + limits[podLimitName] = value } } } diff --git a/pkg/kubectl/describe_test.go b/pkg/kubectl/describe_test.go index fc7358cf8f..ee8d99cf70 100644 --- a/pkg/kubectl/describe_test.go +++ b/pkg/kubectl/describe_test.go @@ -431,7 +431,7 @@ func TestGetPodsTotalRequests(t *testing.T) { if err != nil { t.Errorf("Unexpected error %v", err) } - if !reflect.DeepEqual(reqs, testCase.expectedReqs) { + if !api.Semantic.DeepEqual(reqs, testCase.expectedReqs) { t.Errorf("Expected %v, got %v", testCase.expectedReqs, reqs) } } diff --git a/pkg/kubectl/run.go b/pkg/kubectl/run.go index f24641e120..19a732c7e6 100644 --- a/pkg/kubectl/run.go +++ b/pkg/kubectl/run.go @@ -434,7 +434,7 @@ func populateResourceList(spec string) (api.ResourceList, error) { if err != nil { return nil, err } - result[resourceName] = *resourceQuantity + result[resourceName] = resourceQuantity } return result, nil } @@ -458,7 +458,7 @@ func populateV1ResourceList(spec string) (v1.ResourceList, error) { if err != nil { return nil, err } - result[resourceName] = *resourceQuantity + result[resourceName] = resourceQuantity } return result, nil } diff --git a/pkg/kubectl/run_test.go b/pkg/kubectl/run_test.go index b211fc363e..88238a8fb0 100644 --- a/pkg/kubectl/run_test.go +++ b/pkg/kubectl/run_test.go @@ -378,10 +378,12 @@ func TestGenerate(t *testing.T) { }, } generator := BasicReplicationController{} - for _, test := range tests { + for i, test := range tests { obj, err := generator.Generate(test.params) + t.Logf("%d: %#v", i, obj) if !test.expectErr && err != nil { t.Errorf("unexpected error: %v", err) + continue } if test.expectErr && err != nil { continue diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go index 10ac9e281f..3c85465107 100644 --- a/pkg/kubelet/dockertools/manager.go +++ b/pkg/kubelet/dockertools/manager.go @@ -581,7 +581,7 @@ func (dm *DockerManager) runContainer( // If request is not specified, but limit is, we want request to default to limit. // API server does this for new containers, but we repeat this logic in Kubelet // for containers running on existing Kubernetes clusters. - if cpuRequest.Amount == nil && cpuLimit.Amount != nil { + if cpuRequest.IsZero() && !cpuLimit.IsZero() { cpuShares = milliCPUToShares(cpuLimit.MilliValue()) } else { // if cpuRequest.Amount is nil, then milliCPUToShares will return the minimal number diff --git a/pkg/kubelet/eviction/helpers.go b/pkg/kubelet/eviction/helpers.go index e7077be1a1..99c378b351 100644 --- a/pkg/kubelet/eviction/helpers.go +++ b/pkg/kubelet/eviction/helpers.go @@ -148,7 +148,7 @@ func parseThresholdStatement(statement string) (Threshold, error) { return Threshold{ Signal: signal, Operator: operator, - Value: *quantity, + Value: quantity, }, nil } diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 4988462164..a5b0334b9b 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -3053,7 +3053,7 @@ func (kl *Kubelet) setNodeStatusMachineInfo(node *api.Node) { if kl.reservation.Kubernetes != nil { value.Sub(kl.reservation.Kubernetes[k]) } - if value.Amount != nil && value.Amount.Sign() < 0 { + if value.Sign() < 0 { // Negative Allocatable resources don't make sense. value.Set(0) } diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 9955269eed..c06193a57e 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -3853,16 +3853,16 @@ func TestExtractBandwidthResources(t *testing.T) { }, { pod: testPod("10M", ""), - expectedIngress: ten, + expectedIngress: &ten, }, { pod: testPod("", "10M"), - expectedEgress: ten, + expectedEgress: &ten, }, { pod: testPod("4M", "20M"), - expectedIngress: four, - expectedEgress: twenty, + expectedIngress: &four, + expectedEgress: &twenty, }, { pod: testPod("foo", ""), diff --git a/pkg/quota/resources.go b/pkg/quota/resources.go index 0cb03a84af..0d5a750341 100644 --- a/pkg/quota/resources.go +++ b/pkg/quota/resources.go @@ -93,7 +93,7 @@ func Subtract(a api.ResourceList, b api.ResourceList) api.ResourceList { for key, value := range b { if _, found := result[key]; !found { quantity := *value.Copy() - quantity.Neg(value) + quantity.Neg() result[key] = quantity } } diff --git a/pkg/util/bandwidth/utils.go b/pkg/util/bandwidth/utils.go index 989096f934..b501e9b5c8 100644 --- a/pkg/util/bandwidth/utils.go +++ b/pkg/util/bandwidth/utils.go @@ -38,18 +38,22 @@ func validateBandwidthIsReasonable(rsrc *resource.Quantity) error { func ExtractPodBandwidthResources(podAnnotations map[string]string) (ingress, egress *resource.Quantity, err error) { str, found := podAnnotations["kubernetes.io/ingress-bandwidth"] if found { - if ingress, err = resource.ParseQuantity(str); err != nil { + ingressValue, err := resource.ParseQuantity(str) + if err != nil { return nil, nil, err } + ingress = &ingressValue if err := validateBandwidthIsReasonable(ingress); err != nil { return nil, nil, err } } str, found = podAnnotations["kubernetes.io/egress-bandwidth"] if found { - if egress, err = resource.ParseQuantity(str); err != nil { + egressValue, err := resource.ParseQuantity(str) + if err != nil { return nil, nil, err } + egress = &egressValue if err := validateBandwidthIsReasonable(egress); err != nil { return nil, nil, err } diff --git a/pkg/volume/testing/testing.go b/pkg/volume/testing/testing.go index f1a420cf28..b126004f22 100644 --- a/pkg/volume/testing/testing.go +++ b/pkg/volume/testing/testing.go @@ -383,5 +383,5 @@ func FindEmptyDirectoryUsageOnTmpfs() (*resource.Quantity, error) { return nil, fmt.Errorf("failed to parse 'du' output %s due to error %v", out, err) } used.Format = resource.BinarySI - return used, nil + return &used, nil } diff --git a/pkg/volume/util/fs_darwin.go b/pkg/volume/util/fs_darwin.go index 91d5ef9707..ef7a161822 100644 --- a/pkg/volume/util/fs_darwin.go +++ b/pkg/volume/util/fs_darwin.go @@ -43,5 +43,5 @@ func Du(path string) (*resource.Quantity, error) { return nil, fmt.Errorf("failed to parse 'du' output %s due to error %v", out, err) } used.Format = resource.BinarySI - return used, nil + return &used, nil } diff --git a/pkg/volume/util/fs_linux.go b/pkg/volume/util/fs_linux.go index 39d1b0399a..5193c0a3fc 100644 --- a/pkg/volume/util/fs_linux.go +++ b/pkg/volume/util/fs_linux.go @@ -57,5 +57,5 @@ func Du(path string) (*resource.Quantity, error) { return nil, fmt.Errorf("failed to parse 'du' output %s due to error %v", out, err) } used.Format = resource.BinarySI - return used, nil + return &used, nil } diff --git a/test/e2e/limit_range.go b/test/e2e/limit_range.go index c59feeed67..5e18c525b5 100644 --- a/test/e2e/limit_range.go +++ b/test/e2e/limit_range.go @@ -104,7 +104,7 @@ var _ = framework.KubeDescribe("LimitRange", func() { }) func equalResourceRequirement(expected api.ResourceRequirements, actual api.ResourceRequirements) error { - framework.Logf("Verifying requests: expected %s with actual %s", expected.Requests, actual.Requests) + framework.Logf("Verifying requests: expected %v with actual %v", expected.Requests, actual.Requests) err := equalResourceList(expected.Requests, actual.Requests) if err != nil { return err diff --git a/test/e2e/petset.go b/test/e2e/petset.go index 82dbb51c3c..8a5bccc66d 100644 --- a/test/e2e/petset.go +++ b/test/e2e/petset.go @@ -314,10 +314,7 @@ func newPVC(name string) api.PersistentVolumeClaim { }, Resources: api.ResourceRequirements{ Requests: api.ResourceList{ - api.ResourceStorage: resource.Quantity{ - Amount: dec(1, 0), - Format: resource.BinarySI, - }, + api.ResourceStorage: *resource.NewQuantity(1, resource.BinarySI), }, }, }, diff --git a/vendor/github.com/appc/spec/schema/types/isolator_resources.go b/vendor/github.com/appc/spec/schema/types/isolator_resources.go index 2ac5130d1c..d97827b96f 100644 --- a/vendor/github.com/appc/spec/schema/types/isolator_resources.go +++ b/vendor/github.com/appc/spec/schema/types/isolator_resources.go @@ -155,8 +155,8 @@ func NewResourceCPUIsolator(request, limit string) (*ResourceCPU, error) { res := &ResourceCPU{ ResourceBase{ resourceValue{ - Request: req, - Limit: lim, + Request: &req, + Limit: &lim, }, }, } @@ -209,8 +209,8 @@ func NewResourceMemoryIsolator(request, limit string) (*ResourceMemory, error) { res := &ResourceMemory{ ResourceBase{ resourceValue{ - Request: req, - Limit: lim, + Request: &req, + Limit: &lim, }, }, }