diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index f27db3aee34..a88920d0ffb 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -51454,7 +51454,7 @@ "type": "string" }, "reason": { - "description": "A brief CamelCase message indicating details about why the pod is in this state. e.g. 'OutOfDisk'", + "description": "A brief CamelCase message indicating details about why the pod is in this state. e.g. 'Evicted'", "type": "string" }, "startTime": { diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 785da4af518..5f5ca2fa48d 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -20979,7 +20979,7 @@ }, "reason": { "type": "string", - "description": "A brief CamelCase message indicating details about why the pod is in this state. e.g. 'OutOfDisk'" + "description": "A brief CamelCase message indicating details about why the pod is in this state. e.g. 'Evicted'" }, "hostIP": { "type": "string", diff --git a/docs/api-reference/scheduling.k8s.io/v1alpha1/definitions.html b/docs/api-reference/scheduling.k8s.io/v1alpha1/definitions.html index 5bee9af9be9..c008fd569d1 100755 --- a/docs/api-reference/scheduling.k8s.io/v1alpha1/definitions.html +++ b/docs/api-reference/scheduling.k8s.io/v1alpha1/definitions.html @@ -1347,7 +1347,7 @@ Examples:
diff --git a/docs/api-reference/scheduling.k8s.io/v1alpha1/operations.html b/docs/api-reference/scheduling.k8s.io/v1alpha1/operations.html index 30394c89136..973686c2574 100755 --- a/docs/api-reference/scheduling.k8s.io/v1alpha1/operations.html +++ b/docs/api-reference/scheduling.k8s.io/v1alpha1/operations.html @@ -1702,7 +1702,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go b/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go index 1d00f8586b7..a4098813f66 100644 --- a/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go @@ -429,7 +429,6 @@ func autoConvert_v1alpha1_KubeletConfiguration_To_componentconfig_KubeletConfigu if err := v1.Convert_Pointer_int32_To_int32(&in.ImageGCLowThresholdPercent, &out.ImageGCLowThresholdPercent, s); err != nil { return err } - out.LowDiskSpaceThresholdMB = in.LowDiskSpaceThresholdMB out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod out.VolumePluginDir = in.VolumePluginDir out.CloudProvider = in.CloudProvider @@ -474,7 +473,6 @@ func autoConvert_v1alpha1_KubeletConfiguration_To_componentconfig_KubeletConfigu if err := v1.Convert_Pointer_bool_To_bool(&in.SerializeImagePulls, &out.SerializeImagePulls, s); err != nil { return err } - out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency out.NodeLabels = *(*map[string]string)(unsafe.Pointer(&in.NodeLabels)) out.NonMasqueradeCIDR = in.NonMasqueradeCIDR out.EnableCustomMetrics = in.EnableCustomMetrics @@ -609,7 +607,6 @@ func autoConvert_componentconfig_KubeletConfiguration_To_v1alpha1_KubeletConfigu if err := v1.Convert_int32_To_Pointer_int32(&in.ImageGCLowThresholdPercent, &out.ImageGCLowThresholdPercent, s); err != nil { return err } - out.LowDiskSpaceThresholdMB = in.LowDiskSpaceThresholdMB out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod out.VolumePluginDir = in.VolumePluginDir out.CloudProvider = in.CloudProvider @@ -658,7 +655,6 @@ func autoConvert_componentconfig_KubeletConfiguration_To_v1alpha1_KubeletConfigu if err := v1.Convert_bool_To_Pointer_bool(&in.SerializeImagePulls, &out.SerializeImagePulls, s); err != nil { return err } - out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency out.NodeLabels = *(*map[string]string)(unsafe.Pointer(&in.NodeLabels)) out.NonMasqueradeCIDR = in.NonMasqueradeCIDR out.EnableCustomMetrics = in.EnableCustomMetrics diff --git a/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go index 685257b0cd7..c7039500000 100644 --- a/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go @@ -493,7 +493,6 @@ func (in *KubeletConfiguration) DeepCopyInto(out *KubeletConfiguration) { **out = **in } } - out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency if in.NodeLabels != nil { in, out := &in.NodeLabels, &out.NodeLabels *out = make(map[string]string, len(*in)) diff --git a/pkg/apis/componentconfig/zz_generated.deepcopy.go b/pkg/apis/componentconfig/zz_generated.deepcopy.go index c8ada0de2fb..18fbf22fc0e 100644 --- a/pkg/apis/componentconfig/zz_generated.deepcopy.go +++ b/pkg/apis/componentconfig/zz_generated.deepcopy.go @@ -434,7 +434,6 @@ func (in *KubeletConfiguration) DeepCopyInto(out *KubeletConfiguration) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency if in.NodeLabels != nil { in, out := &in.NodeLabels, &out.NodeLabels *out = make(map[string]string, len(*in)) diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto index 5ecdf86d832..4ed4c064cab 100644 --- a/staging/src/k8s.io/api/core/v1/generated.proto +++ b/staging/src/k8s.io/api/core/v1/generated.proto @@ -2830,7 +2830,7 @@ message PodStatus { optional string message = 3; // A brief CamelCase message indicating details about why the pod is in this state. - // e.g. 'OutOfDisk' + // e.g. 'Evicted' // +optional optional string reason = 4; diff --git a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go index 853d8539c59..d4361149eba 100644 --- a/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go @@ -1389,7 +1389,7 @@ var map_PodStatus = map[string]string{ "phase": "Current condition of the pod. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#pod-phase", "conditions": "Current service state of pod. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#pod-conditions", "message": "A human readable message indicating details about why the pod is in this condition.", - "reason": "A brief CamelCase message indicating details about why the pod is in this state. e.g. 'OutOfDisk'", + "reason": "A brief CamelCase message indicating details about why the pod is in this state. e.g. 'Evicted'", "hostIP": "IP address of the host to which the pod is assigned. Empty if not yet scheduled.", "podIP": "IP address allocated to the pod. Routable at least within the cluster. Empty if not yet allocated.", "startTime": "RFC 3339 date and time at which the object was acknowledged by the Kubelet. This is before the Kubelet pulled the container image(s) for the pod.",