github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50163 from jingxu97/Aug/sizeLimit

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 51707, 51662, 51723, 50163, 51633)

Change SizeLimit to a pointer

This PR fixes issue #50121

```release-note
The `emptyDir.sizeLimit` field is now correctly omitted from API requests and responses when unset.
```
This commit is contained in:
Kubernetes Submit Queue
2017-08-31 18:43:38 -07:00
committed by GitHub
parent 1152938297 e1460efcf2
commit 8679a8f5fe
15 changed files with 917 additions and 874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/types.go
View File

@@ -651,7 +651,7 @@ type EmptyDirVolumeSource struct {
// The default is nil which means that the limit is undefined. // The default is nil which means that the limit is undefined.
// More info: http://kubernetes.io/docs/user-guide/volumes#emptydir // More info: http://kubernetes.io/docs/user-guide/volumes#emptydir
// +optional // +optional
SizeLimit resource.Quantity SizeLimit *resource.Quantity
} }
// StorageMedium defines ways that storage can be allocated to a volume. // StorageMedium defines ways that storage can be allocated to a volume.

1
pkg/api/v1/BUILD
View File

@@ -23,6 +23,7 @@ go_library(
"//pkg/util/parsers:go_default_library", "//pkg/util/parsers:go_default_library",
"//pkg/util/pointer:go_default_library", "//pkg/util/pointer:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",

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

@@ -22,6 +22,7 @@ package v1
import ( import (
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
resource "k8s.io/apimachinery/pkg/api/resource"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
@@ -1329,7 +1330,7 @@ func Convert_api_DownwardAPIVolumeSource_To_v1_DownwardAPIVolumeSource(in *api.D
func autoConvert_v1_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in *v1.EmptyDirVolumeSource, out *api.EmptyDirVolumeSource, s conversion.Scope) error { func autoConvert_v1_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in *v1.EmptyDirVolumeSource, out *api.EmptyDirVolumeSource, s conversion.Scope) error {
out.Medium = api.StorageMedium(in.Medium) out.Medium = api.StorageMedium(in.Medium)
out.SizeLimit = in.SizeLimit out.SizeLimit = (*resource.Quantity)(unsafe.Pointer(in.SizeLimit))
return nil return nil
} }
@@ -1340,7 +1341,7 @@ func Convert_v1_EmptyDirVolumeSource_To_api_EmptyDirVolumeSource(in *v1.EmptyDir
func autoConvert_api_EmptyDirVolumeSource_To_v1_EmptyDirVolumeSource(in *api.EmptyDirVolumeSource, out *v1.EmptyDirVolumeSource, s conversion.Scope) error { func autoConvert_api_EmptyDirVolumeSource_To_v1_EmptyDirVolumeSource(in *api.EmptyDirVolumeSource, out *v1.EmptyDirVolumeSource, s conversion.Scope) error {
out.Medium = v1.StorageMedium(in.Medium) out.Medium = v1.StorageMedium(in.Medium)
out.SizeLimit = in.SizeLimit out.SizeLimit = (*resource.Quantity)(unsafe.Pointer(in.SizeLimit))
return nil return nil
} }

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

@@ -386,10 +386,13 @@ func validateVolumeSource(source *api.VolumeSource, fldPath *field.Path, volName
if source.EmptyDir != nil { if source.EmptyDir != nil {
numVolumes++ numVolumes++
if !utilfeature.DefaultFeatureGate.Enabled(features.LocalStorageCapacityIsolation) { if !utilfeature.DefaultFeatureGate.Enabled(features.LocalStorageCapacityIsolation) {
unsetSizeLimit := resource.Quantity{} if source.EmptyDir.SizeLimit != nil && source.EmptyDir.SizeLimit.Cmp(resource.Quantity{}) != 0 {
if unsetSizeLimit.Cmp(source.EmptyDir.SizeLimit) != 0 {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("emptyDir").Child("sizeLimit"), "SizeLimit field disabled by feature-gate for EmptyDir volumes")) allErrs = append(allErrs, field.Forbidden(fldPath.Child("emptyDir").Child("sizeLimit"), "SizeLimit field disabled by feature-gate for EmptyDir volumes"))
} }
} else {
if source.EmptyDir.SizeLimit != nil && source.EmptyDir.SizeLimit.Cmp(resource.Quantity{}) < 0 {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("emptyDir").Child("sizeLimit"), "SizeLimit field must be a valid resource quantity"))
}
} }
} }
if source.HostPath != nil { if source.HostPath != nil {

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

@@ -2656,7 +2656,7 @@ func TestValidateVolumes(t *testing.T) {
func TestAlphaLocalStorageCapacityIsolation(t *testing.T) { func TestAlphaLocalStorageCapacityIsolation(t *testing.T) {
testCases := []api.VolumeSource{ testCases := []api.VolumeSource{
{EmptyDir: &api.EmptyDirVolumeSource{SizeLimit: *resource.NewQuantity(int64(5), resource.BinarySI)}}, {EmptyDir: &api.EmptyDirVolumeSource{SizeLimit: resource.NewQuantity(int64(5), resource.BinarySI)}},
} }
// Enable alpha feature LocalStorageCapacityIsolation // Enable alpha feature LocalStorageCapacityIsolation
err := utilfeature.DefaultFeatureGate.Set("LocalStorageCapacityIsolation=true") err := utilfeature.DefaultFeatureGate.Set("LocalStorageCapacityIsolation=true")

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

@@ -21,6 +21,7 @@ limitations under the License.
package api package api
import ( import (
resource "k8s.io/apimachinery/pkg/api/resource"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
@@ -1787,7 +1788,15 @@ func (in *DownwardAPIVolumeSource) DeepCopy() *DownwardAPIVolumeSource {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *EmptyDirVolumeSource) DeepCopyInto(out *EmptyDirVolumeSource) { func (in *EmptyDirVolumeSource) DeepCopyInto(out *EmptyDirVolumeSource) {
*out = *in *out = *in
out.SizeLimit = in.SizeLimit.DeepCopy() if in.SizeLimit != nil {
in, out := &in.SizeLimit, &out.SizeLimit
if *in == nil {
*out = nil
} else {
*out = new(resource.Quantity)
**out = (*in).DeepCopy()
}
}
return return
} }

2
pkg/kubelet/eviction/eviction_manager.go
View File

@@ -496,7 +496,7 @@ func (m *managerImpl) emptyDirLimitEviction(podStats statsapi.PodStats, pod *v1.
if source.EmptyDir != nil { if source.EmptyDir != nil {
size := source.EmptyDir.SizeLimit size := source.EmptyDir.SizeLimit
used := podVolumeUsed[pod.Spec.Volumes[i].Name] used := podVolumeUsed[pod.Spec.Volumes[i].Name]
if used != nil && size.Sign() == 1 && used.Cmp(size) > 0 { if used != nil && size != nil && size.Sign() == 1 && used.Cmp(*size) > 0 {
// the emptyDir usage exceeds the size limit, evict the pod // the emptyDir usage exceeds the size limit, evict the pod
return m.evictPod(pod, v1.ResourceName("EmptyDir"), fmt.Sprintf("emptyDir usage exceeds the limit %q", size.String())) return m.evictPod(pod, v1.ResourceName("EmptyDir"), fmt.Sprintf("emptyDir usage exceeds the limit %q", size.String()))
} }

2
plugin/pkg/scheduler/algorithm/predicates/predicates_test.go
View File

@@ -124,7 +124,7 @@ func addStorageLimit(pod *v1.Pod, sizeLimit int64, medium v1.StorageMedium) *v1.
Name: "emptyDirVolumeName", Name: "emptyDirVolumeName",
VolumeSource: v1.VolumeSource{ VolumeSource: v1.VolumeSource{
EmptyDir: &v1.EmptyDirVolumeSource{ EmptyDir: &v1.EmptyDirVolumeSource{
SizeLimit: *resource.NewQuantity(sizeLimit, resource.BinarySI), SizeLimit: resource.NewQuantity(sizeLimit, resource.BinarySI),
Medium: medium, Medium: medium,
}, },
}, },

168
staging/src/k8s.io/api/autoscaling/v2alpha1/generated.pb.go
View File

@@ -3314,88 +3314,88 @@ func init() {
} }
var fileDescriptorGenerated = []byte{ var fileDescriptorGenerated = []byte{
// 1320 bytes of a gzipped FileDescriptorProto // 1317 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xcd, 0x6f, 0x1b, 0x45, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xcb, 0x6f, 0x5b, 0xc5,
0x14, 0x8f, 0x1d, 0x27, 0x0d, 0xe3, 0x34, 0x29, 0xd3, 0xaa, 0x75, 0x53, 0x6a, 0x47, 0x2b, 0x84, 0x17, 0x8e, 0x1d, 0x27, 0xcd, 0x6f, 0x9c, 0x26, 0xfd, 0x4d, 0xab, 0xd6, 0x4d, 0xa9, 0x1d, 0x5d,
0x5a, 0x50, 0x77, 0x89, 0xdb, 0xa2, 0x1e, 0x10, 0x52, 0x6c, 0x04, 0xad, 0x48, 0xda, 0x32, 0x0d, 0x21, 0x54, 0x40, 0xbd, 0x97, 0xb8, 0x2d, 0xea, 0x02, 0x21, 0xc5, 0x46, 0xd0, 0x8a, 0xa4, 0x2d,
0x05, 0xf1, 0x3d, 0xd9, 0x9d, 0x3a, 0x43, 0xbc, 0x1f, 0x9a, 0x19, 0x47, 0xa4, 0x02, 0x89, 0x0b, 0xd3, 0x50, 0x10, 0xef, 0xc9, 0xbd, 0x53, 0x67, 0x88, 0xef, 0x43, 0x33, 0x63, 0x8b, 0x54, 0x20,
0x77, 0x2e, 0x95, 0xf8, 0x27, 0x38, 0xc3, 0x19, 0x84, 0xd4, 0x0b, 0xa2, 0xc7, 0x0a, 0x09, 0x8b, 0xb1, 0x61, 0xcf, 0xa6, 0x12, 0xff, 0x04, 0x6b, 0x58, 0x83, 0x90, 0xba, 0x41, 0x74, 0x59, 0x21,
0x9a, 0xff, 0xa2, 0x27, 0x34, 0x1f, 0xfb, 0x65, 0x7b, 0xeb, 0xd4, 0x84, 0x8f, 0xdb, 0xee, 0xbc, 0x61, 0x51, 0xf3, 0x5f, 0x74, 0x85, 0xe6, 0x71, 0x5f, 0xb6, 0x6f, 0x9d, 0x84, 0xf0, 0xd8, 0xd9,
0xf7, 0x7e, 0xef, 0xbd, 0xdf, 0x7b, 0xf3, 0x66, 0x06, 0x5c, 0xdd, 0xbd, 0xc2, 0x6d, 0x1a, 0x3a, 0x73, 0xce, 0xf9, 0xce, 0x39, 0xdf, 0x7c, 0x73, 0x66, 0x2e, 0xb8, 0xb6, 0x7b, 0x95, 0xdb, 0x34,
0xbb, 0xbd, 0x6d, 0xc2, 0x02, 0x22, 0x08, 0x77, 0xf6, 0x48, 0xe0, 0x85, 0xcc, 0x31, 0x02, 0x1c, 0x74, 0x76, 0x7b, 0xdb, 0x84, 0x05, 0x44, 0x10, 0xee, 0xf4, 0x49, 0xe0, 0x85, 0xcc, 0x31, 0x06,
0x51, 0x07, 0xf7, 0x44, 0xc8, 0x5d, 0xdc, 0xa5, 0x41, 0xc7, 0xd9, 0x6b, 0xe2, 0x6e, 0xb4, 0x83, 0x1c, 0x51, 0x07, 0xf7, 0x44, 0xc8, 0x5d, 0xdc, 0xa5, 0x41, 0xc7, 0xe9, 0x37, 0x71, 0x37, 0xda,
0xd7, 0x9c, 0x0e, 0x09, 0x08, 0xc3, 0x82, 0x78, 0x76, 0xc4, 0x42, 0x11, 0xc2, 0x86, 0x36, 0xb0, 0xc1, 0x6b, 0x4e, 0x87, 0x04, 0x84, 0x61, 0x41, 0x3c, 0x3b, 0x62, 0xa1, 0x08, 0x61, 0x43, 0x07,
0x71, 0x44, 0xed, 0x8c, 0x81, 0x1d, 0x1b, 0xac, 0x5c, 0xe8, 0x50, 0xb1, 0xd3, 0xdb, 0xb6, 0xdd, 0xd8, 0x38, 0xa2, 0x76, 0x26, 0xc0, 0x8e, 0x03, 0x56, 0x2e, 0x76, 0xa8, 0xd8, 0xe9, 0x6d, 0xdb,
0xd0, 0x77, 0x3a, 0x61, 0x27, 0x74, 0x94, 0xdd, 0x76, 0xef, 0x8e, 0xfa, 0x53, 0x3f, 0xea, 0x4b, 0x6e, 0xe8, 0x3b, 0x9d, 0xb0, 0x13, 0x3a, 0x2a, 0x6e, 0xbb, 0x77, 0x57, 0xfd, 0x53, 0x7f, 0xd4,
0xe3, 0xad, 0x9c, 0x2f, 0x0a, 0x60, 0xc4, 0xf5, 0x8a, 0x95, 0x51, 0x75, 0x43, 0x46, 0xc6, 0xe9, 0x2f, 0x8d, 0xb7, 0x62, 0x65, 0x0a, 0x70, 0x43, 0x46, 0x9c, 0xfe, 0x58, 0xce, 0x95, 0xcb, 0xa9,
0x5c, 0x4a, 0x75, 0x7c, 0xec, 0xee, 0xd0, 0x80, 0xb0, 0x7d, 0x27, 0xda, 0xed, 0x28, 0x23, 0x46, 0x8f, 0x8f, 0xdd, 0x1d, 0x1a, 0x10, 0xb6, 0xe7, 0x44, 0xbb, 0x1d, 0x15, 0xc4, 0x08, 0x0f, 0x7b,
0x78, 0xd8, 0x63, 0x2e, 0x79, 0x2a, 0x2b, 0xee, 0xf8, 0x44, 0xe0, 0x71, 0xbe, 0x9c, 0x22, 0x2b, 0xcc, 0x25, 0x07, 0x8a, 0xe2, 0x8e, 0x4f, 0x04, 0x9e, 0x94, 0xcb, 0x29, 0x8a, 0x62, 0xbd, 0x40,
0xd6, 0x0b, 0x04, 0xf5, 0x47, 0xdd, 0xbc, 0x32, 0xc9, 0x80, 0xbb, 0x3b, 0xc4, 0xc7, 0x23, 0x76, 0x50, 0x7f, 0x3c, 0xcd, 0xcb, 0xd3, 0x02, 0xb8, 0xbb, 0x43, 0x7c, 0x3c, 0x16, 0x77, 0xa9, 0x28,
0x17, 0x8b, 0xec, 0x7a, 0x82, 0x76, 0x1d, 0x1a, 0x08, 0x2e, 0xd8, 0xb0, 0x91, 0x75, 0xaf, 0x04, 0xae, 0x27, 0x68, 0xd7, 0xa1, 0x81, 0xe0, 0x82, 0x8d, 0x06, 0x59, 0xf7, 0x4b, 0xe0, 0x5c, 0x9b,
0xce, 0xb4, 0x59, 0xc8, 0xf9, 0x6d, 0xc2, 0x38, 0x0d, 0x83, 0x1b, 0xdb, 0x9f, 0x11, 0x57, 0x20, 0x85, 0x9c, 0xdf, 0x21, 0x8c, 0xd3, 0x30, 0xb8, 0xb9, 0xfd, 0x29, 0x71, 0x05, 0x22, 0x77, 0x09,
0x72, 0x87, 0x30, 0x12, 0xb8, 0x04, 0xae, 0x82, 0xca, 0x2e, 0x0d, 0xbc, 0x5a, 0x69, 0xb5, 0x74, 0x23, 0x81, 0x4b, 0xe0, 0x2a, 0xa8, 0xec, 0xd2, 0xc0, 0xab, 0x95, 0x56, 0x4b, 0x17, 0xfe, 0xd7,
0xee, 0x99, 0xd6, 0xe2, 0xfd, 0x7e, 0x63, 0x66, 0xd0, 0x6f, 0x54, 0xde, 0xa2, 0x81, 0x87, 0x94, 0x5a, 0x7c, 0x30, 0x68, 0xcc, 0x0c, 0x07, 0x8d, 0xca, 0x9b, 0x34, 0xf0, 0x90, 0xb2, 0x48, 0x8f,
0x44, 0x6a, 0x04, 0xd8, 0x27, 0xb5, 0x72, 0x5e, 0xe3, 0x3a, 0xf6, 0x09, 0x52, 0x12, 0xd8, 0x04, 0x00, 0xfb, 0xa4, 0x56, 0xce, 0x7b, 0xdc, 0xc0, 0x3e, 0x41, 0xca, 0x02, 0x9b, 0x00, 0xe0, 0x88,
0x00, 0x47, 0xd4, 0x38, 0xa8, 0xcd, 0x2a, 0x3d, 0x68, 0xf4, 0xc0, 0xfa, 0xcd, 0x6b, 0x46, 0x82, 0x9a, 0x04, 0xb5, 0x59, 0xe5, 0x07, 0x8d, 0x1f, 0x58, 0xbf, 0x75, 0xdd, 0x58, 0x50, 0xc6, 0xcb,
0x32, 0x5a, 0xd6, 0x4f, 0x65, 0x70, 0xea, 0x6a, 0xc8, 0xe8, 0xdd, 0x30, 0x10, 0xb8, 0x7b, 0x33, 0xfa, 0xb1, 0x0c, 0xce, 0x5c, 0x0b, 0x19, 0xbd, 0x17, 0x06, 0x02, 0x77, 0x6f, 0x85, 0xde, 0xba,
0xf4, 0xd6, 0x4d, 0xd5, 0x09, 0x83, 0x9f, 0x82, 0x05, 0x49, 0xb6, 0x87, 0x05, 0x56, 0x71, 0x55, 0x91, 0x06, 0x61, 0xf0, 0x13, 0xb0, 0x20, 0xc9, 0xf6, 0xb0, 0xc0, 0xaa, 0xae, 0x6a, 0xf3, 0x25,
0x9b, 0x2f, 0xdb, 0x69, 0xbf, 0x25, 0xb9, 0xdb, 0xd1, 0x6e, 0x47, 0x2e, 0x70, 0x5b, 0x6a, 0xdb, 0x3b, 0x15, 0x51, 0xd2, 0xbb, 0x1d, 0xed, 0x76, 0xe4, 0x02, 0xb7, 0xa5, 0xb7, 0xdd, 0x5f, 0xb3,
0x7b, 0x6b, 0xb6, 0x4e, 0x6e, 0x93, 0x08, 0x9c, 0xfa, 0x4f, 0xd7, 0x50, 0x82, 0x0a, 0x3f, 0x06, 0x75, 0x73, 0x9b, 0x44, 0xe0, 0x34, 0x7f, 0xba, 0x86, 0x12, 0x54, 0xf8, 0x11, 0xa8, 0xf0, 0x88,
0x15, 0x1e, 0x11, 0x57, 0xe5, 0x54, 0x6d, 0xbe, 0x6a, 0x4f, 0xe8, 0x66, 0xbb, 0x20, 0xd2, 0x5b, 0xb8, 0xaa, 0xa7, 0x6a, 0xf3, 0x15, 0x7b, 0x8a, 0x44, 0xed, 0x82, 0x4a, 0x6f, 0x47, 0xc4, 0x4d,
0x11, 0x71, 0x53, 0x46, 0xe4, 0x1f, 0x52, 0xb8, 0xf0, 0x0e, 0x98, 0xe7, 0x02, 0x8b, 0x1e, 0x57, 0x19, 0x91, 0xff, 0x90, 0xc2, 0x85, 0x77, 0xc1, 0x3c, 0x17, 0x58, 0xf4, 0xb8, 0x62, 0xa3, 0xda,
0x6c, 0x54, 0x9b, 0xaf, 0x4d, 0xed, 0x41, 0xa1, 0xb4, 0x96, 0x8c, 0x8f, 0x79, 0xfd, 0x8f, 0x0c, 0x7c, 0xf5, 0xd0, 0x19, 0x14, 0x4a, 0x6b, 0xc9, 0xe4, 0x98, 0xd7, 0xff, 0x91, 0x41, 0xb7, 0xbe,
0xba, 0xf5, 0xf5, 0x2c, 0x58, 0x2d, 0xb0, 0x6c, 0x87, 0x81, 0x47, 0x05, 0x0d, 0x03, 0x78, 0x15, 0x9a, 0x05, 0xab, 0x05, 0x91, 0xed, 0x30, 0xf0, 0xa8, 0xa0, 0x61, 0x00, 0xaf, 0x81, 0x8a, 0xd8,
0x54, 0xc4, 0x7e, 0x44, 0x4c, 0x89, 0x2f, 0xc5, 0xe1, 0x6e, 0xed, 0x47, 0xe4, 0x71, 0xbf, 0xf1, 0x8b, 0x88, 0xd9, 0xe2, 0xcb, 0x71, 0xb9, 0x5b, 0x7b, 0x11, 0x79, 0x32, 0x68, 0x3c, 0x3b, 0x2d,
0xfc, 0x24, 0x7b, 0xa9, 0x87, 0x14, 0x02, 0xdc, 0x48, 0xd2, 0x2a, 0xe7, 0xb0, 0x4c, 0x58, 0x8f, 0x5e, 0xfa, 0x21, 0x85, 0x00, 0x37, 0x92, 0xb6, 0xca, 0x39, 0x2c, 0x53, 0xd6, 0x93, 0x41, 0x63,
0xfb, 0x8d, 0x31, 0x9b, 0xd3, 0x4e, 0x90, 0xf2, 0xc1, 0xc3, 0x3d, 0x00, 0xbb, 0x98, 0x8b, 0x2d, 0xc2, 0xe1, 0xb4, 0x13, 0xa4, 0x7c, 0xf1, 0xb0, 0x0f, 0x60, 0x17, 0x73, 0xb1, 0xc5, 0x70, 0xc0,
0x86, 0x03, 0xae, 0x3d, 0x51, 0x9f, 0x18, 0xc2, 0x5e, 0x3c, 0x58, 0xc1, 0xa5, 0x45, 0x6b, 0xc5, 0x75, 0x26, 0xea, 0x13, 0x43, 0xd8, 0x0b, 0xfb, 0xdb, 0x70, 0x19, 0xd1, 0x5a, 0x31, 0x55, 0xc0,
0x44, 0x01, 0x37, 0x46, 0xd0, 0xd0, 0x18, 0x0f, 0xf0, 0x05, 0x30, 0xcf, 0x08, 0xe6, 0x61, 0x50, 0x8d, 0x31, 0x34, 0x34, 0x21, 0x03, 0x7c, 0x0e, 0xcc, 0x33, 0x82, 0x79, 0x18, 0xd4, 0x2a, 0xaa,
0xab, 0xa8, 0x2c, 0x12, 0x72, 0x91, 0x5a, 0x45, 0x46, 0x0a, 0xcf, 0x83, 0x23, 0x3e, 0xe1, 0x1c, 0x8b, 0x84, 0x5c, 0xa4, 0x56, 0x91, 0xb1, 0xc2, 0xe7, 0xc1, 0x31, 0x9f, 0x70, 0x8e, 0x3b, 0xa4,
0x77, 0x48, 0x6d, 0x4e, 0x29, 0x2e, 0x1b, 0xc5, 0x23, 0x9b, 0x7a, 0x19, 0xc5, 0x72, 0xeb, 0xb7, 0x36, 0xa7, 0x1c, 0x97, 0x8d, 0xe3, 0xb1, 0x4d, 0xbd, 0x8c, 0x62, 0xbb, 0xf5, 0x6b, 0x09, 0x9c,
0x12, 0x38, 0x53, 0xc0, 0xe3, 0x06, 0xe5, 0x02, 0x7e, 0x38, 0xd2, 0xd1, 0xf6, 0xc1, 0x12, 0x94, 0x2b, 0xe0, 0x71, 0x83, 0x72, 0x01, 0x3f, 0x18, 0x53, 0xb4, 0xbd, 0xbf, 0x06, 0x65, 0xb4, 0xd2,
0xd6, 0xaa, 0x9f, 0x8f, 0x19, 0xdf, 0x0b, 0xf1, 0x4a, 0xa6, 0x9b, 0x3f, 0x02, 0x73, 0x54, 0x10, 0xf3, 0x09, 0x93, 0x7b, 0x21, 0x5e, 0xc9, 0xa8, 0xf9, 0x43, 0x30, 0x47, 0x05, 0xf1, 0xe5, 0xae,
0x5f, 0x56, 0x65, 0xf6, 0x5c, 0xb5, 0x79, 0x65, 0xda, 0x66, 0x6b, 0x1d, 0x35, 0x4e, 0xe6, 0xae, 0xcc, 0x5e, 0xa8, 0x36, 0xaf, 0x1e, 0x56, 0x6c, 0xad, 0xe3, 0x26, 0xc9, 0xdc, 0x75, 0x09, 0x87,
0x49, 0x38, 0xa4, 0x51, 0xad, 0xdf, 0xcb, 0x85, 0xc9, 0xc9, 0x96, 0x87, 0x5f, 0x80, 0x25, 0xf5, 0x34, 0xaa, 0xf5, 0x5b, 0xb9, 0xb0, 0x39, 0x29, 0x79, 0xf8, 0x39, 0x58, 0x52, 0xff, 0xb6, 0x30,
0xb7, 0x85, 0x59, 0x87, 0xc8, 0xd1, 0x62, 0x52, 0x9c, 0xbc, 0xad, 0x9e, 0x30, 0x98, 0x5a, 0x27, 0xeb, 0x10, 0x39, 0x5a, 0x4c, 0x8b, 0xd3, 0x8f, 0xd5, 0x53, 0x06, 0x53, 0xeb, 0xb4, 0xa9, 0x65,
0x4d, 0x2c, 0x4b, 0xb7, 0x72, 0xd8, 0x68, 0xc8, 0x17, 0x5c, 0x03, 0x55, 0x9f, 0x06, 0x88, 0x44, 0xe9, 0x76, 0x0e, 0x1b, 0x8d, 0xe4, 0x82, 0x6b, 0xa0, 0xea, 0xd3, 0x00, 0x91, 0xa8, 0x4b, 0x5d,
0x5d, 0xea, 0x62, 0xdd, 0x98, 0x73, 0xad, 0xe5, 0x41, 0xbf, 0x51, 0xdd, 0x4c, 0x97, 0x51, 0x56, 0xac, 0x85, 0x39, 0xd7, 0x5a, 0x1e, 0x0e, 0x1a, 0xd5, 0xcd, 0x74, 0x19, 0x65, 0x7d, 0xe0, 0x15,
0x07, 0x5e, 0x06, 0x55, 0x1f, 0x7f, 0x9e, 0x98, 0xcc, 0x2a, 0x93, 0xe3, 0xc6, 0x5f, 0x75, 0x33, 0x50, 0xf5, 0xf1, 0x67, 0x49, 0xc8, 0xac, 0x0a, 0x39, 0x69, 0xf2, 0x55, 0x37, 0x53, 0x13, 0xca,
0x15, 0xa1, 0xac, 0x1e, 0xbc, 0x2d, 0xfb, 0x41, 0x30, 0xea, 0xf2, 0x5a, 0x45, 0x11, 0xfd, 0xd2, 0xfa, 0xc1, 0x3b, 0x52, 0x0f, 0x82, 0x51, 0x97, 0xd7, 0x2a, 0x8a, 0xe8, 0x17, 0xa7, 0x36, 0xb8,
0xc4, 0x04, 0x37, 0x95, 0xbe, 0x1a, 0x13, 0x99, 0xe6, 0x51, 0x18, 0x28, 0x06, 0xb3, 0x7e, 0xa8, 0xa9, 0xfc, 0xd5, 0x98, 0xc8, 0x88, 0x47, 0x61, 0xa0, 0x18, 0xcc, 0xfa, 0xbe, 0x02, 0xce, 0x3f,
0x80, 0xb3, 0x4f, 0xdc, 0xfe, 0xf0, 0x0d, 0x00, 0xc3, 0x6d, 0x4e, 0xd8, 0x1e, 0xf1, 0xde, 0xd4, 0xf5, 0xf8, 0xc3, 0xd7, 0x01, 0x0c, 0xb7, 0x39, 0x61, 0x7d, 0xe2, 0xbd, 0xa1, 0xe7, 0xbb, 0x1c,
0xf3, 0x5d, 0x0e, 0x5a, 0xc9, 0xf2, 0x6c, 0xeb, 0xa4, 0xec, 0xfc, 0x1b, 0x23, 0x52, 0x34, 0xc6, 0xb4, 0x92, 0xe5, 0xd9, 0xd6, 0x69, 0xa9, 0xfc, 0x9b, 0x63, 0x56, 0x34, 0x21, 0x02, 0xba, 0xe0,
0x02, 0xba, 0xe0, 0xa8, 0xdc, 0x0f, 0x9a, 0x51, 0x6a, 0x66, 0xfa, 0xd3, 0x6d, 0xb6, 0x67, 0x07, 0xb8, 0x3c, 0x0f, 0x9a, 0x51, 0x6a, 0x66, 0xfa, 0xc1, 0x0e, 0xdb, 0xff, 0x87, 0x83, 0xc6, 0xf1,
0xfd, 0xc6, 0xd1, 0x8d, 0x2c, 0x08, 0xca, 0x63, 0xc2, 0x75, 0xb0, 0xec, 0xf6, 0x18, 0x23, 0x81, 0x8d, 0x2c, 0x08, 0xca, 0x63, 0xc2, 0x75, 0xb0, 0xec, 0xf6, 0x18, 0x23, 0x81, 0x18, 0x61, 0xf8,
0x18, 0x62, 0xf8, 0x94, 0x61, 0x60, 0xb9, 0x9d, 0x17, 0xa3, 0x61, 0x7d, 0x09, 0xe1, 0x11, 0x4e, 0x8c, 0x61, 0x60, 0xb9, 0x9d, 0x37, 0xa3, 0x51, 0x7f, 0x09, 0xe1, 0x11, 0x4e, 0x19, 0xf1, 0x12,
0x19, 0xf1, 0x12, 0x88, 0x4a, 0x1e, 0xe2, 0xf5, 0xbc, 0x18, 0x0d, 0xeb, 0x43, 0x1f, 0x2c, 0x19, 0x88, 0x4a, 0x1e, 0xe2, 0xb5, 0xbc, 0x19, 0x8d, 0xfa, 0x43, 0x1f, 0x2c, 0x19, 0x54, 0xc3, 0x77,
0x54, 0xc3, 0x77, 0x6d, 0x4e, 0xd5, 0xec, 0xc2, 0x41, 0x6b, 0xa6, 0x07, 0x6f, 0xd2, 0x85, 0xed, 0x6d, 0x4e, 0xed, 0xd9, 0xc5, 0xfd, 0xee, 0x99, 0x1e, 0xbc, 0x89, 0x0a, 0xdb, 0x39, 0x30, 0x34,
0x1c, 0x18, 0x1a, 0x02, 0x87, 0x3d, 0x00, 0xdc, 0x78, 0xcc, 0xf1, 0xda, 0xbc, 0x72, 0xb5, 0x3e, 0x02, 0x0e, 0x7b, 0x00, 0xb8, 0xf1, 0x98, 0xe3, 0xb5, 0x79, 0x95, 0x6a, 0xfd, 0xb0, 0xe7, 0x30,
0xed, 0x3e, 0x4c, 0x06, 0x66, 0x7a, 0x8a, 0x25, 0x4b, 0x1c, 0x65, 0x1c, 0x59, 0xbf, 0x94, 0x01, 0x19, 0x98, 0xe9, 0x2d, 0x96, 0x2c, 0x71, 0x94, 0x49, 0x64, 0xfd, 0x5c, 0x06, 0x20, 0xd5, 0x18,
0x48, 0x7b, 0x0c, 0x5e, 0xca, 0x4d, 0xfa, 0xd5, 0xa1, 0x49, 0x7f, 0xcc, 0x68, 0xaa, 0xcb, 0x4f, 0xbc, 0x9c, 0x9b, 0xf4, 0xab, 0x23, 0x93, 0xfe, 0x84, 0xf1, 0x54, 0x8f, 0x9f, 0xcc, 0x54, 0x7f,
0x66, 0xaa, 0xbf, 0x0b, 0xe6, 0x43, 0xb5, 0xf9, 0x4c, 0x3b, 0x5c, 0x9c, 0x18, 0x77, 0x72, 0xa6, 0x07, 0xcc, 0x87, 0xea, 0xf0, 0x19, 0x39, 0x5c, 0x9a, 0x5a, 0x77, 0x72, 0xa7, 0x26, 0x70, 0x2d,
0x26, 0x70, 0x2d, 0x20, 0x07, 0xa8, 0xd9, 0xc3, 0x06, 0x0e, 0xde, 0x00, 0x95, 0x28, 0xf4, 0xe2, 0x20, 0x07, 0xa8, 0x39, 0xc3, 0x06, 0x0e, 0xde, 0x04, 0x95, 0x28, 0xf4, 0xe2, 0x3b, 0x70, 0x6d,
0x33, 0x70, 0x6d, 0x22, 0xec, 0xcd, 0xd0, 0xe3, 0x39, 0xd0, 0x05, 0x19, 0xbd, 0x5c, 0x45, 0x0a, 0x2a, 0xec, 0xad, 0xd0, 0xe3, 0x39, 0xd0, 0x05, 0x59, 0xbd, 0x5c, 0x45, 0x0a, 0x08, 0x7e, 0x0c,
0x08, 0x7e, 0x02, 0x16, 0xe2, 0xcb, 0x9b, 0x6a, 0x88, 0x6a, 0xf3, 0xf2, 0x44, 0x50, 0x64, 0x0c, 0x16, 0xe2, 0xc7, 0x9b, 0x12, 0x44, 0xb5, 0x79, 0x65, 0x2a, 0x28, 0x32, 0x01, 0x39, 0xe0, 0x45,
0x72, 0xc0, 0x8b, 0x72, 0x92, 0xc6, 0x12, 0x94, 0x80, 0x5a, 0xbf, 0x96, 0xc1, 0x62, 0xb6, 0xfe, 0x39, 0x49, 0x63, 0x0b, 0x4a, 0x40, 0xad, 0x5f, 0xca, 0x60, 0x31, 0xbb, 0xff, 0xff, 0x0e, 0xa3,
0xff, 0x0d, 0xa3, 0xba, 0xf5, 0x0e, 0x99, 0x51, 0x0d, 0xfa, 0x0f, 0x30, 0xaa, 0x81, 0x8b, 0x18, 0x5a, 0x7a, 0x47, 0xcc, 0xa8, 0x06, 0xfd, 0x1b, 0x18, 0xd5, 0xc0, 0x45, 0x8c, 0xde, 0x2f, 0x03,
0xbd, 0x57, 0x06, 0x70, 0xb4, 0x5d, 0xa0, 0x07, 0xe6, 0x85, 0x1a, 0xe1, 0x87, 0x72, 0x56, 0x24, 0x38, 0x2e, 0x17, 0xe8, 0x81, 0x79, 0xa1, 0x46, 0xf8, 0x91, 0xdc, 0x15, 0xc9, 0x0d, 0x6e, 0xae,
0x27, 0xb8, 0x39, 0x16, 0x0c, 0xb6, 0xbc, 0x98, 0xea, 0x21, 0x7b, 0x3d, 0xbd, 0xc0, 0x26, 0x5b, 0x05, 0x83, 0x2d, 0x1f, 0xa6, 0x7a, 0xc8, 0xde, 0x48, 0x1f, 0xb0, 0xc9, 0x91, 0xda, 0x4c, 0x2c,
0x6a, 0x33, 0x91, 0xa0, 0x8c, 0x16, 0x24, 0xa0, 0xaa, 0xad, 0x6f, 0xe3, 0x6e, 0x2f, 0xbe, 0x8e, 0x28, 0xe3, 0x05, 0x09, 0xa8, 0xea, 0xe8, 0x3b, 0xb8, 0xdb, 0x8b, 0x9f, 0x23, 0x4f, 0xbd, 0xad,
0x3c, 0xf1, 0xb4, 0xb6, 0xe3, 0x64, 0xed, 0xb7, 0x7b, 0x38, 0x10, 0x54, 0xec, 0xa7, 0x87, 0xc9, 0xed, 0xb8, 0x59, 0xfb, 0xad, 0x1e, 0x0e, 0x04, 0x15, 0x7b, 0xe9, 0x65, 0xb2, 0x95, 0x42, 0xa1,
0x56, 0x0a, 0x85, 0xb2, 0xb8, 0xd6, 0xb7, 0xc3, 0xbc, 0xe8, 0x7e, 0xfb, 0xff, 0xf2, 0xb2, 0x03, 0x2c, 0xae, 0xf5, 0xcd, 0x28, 0x2f, 0x5a, 0x6f, 0xff, 0x5d, 0x5e, 0x76, 0xc0, 0xa2, 0x99, 0x79,
0x16, 0xcd, 0xcc, 0xfb, 0x3b, 0xc4, 0x9c, 0x30, 0x5e, 0x16, 0xdb, 0x19, 0x2c, 0x94, 0x43, 0xb6, 0x7f, 0x85, 0x98, 0x53, 0x26, 0xcb, 0x62, 0x3b, 0x83, 0x85, 0x72, 0xc8, 0xd6, 0x0f, 0x25, 0x70,
0x7e, 0x2c, 0x81, 0x63, 0xc3, 0xa3, 0x60, 0x28, 0xe4, 0xd2, 0x81, 0x42, 0xbe, 0x0b, 0xa0, 0x4e, 0x62, 0x74, 0x14, 0x8c, 0x94, 0x5c, 0xda, 0x57, 0xc9, 0xf7, 0x00, 0xd4, 0x0d, 0xaf, 0xf7, 0x09,
0x78, 0x7d, 0x8f, 0x30, 0xdc, 0x21, 0x3a, 0xf0, 0xf2, 0x54, 0x81, 0x27, 0x97, 0xcc, 0xad, 0x11, 0xc3, 0x1d, 0xa2, 0x0b, 0x2f, 0x1f, 0xaa, 0xf0, 0xe4, 0x91, 0xb9, 0x35, 0x86, 0x88, 0x26, 0x64,
0x44, 0x34, 0xc6, 0x8b, 0xf5, 0x73, 0x3e, 0x09, 0x5d, 0xdd, 0x69, 0x92, 0xf8, 0x12, 0x1c, 0x37, 0xb1, 0x7e, 0xca, 0x37, 0xa1, 0x77, 0xf7, 0x30, 0x4d, 0x7c, 0x01, 0x4e, 0x1a, 0x76, 0x8e, 0xa0,
0xec, 0x1c, 0x42, 0x16, 0x67, 0x8c, 0xb3, 0xe3, 0xed, 0x51, 0x48, 0x34, 0xce, 0x8f, 0xf5, 0x5d, 0x8b, 0x73, 0x26, 0xd9, 0xc9, 0xf6, 0x38, 0x24, 0x9a, 0x94, 0xc7, 0xfa, 0xb6, 0x0c, 0x4e, 0x4d,
0x19, 0x9c, 0x18, 0x37, 0x42, 0x61, 0xdb, 0x3c, 0x0b, 0x75, 0x16, 0x4e, 0xf6, 0x59, 0xf8, 0xb8, 0x1a, 0xa1, 0xb0, 0x6d, 0x3e, 0x0b, 0x75, 0x17, 0x4e, 0xf6, 0xb3, 0xf0, 0xc9, 0xa0, 0xd1, 0x98,
0xdf, 0x68, 0x8c, 0x79, 0x07, 0xc4, 0x30, 0x99, 0x97, 0xe3, 0x7b, 0xa0, 0x96, 0xe3, 0xee, 0x1d, 0xf0, 0x1d, 0x10, 0xc3, 0x64, 0xbe, 0x1c, 0xdf, 0x05, 0xb5, 0x1c, 0x77, 0x6f, 0x0b, 0xda, 0xa5,
0x41, 0xbb, 0xf4, 0xae, 0xbe, 0xde, 0xe8, 0x9b, 0xdc, 0x73, 0x83, 0x7e, 0xa3, 0xb6, 0x55, 0xa0, 0xf7, 0xf4, 0xf3, 0x46, 0xbf, 0xe4, 0x9e, 0x19, 0x0e, 0x1a, 0xb5, 0xad, 0x02, 0x1f, 0x54, 0x18,
0x83, 0x0a, 0xad, 0xe5, 0xe3, 0x62, 0x4c, 0xed, 0xa7, 0x6b, 0xda, 0x93, 0x4f, 0x51, 0xf7, 0xef, 0x2d, 0x3f, 0x2e, 0x26, 0xec, 0xfd, 0xe1, 0x44, 0x7b, 0xfa, 0x00, 0xfb, 0xfe, 0xdd, 0x38, 0x5f,
0x47, 0xf9, 0xd2, 0xb5, 0x3f, 0x14, 0xbe, 0x3e, 0x00, 0xa7, 0xf3, 0x45, 0x1a, 0x25, 0xec, 0xec, 0x7a, 0xef, 0x8f, 0x84, 0xaf, 0xf7, 0xc1, 0xd9, 0xfc, 0x26, 0x8d, 0x13, 0x76, 0x7e, 0x38, 0x68,
0xa0, 0xdf, 0x38, 0xdd, 0x2e, 0x52, 0x42, 0xc5, 0xf6, 0x45, 0x9d, 0x36, 0xfb, 0xef, 0x74, 0x5a, 0x9c, 0x6d, 0x17, 0x39, 0xa1, 0xe2, 0xf8, 0x22, 0xa5, 0xcd, 0xfe, 0x33, 0x4a, 0x6b, 0xd9, 0x0f,
0xcb, 0xbe, 0xff, 0xa8, 0x3e, 0xf3, 0xe0, 0x51, 0x7d, 0xe6, 0xe1, 0xa3, 0xfa, 0xcc, 0x57, 0x83, 0x1e, 0xd7, 0x67, 0x1e, 0x3e, 0xae, 0xcf, 0x3c, 0x7a, 0x5c, 0x9f, 0xf9, 0x72, 0x58, 0x2f, 0x3d,
0x7a, 0xe9, 0xfe, 0xa0, 0x5e, 0x7a, 0x30, 0xa8, 0x97, 0x1e, 0x0e, 0xea, 0xa5, 0x3f, 0x06, 0xf5, 0x18, 0xd6, 0x4b, 0x0f, 0x87, 0xf5, 0xd2, 0xa3, 0x61, 0xbd, 0xf4, 0xfb, 0xb0, 0x5e, 0xfa, 0xfa,
0xd2, 0x37, 0x7f, 0xd6, 0x67, 0xde, 0x5f, 0x88, 0x07, 0xdf, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8f, 0xfa, 0xcc, 0x7b, 0x0b, 0xf1, 0xe0, 0xfb, 0x33, 0x00, 0x00, 0xff, 0xff, 0x57, 0x59, 0x55,
0xaf, 0x1f, 0x57, 0xd9, 0xcd, 0x12, 0x00, 0x00, 0xf6, 0xa2, 0x12, 0x00, 0x00,
} }

1
staging/src/k8s.io/api/autoscaling/v2alpha1/generated.proto
View File

@@ -21,7 +21,6 @@ syntax = 'proto2';
package k8s.io.api.autoscaling.v2alpha1; package k8s.io.api.autoscaling.v2alpha1;
import "k8s.io/api/autoscaling/v1/generated.proto";
import "k8s.io/api/core/v1/generated.proto"; import "k8s.io/api/core/v1/generated.proto";
import "k8s.io/apimachinery/pkg/api/resource/generated.proto"; import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";

1501
staging/src/k8s.io/api/core/v1/generated.pb.go
View File

File diff suppressed because it is too large Load Diff

68
staging/src/k8s.io/api/core/v1/types.generated.go
View File

@@ -11638,7 +11638,7 @@ func (x *EmptyDirVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) {
_, _, _ = yysep2, yyq2, yy2arr2 _, _, _ = yysep2, yyq2, yy2arr2
const yyr2 bool = false const yyr2 bool = false
yyq2[0] = x.Medium != "" yyq2[0] = x.Medium != ""
yyq2[1] = true yyq2[1] = x.SizeLimit != nil
var yynn2 int var yynn2 int
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.EncodeArrayStart(2) r.EncodeArrayStart(2)
@@ -11670,15 +11670,18 @@ func (x *EmptyDirVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) {
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[1] { if yyq2[1] {
yy7 := &x.SizeLimit if x.SizeLimit == nil {
yym8 := z.EncBinary() r.EncodeNil()
_ = yym8
if false {
} else if z.HasExtensions() && z.EncExt(yy7) {
} else if !yym8 && z.IsJSONHandle() {
z.EncJSONMarshal(yy7)
} else { } else {
z.EncFallback(yy7) yym7 := z.EncBinary()
_ = yym7
if false {
} else if z.HasExtensions() && z.EncExt(x.SizeLimit) {
} else if !yym7 && z.IsJSONHandle() {
z.EncJSONMarshal(x.SizeLimit)
} else {
z.EncFallback(x.SizeLimit)
}
} }
} else { } else {
r.EncodeNil() r.EncodeNil()
@@ -11688,15 +11691,18 @@ func (x *EmptyDirVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) {
z.EncSendContainerState(codecSelfer_containerMapKey1234) z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("sizeLimit")) r.EncodeString(codecSelferC_UTF81234, string("sizeLimit"))
z.EncSendContainerState(codecSelfer_containerMapValue1234) z.EncSendContainerState(codecSelfer_containerMapValue1234)
yy9 := &x.SizeLimit if x.SizeLimit == nil {
yym10 := z.EncBinary() r.EncodeNil()
_ = yym10
if false {
} else if z.HasExtensions() && z.EncExt(yy9) {
} else if !yym10 && z.IsJSONHandle() {
z.EncJSONMarshal(yy9)
} else { } else {
z.EncFallback(yy9) yym8 := z.EncBinary()
_ = yym8
if false {
} else if z.HasExtensions() && z.EncExt(x.SizeLimit) {
} else if !yym8 && z.IsJSONHandle() {
z.EncJSONMarshal(x.SizeLimit)
} else {
z.EncFallback(x.SizeLimit)
}
} }
} }
} }
@@ -11770,17 +11776,21 @@ func (x *EmptyDirVolumeSource) codecDecodeSelfFromMap(l int, d *codec1978.Decode
} }
case "sizeLimit": case "sizeLimit":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.SizeLimit = pkg3_resource.Quantity{} if x.SizeLimit != nil {
x.SizeLimit = nil
}
} else { } else {
yyv5 := &x.SizeLimit if x.SizeLimit == nil {
x.SizeLimit = new(pkg3_resource.Quantity)
}
yym6 := z.DecBinary() yym6 := z.DecBinary()
_ = yym6 _ = yym6
if false { if false {
} else if z.HasExtensions() && z.DecExt(yyv5) { } else if z.HasExtensions() && z.DecExt(x.SizeLimit) {
} else if !yym6 && z.IsJSONHandle() { } else if !yym6 && z.IsJSONHandle() {
z.DecJSONUnmarshal(yyv5) z.DecJSONUnmarshal(x.SizeLimit)
} else { } else {
z.DecFallback(yyv5, false) z.DecFallback(x.SizeLimit, false)
} }
} }
default: default:
@@ -11826,17 +11836,21 @@ func (x *EmptyDirVolumeSource) codecDecodeSelfFromArray(l int, d *codec1978.Deco
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.SizeLimit = pkg3_resource.Quantity{} if x.SizeLimit != nil {
x.SizeLimit = nil
}
} else { } else {
yyv9 := &x.SizeLimit if x.SizeLimit == nil {
x.SizeLimit = new(pkg3_resource.Quantity)
}
yym10 := z.DecBinary() yym10 := z.DecBinary()
_ = yym10 _ = yym10
if false { if false {
} else if z.HasExtensions() && z.DecExt(yyv9) { } else if z.HasExtensions() && z.DecExt(x.SizeLimit) {
} else if !yym10 && z.IsJSONHandle() { } else if !yym10 && z.IsJSONHandle() {
z.DecJSONUnmarshal(yyv9) z.DecJSONUnmarshal(x.SizeLimit)
} else { } else {
z.DecFallback(yyv9, false) z.DecFallback(x.SizeLimit, false)
} }
} }
for { for {

2
staging/src/k8s.io/api/core/v1/types.go
View File

@@ -739,7 +739,7 @@ type EmptyDirVolumeSource struct {
// The default is nil which means that the limit is undefined. // The default is nil which means that the limit is undefined.
// More info: http://kubernetes.io/docs/user-guide/volumes#emptydir // More info: http://kubernetes.io/docs/user-guide/volumes#emptydir
// +optional // +optional
SizeLimit resource.Quantity `json:"sizeLimit,omitempty" protobuf:"bytes,2,opt,name=sizeLimit"` SizeLimit *resource.Quantity `json:"sizeLimit,omitempty" protobuf:"bytes,2,opt,name=sizeLimit"`
} }
// Represents a Glusterfs mount that lasts the lifetime of a pod. // Represents a Glusterfs mount that lasts the lifetime of a pod.

11
staging/src/k8s.io/api/core/v1/zz_generated.deepcopy.go
View File

@@ -21,6 +21,7 @@ limitations under the License.
package v1 package v1
import ( import (
resource "k8s.io/apimachinery/pkg/api/resource"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
@@ -1787,7 +1788,15 @@ func (in *DownwardAPIVolumeSource) DeepCopy() *DownwardAPIVolumeSource {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *EmptyDirVolumeSource) DeepCopyInto(out *EmptyDirVolumeSource) { func (in *EmptyDirVolumeSource) DeepCopyInto(out *EmptyDirVolumeSource) {
*out = *in *out = *in
out.SizeLimit = in.SizeLimit.DeepCopy() if in.SizeLimit != nil {
in, out := &in.SizeLimit, &out.SizeLimit
if *in == nil {
*out = nil
} else {
*out = new(resource.Quantity)
**out = (*in).DeepCopy()
}
}
return return
} }

8
test/e2e_node/local_storage_isolation_eviction_test.go
View File

@@ -75,7 +75,7 @@ var _ = framework.KubeDescribe("LocalStorageCapacityIsolationEviction [Slow] [Se
Name: emptyDirVolumeName, Name: emptyDirVolumeName,
VolumeSource: v1.VolumeSource{ VolumeSource: v1.VolumeSource{
EmptyDir: &v1.EmptyDirVolumeSource{ EmptyDir: &v1.EmptyDirVolumeSource{
SizeLimit: *resource.NewQuantity(int64(1000), resource.BinarySI), SizeLimit: resource.NewQuantity(int64(1000), resource.BinarySI),
}, },
}, },
}, },
@@ -112,7 +112,7 @@ var _ = framework.KubeDescribe("LocalStorageCapacityIsolationEviction [Slow] [Se
VolumeSource: v1.VolumeSource{ VolumeSource: v1.VolumeSource{
EmptyDir: &v1.EmptyDirVolumeSource{ EmptyDir: &v1.EmptyDirVolumeSource{
Medium: "Memory", Medium: "Memory",
SizeLimit: *resource.NewQuantity(int64(10000), resource.BinarySI), SizeLimit: resource.NewQuantity(int64(10000), resource.BinarySI),
}, },
}, },
}, },
@@ -148,7 +148,7 @@ var _ = framework.KubeDescribe("LocalStorageCapacityIsolationEviction [Slow] [Se
Name: emptyDirVolumeName, Name: emptyDirVolumeName,
VolumeSource: v1.VolumeSource{ VolumeSource: v1.VolumeSource{
EmptyDir: &v1.EmptyDirVolumeSource{ EmptyDir: &v1.EmptyDirVolumeSource{
SizeLimit: *resource.NewQuantity(int64(100000), resource.BinarySI), SizeLimit: resource.NewQuantity(int64(100000), resource.BinarySI),
}, },
}, },
}, },
@@ -218,7 +218,7 @@ var _ = framework.KubeDescribe("LocalStorageCapacityIsolationEviction [Slow] [Se
Name: emptyDirVolumeName, Name: emptyDirVolumeName,
VolumeSource: v1.VolumeSource{ VolumeSource: v1.VolumeSource{
EmptyDir: &v1.EmptyDirVolumeSource{ EmptyDir: &v1.EmptyDirVolumeSource{
SizeLimit: *resource.NewQuantity(int64(100000), resource.BinarySI), SizeLimit: resource.NewQuantity(int64(100000), resource.BinarySI),
}, },
}, },
}, },